1.拆包机bug解决 2.agv出库逻辑优化

ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/xuankuang_zx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-                username: root
-                password: root
+                url: jdbc:mysql://47.100.220.92:3306/warewms-xuankuang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                username: warewms
+                password: warewms123
                 driverClassName: com.mysql.cj.jdbc.Driver
             # 从库数据源
             slave:
@@ -59,7 +59,7 @@ spring:
     redis:
         # 地址
         host: 154.12.16.4
-        # 端口，默认为6379
+      # 端口，默认为6379
         port: 6379
         # 数据库索引
         database: 0

ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:
@@ -78,7 +78,7 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
   configuration-properties:
     prefix:
     blobType: blob

ruoyi-admin/src/test/java/com/ruoyi/admin/test/base/ProcessLocationTest.java

@@ -11,6 +11,7 @@ import com.ruoyi.ams.inv.domain.InvLotAtt;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.service.IInvLotAttService;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.ams.xuankuang.service.WmsDocOrderSubService;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseSku;
 import com.ruoyi.base.service.IBaseLocationInfoService;
@@ -256,5 +257,23 @@ public class ProcessLocationTest {
         invLotLocIdService.updateInvLotLocId(invLotLocId);
     }
 
+    @Autowired
+    private WmsDocOrderSubService wmsDocOrderSubService;
+
+    @Test
+    public void getOrderRule(){
+        System.out.println(wmsDocOrderSubService.getOrderRule());
+    }
+
+
+    @Autowired
+    private IBaseSkuService iBaseSkuService;
+
+    @Test
+    public void callbackWcsAgvInTask(){
+        BaseSku baseSku = iBaseSkuService.selectBaseSkuByMaterialType("5");
+        System.out.println(JSONObject.toJSONString(baseSku));
+    }
+
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/facade/impl/UnpackingMachineFacadeImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.hard.xuankang.UnpackingMachineSubClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 @Slf4j
 @Service
@@ -25,10 +26,9 @@ public class UnpackingMachineFacadeImpl implements IUnpackingMachineFacade {
 
     @Override
     public Boolean unpackingMachineOpen(String lineId, boolean[] booleans){
-        verifyLineOpenStatus(lineId, booleans);
-        unpackingMachineSubClientWrite(lineId);
+        Assert.isTrue(verifyLineOpenStatus(lineId, booleans), "method [verifyLineOpenStatus] return false ");
+        Assert.isTrue(unpackingMachineSubClientWrite(lineId), "method [unpackingMachineSubClientWrite] return false ");
         wmsCallback(lineId);
-        //写仓库收到请求已经开始碳酸钠注药
         stirringTankClientWrite(lineId);
         return Boolean.TRUE;
     }

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

@@ -161,9 +161,8 @@ public class AgvCallProxyService {
         //int errorCount = 0;
         for (BaseLocationInfo baseLocationInfo : filteredBaseLocationLotattList){
             //每个推荐的出库库存都创建一个wcs任务,agv的起始点则是wcs任务的目标点位
-            String taskNo = idSequenceUtils.generateId(Constant.ID_TYPE.LOTNUMBER.getDesc());
             //通知wcs的桶装出库的任务
-            WcsResponseVo wcsResponseVo = noticeBucketOutLocTask(taskNo, agvSourceLocationId, orderNo, materialType, quantity, baseLocationInfo);
+                WcsResponseVo wcsResponseVo = noticeBucketOutLocTask(IdWorker.getIdStr(), agvSourceLocationId, orderNo, materialType, quantity, baseLocationInfo);
             if (!wcsResponseVo.isSuccess()) {
                 //errorCount++;
                 docOrderHeader.setRemark(wcsResponseVo.getMessage());