소스 검색

选矿bug

ChenYang 1 년 전
부모
커밋
77260a78c5

+ 2 - 2
warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/AgvCallProxyService.java

@@ -197,12 +197,12 @@ public class AgvCallProxyService {
 
 
         //2.入库单创建
         //2.入库单创建
         String asnNo = idSequenceUtils.generateId(Constant.ID_TYPE.ASNNO.getDesc());
         String asnNo = idSequenceUtils.generateId(Constant.ID_TYPE.ASNNO.getDesc());
-        iWmsDocAsnHeaderService.createAsnHeader(asnNo, Constant.ASN_TYP.TZ.getValue(), Constant.ASN_STS.STS10.getValue());
+        iWmsDocAsnHeaderService.createAsnHeader(asnNo, Constant.ASN_TYP.TZ.getValue(), Constant.ASN_STS.STS40.getValue());
         iWmsDocAsnDetailsService.createAsnDetail(asnNo, baseSku.getSku(), quantityDecimal);
         iWmsDocAsnDetailsService.createAsnDetail(asnNo, baseSku.getSku(), quantityDecimal);
 
 
         //3.出库单创建
         //3.出库单创建
         String orderNo = idSequenceUtils.generateId(Constant.ID_TYPE.ORDERNO.getDesc());
         String orderNo = idSequenceUtils.generateId(Constant.ID_TYPE.ORDERNO.getDesc());
-        iWmsDocOrderHeaderService.createOrderHeader(orderNo, Constant.ORDER_TYP.TZ.getValue(), Constant.ORDER_STS.STS10.getValue());
+        iWmsDocOrderHeaderService.createOrderHeader(orderNo, Constant.ORDER_TYP.TZ.getValue(), Constant.ORDER_STS.STS40.getValue());
         iWmsDocOrderDetailsService.createOrderDetail(orderNo, baseSku.getSku(), quantityDecimal);
         iWmsDocOrderDetailsService.createOrderDetail(orderNo, baseSku.getSku(), quantityDecimal);
 
 
         //2. 获取agv的库位,并创建agv的wcs任务
         //2. 获取agv的库位,并创建agv的wcs任务

+ 2 - 0
warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WcsTaskSubService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.xuankuang.service;
 package com.ruoyi.ams.xuankuang.service;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
@@ -256,6 +257,7 @@ public class WcsTaskSubService {
                     wcsTask.setEndTime(new Date());
                     wcsTask.setEndTime(new Date());
                     //越库任务完成后反馈
                     //越库任务完成后反馈
                     if (wcsTask.getExt2().equals("") && wcsTask.getExt1().startsWith("ASN")) {
                     if (wcsTask.getExt2().equals("") && wcsTask.getExt1().startsWith("ASN")) {
+                        log.info("this wcsTask info is {}", JSONObject.toJSONString(wcsTask));
                         completeTheCallbackYueKu(wcsTask);
                         completeTheCallbackYueKu(wcsTask);
                         break;
                         break;
                     }
                     }

+ 2 - 3
warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WmsDocOrderSubService.java

@@ -249,10 +249,9 @@ public class WmsDocOrderSubService {
                 if (i >= 0) {
                 if (i >= 0) {
                     baseLocationLotattVOS1.add(baseLocationLotattVO1);
                     baseLocationLotattVOS1.add(baseLocationLotattVO1);
                     return baseLocationLotattVOS1;
                     return baseLocationLotattVOS1;
-                } else if (i < 0) {
-                    qtyAllocatedEach = qtyAllocatedEach.subtract(qty);
-                    baseLocationLotattVOS1.add(baseLocationLotattVO1);
                 }
                 }
+                qtyAllocatedEach = qtyAllocatedEach.subtract(qty);
+                baseLocationLotattVOS1.add(baseLocationLotattVO1);
             }
             }
         }
         }
         return baseLocationLotattVOS1;
         return baseLocationLotattVOS1;