imcs-wms联调

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/impl/StorgeServiceImpl.java

@@ -789,7 +789,7 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
         String taskNo = wmsTransferTask.getTaskNo();
         Storge storge = baseMapper.getAGVStorge(wmsTransferTask.getZoneId());
         if(ObjectUtil.isNotEmpty(storge) && StringUtil.isNotEmpty(taskNo)){
-            WmsAgvInfo selectOne = wmsAgvInfoMapper.selectOne(Wraps.<WmsAgvInfo>lbQ().eq(WmsAgvInfo::getTaskNo, taskNo));
+            WmsAgvInfo selectOne = wmsAgvInfoMapper.selectOne(Wraps.<WmsAgvInfo>lbQ().eq(WmsAgvInfo::getTaskNo, taskNo).eq(WmsAgvInfo::getStatus,false));
             if(ObjectUtil.isEmpty(selectOne)){
                 return R.fail(null,"未找到对应任务");
             }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/WmsAgvInfoServiceImpl.java

@@ -383,14 +383,14 @@ public class WmsAgvInfoServiceImpl extends SuperCacheServiceImpl<WmsAgvInfoMappe
         // trayNo
         String trayNo = wmsAgvInfoDetails.stream()
                 .filter(s -> "5".equals(s.getGoodsType()))
-                .map(WmsAgvInfoDetail::getGoodsType)   // 假设 trayNo 存在于 goodsCode 字段
+                .map(WmsAgvInfoDetail::getMaterialCode)   // 假设 trayNo 存在于 goodsCode 字段
                 .findFirst()
                 .orElse(null);
 
         // boxNo
         String boxNo = wmsAgvInfoDetails.stream()
                 .filter(s -> "7".equals(s.getGoodsType()))
-                .map(WmsAgvInfoDetail::getGoodsType)   // 假设 boxNo 存在于 goodsCode 字段
+                .map(WmsAgvInfoDetail::getMaterialCode)   // 假设 boxNo 存在于 goodsCode 字段
                 .findFirst()
                 .orElse(null);
 
@@ -444,7 +444,7 @@ public class WmsAgvInfoServiceImpl extends SuperCacheServiceImpl<WmsAgvInfoMappe
         outAgvInfo.setTaskType(BizWmsConstant.OUT);
         outAgvInfo.setOrderId(wmsAgvInfo.getOrderId());
         outAgvInfo.setWmsTransferTaskId(wmsAgvInfo.getWmsTransferTaskId());
-        outAgvInfo.setStatus(true);
+        outAgvInfo.setStatus(false);
         outAgvInfo.setPriority(1);
         outAgvInfo.setIsCallback(false);
         wmsAgvInfoMapper.insert(outAgvInfo);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StorgeMapper.xml

@@ -149,7 +149,7 @@
                              left join imcs_s_storge_type sst on ss.storge_type_id=sst.id
                              left join imcs_z_zone zz on zzp.zone_id=zz.id
         where zz.id=#{zoneId} and sst.`name`='AGV'
-          and ss.lock_status='1' and not EXISTS(select 1 from imcs_s_stock_info where storge_id=ss.id)
+          and ss.lock_status='1' and ss.task_no is null and not EXISTS(select 1 from imcs_s_stock_info where storge_id=ss.id)
               limit 1
 
     </select>

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

@@ -28,15 +28,37 @@
     </sql>
 
     <select id="pageList" resultMap="BaseResultMap">
-        select
-            s.*
-        from (
-                 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_p_plan_product oop on wtt.plan_product_id=oop.id
-                    left join imcs_b_bom_version_info bbvi on oop.bom_id=bbvi.bom_id and bbvi.use_status='1' and bbvi.audit_status='2'
-                    left join imcs_b_bom bb on bb.id=bbvi.bom_id
+                select
+                    s.*
+                from (
+                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
+                JOIN imcs_o_order oo ON wtt.order_id = oo.id
+                LEFT JOIN wms_agv_info wai ON wai.id = (
+                SELECT
+                t.id
+                FROM
+                wms_agv_info t
+                WHERE
+                t.is_callback = 1
+                AND t.wms_transfer_task_id = wtt.id
+                ORDER BY
+                t.create_time DESC
+                LIMIT 1
+                )
+                LEFT JOIN imcs_p_plan_product oop ON wtt.plan_product_id = oop.id
+                LEFT JOIN imcs_b_bom_version_info bbvi ON oop.bom_id = bbvi.bom_id
+                AND bbvi.use_status = '1'
+                AND bbvi.audit_status = '2'
+                LEFT JOIN imcs_b_bom bb ON bb.id = bbvi.bom_id
                   <where>
                        1=1
                       <if test="wmsTransferTask!=null and wmsTransferTask.orderName!=null and wmsTransferTask.orderName!=''">