Browse Source

bug修复

wudingsheng 5 days ago
parent
commit
cce7c2b4ff

+ 3 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/wms/service/impl/WmsTransferTaskServiceImpl.java

@@ -189,10 +189,12 @@ public class WmsTransferTaskServiceImpl extends SuperCacheServiceImpl<WmsTransfe
         String toLocation = null;
 
         Integer status = wmsTransferTask.getStatus();
+
         if (Objects.equals(BizWmsConstant.IN_QC, wmsTransferTask.getTaskType())) {
             // 优先去三坐标
             Storge qcDock = storgeMapper.getAGVStorge(1967459191408820224L);
-            if (qcDock != null) {
+            Boolean b = (Boolean) msgUtil.redis_get(CacheKey.PROPERTIES + CacheKey.THREE_FLAG);
+            if (qcDock != null && b) {
                 taskNo = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_WMS_IN_QC);
                 taskType = BizWmsConstant.IN_QC;
                 toLocation = qcDock.getPointId();

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/wms/WmsTransferTaskMapper.xml

@@ -31,7 +31,7 @@
         select
             s.*
         from (
-                 select wtt.*,oo.order_name,oo.create_time as orderTime,wai.goal as nowGoal,bbvi.is_qc,bb.name,bb.no from wms_transfer_task wtt
+                 select wtt.*,oo.order_name,oo.create_time as orderTime,wai.wms_goal as nowGoal,bbvi.is_qc,bb.name,bb.no from wms_transfer_task wtt
                   inner join imcs_o_order oo on wtt.order_id=oo.id
                   left join (select * from wms_agv_info where is_callback=1 order by create_time desc limit 1) wai on wtt.id=wai.wms_transfer_task_id
                   left join imcs_o_order_product oop on wtt.order_id=oop.order_id