排队订单保存接口修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrderCraft.java

@@ -102,4 +102,10 @@ public class YieldOrderCraft extends BaseEntity {
 	 */
 	@TableField(value = "RP_ID")
 	private Long rpId;
+
+	/**
+	 * 是否外协
+	 */
+	@TableField(value = "IS_OUTSOURCE")
+	private Boolean isOutsource;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -457,6 +457,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			yieldOrder.setReceiveUser(yieldJson.getLong("failureMan"));
 			yieldOrder.setReceiveTime(yieldJson.getDate("failureTime"));
 			yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCategory());
+			// 若任务下达时间为空， 取从erp同步的时间
+			if (ObjectUtil.isEmpty(yieldOrder.getReleaseDate())) {
+				yieldOrder.setReleaseDate(yieldJson.getDate("syncTime"));
+			}
 
 			// 先根据流程卡号验证订单是否重复，如果重复则不保存
 			List<YieldOrder> orderList = baseMapper.selectList(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getCardNo, yieldOrder.getCardNo()));

blade-service/blade-desk/src/main/resources/application-dev.yml

@@ -12,8 +12,8 @@ spring:
 business:
   oldMes:
     jobEnable: false
-#    url: 192.168.169.172:9000
-    url: 127.0.0.1:32111
+    url: 192.168.169.172:9000
+#    url: 127.0.0.1:32111
     syncOrderList: /zhgd-rb/aiWebapi/syncApsOrderData/化学镀镍
 #    syncOrderList: /zhgd-rb/aiWebapi/syncApsOrderData/all
     pushSyncResult: /zhgd-rb/aiWebapi/syncApsOrderDataResult

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -115,7 +115,7 @@
         LEFT JOIN BS_PROCESS_SET f on e.pps_id = f.id
         LEFT JOIN MES_YIELD_ORDER g on g.id = a.yo_id
         <where>
-            a.is_deleted = 0
+            a.is_deleted = 0 and b.is_deleted = 0
             <if test="startTime !=null and startTime != ''">
                 and (to_char(b.start_time,'YYYY-MM-DD') = #{startTime} or (b.start_time <![CDATA[ < ]]> to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and   b.end_time <![CDATA[ > ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
             </if>