现场测试修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/WcsTaskController.java

@@ -118,7 +118,7 @@ public class WcsTaskController extends BaseController {
         if (wcsTask == null) {
            return AjaxResult.error("任务回调失败");
         }
-        if (!wcsTask.getState().equals("4")) {
+        if (!wcsTask.getState().toString().equals("4")) {
            return AjaxResult.error("任务未取货，不能直接完成！");
         }
         wcsTaskService.callBack(wcsTask.getTaskNo(),2,Integer.parseInt(wcsTask.getAgvNo()));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -214,7 +214,7 @@ public class PdaController {
                 return AjaxResult.error("起始库位不为空闲状态！");
             }
             if (!baseLocationInfoFrom.getZoneId().equals(Constant.ZONE_TYPE.ZONE_VIRTUAL.getValue())
-                    && !baseLocationInfoFrom.getIsEmpty().equals(Constant.IS_YES.N.name())) {
+                    && !baseLocationInfoFrom.getIsEmpty().equals(Constant.IS_YES.Y.name())) {
                 return AjaxResult.error("起始库位已经有货！");
             }
             if (StringUtils.isNotEmpty(lform.getLocationTo())) {

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -570,8 +570,10 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                 String asnno = invLotAtt.getLotatt08();
                 WmsDocAsnHeader wmsDocAsnHeader = iWmsDocAsnHeaderService.selectWmsDocAsnHeaderByAsnNo(asnno);
                 if (wmsDocAsnHeader != null
-                        && !wmsDocAsnHeader.getAsnStatus().equals(Constant.ASN_STS.STS40.getValue())) {
-                    return AjaxResult.error("入库单未完全收货不可上架！" + asnno);
+                        &&
+                        (wmsDocAsnHeader.getAsnStatus().equals(Constant.ASN_STS.STS00.getValue())
+                                || wmsDocAsnHeader.getAsnStatus().equals(Constant.ASN_STS.STS30.getValue()))) {
+                    return AjaxResult.error("入库单未完全收货不可上架！" + wmsDocAsnHeader.getAsnReference1());
                 }
             } else {
                 // 回库-（1）未备货的库存不可回库（2）未拣货的库存不可回库

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -346,6 +346,10 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
             log.info("已完成的任务无需反馈");
             return;
         }
+        if (wcsTask.getState() == 4 && state == 7) {
+            log.info("取货完成之后不用反馈取消状态！");
+            return;
+        }
         //todo 转发类型任务才回调
         if (wcsTask.getTaskType().equals(Constant.TASK_TYPE.FORWARD.getValue())) {
             try {

warewms-ams/src/main/resources/mapper/docAsn/WmsDocAsnHeaderMapper.xml

@@ -469,8 +469,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ifnull(sum(expected_qty),0) - ifnull(sum(received_qty),0) received_qty
         from wms_doc_asn_details
         where sku = #{sku} and expected_qty - received_qty > 0 and asn_no in
-        <foreach item="item" index="index" collection="list" separator=",">
-            (#{item})
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
         </foreach>
         group by sku
     </select>