优化下料

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -91,9 +91,11 @@ public class StartService implements CommandLineRunner {
         //测试合格品左下料
 //        plcCallAgvService.readThepassedProductLowerFeeLeftTest();
         //测试合格品右下料
-        plcCallAgvService.readThepassedProductLowerFeeRightTest();
+//        plcCallAgvService.readThepassedProductLowerFeeRightTest();
+            plcCallAgvService.readThepassedProductLowerFeeRightTest();
     }
 
+
     /**
      * 合格品左请求下料
      */

ruoyi-ui/src/views/ams/inv/locationView/index.vue

@@ -11,9 +11,6 @@
           <div class="divLeft colorGreen">
             有货
           </div>
-          <div class="divLeft colorRed">
-            不合格
-          </div>
 <!--          <div class="divLeft">-->
 <!--            库存<icon-svg name="steel" class="site-sidebar__menu-icon"></icon-svg>-->
 <!--          </div>-->

warewms-ams/src/main/java/com/ruoyi/ams/MaGang02/service/PlcCallAgvService.java

@@ -42,7 +42,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -56,7 +56,7 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.ONE.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedProductLeftSky();
             }
         }
@@ -76,7 +76,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -106,7 +106,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -136,7 +136,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -160,26 +160,26 @@ public class PlcCallAgvService {
      * @return
      */
     public AjaxResult readThepassedProductLowerFeeLeftTest() {
-            String locationFrom = "100001";
-            String locationTo = "";
-            WcsTask wcsTask = new WcsTask();
-            wcsTask.setLocationFrom(locationFrom);
-            List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
-                return AjaxResult.error("已经有正在进行的任务了");
-            }
-            //库存列表
-            List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-            AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-            LotattDTO lotattDTO = new LotattDTO();
-            agvCallItemDTO.setSku("sku001"); // 合格品
-            agvCallItemDTO.setQty(1.0);
-            agvCallItemDTOList.add(agvCallItemDTO);
-            AgvCallDTO agvCallDTO = new AgvCallDTO();
-            agvCallDTO.setLocationFrom(locationFrom);
-            agvCallDTO.setLocationTo(locationTo);
-            agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-            AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.FIVE.getValue(), agvCallDTO);
+        String locationFrom = "100001";
+        String locationTo = "";
+        WcsTask wcsTask = new WcsTask();
+        wcsTask.setLocationFrom(locationFrom);
+        List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
+        if (wcsTasks.size() > 0 && wcsTasks != null) {
+            return AjaxResult.error("已经有正在进行的任务了");
+        }
+        //库存列表
+        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+        LotattDTO lotattDTO = new LotattDTO();
+        agvCallItemDTO.setSku("sku001"); // 合格品
+        agvCallItemDTO.setQty(1.0);
+        agvCallItemDTOList.add(agvCallItemDTO);
+        AgvCallDTO agvCallDTO = new AgvCallDTO();
+        agvCallDTO.setLocationFrom(locationFrom);
+        agvCallDTO.setLocationTo(locationTo);
+        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+        AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.FIVE.getValue(), agvCallDTO);
         return AjaxResult.success();
     }
 
@@ -189,12 +189,12 @@ public class PlcCallAgvService {
      * @return
      */
     public AjaxResult readThepassedProductLowerFeeRightTest() {
-        String locationFrom = "100003";
+        String locationFrom = "100001";
         String locationTo = "";
         WcsTask wcsTask = new WcsTask();
         wcsTask.setLocationFrom(locationFrom);
         List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-        if (wcsTasks.size()>0 && wcsTasks!= null){
+        if (wcsTasks.size() > 0 && wcsTasks != null) {
             return AjaxResult.error("已经有正在进行的任务了");
         }
         //库存列表
@@ -203,12 +203,16 @@ public class PlcCallAgvService {
         LotattDTO lotattDTO = new LotattDTO();
         agvCallItemDTO.setSku("sku001"); // 合格品
         agvCallItemDTO.setQty(1.0);
+        agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);
         AgvCallDTO agvCallDTO = new AgvCallDTO();
         agvCallDTO.setLocationFrom(locationFrom);
         agvCallDTO.setLocationTo(locationTo);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SIX.getValue(), agvCallDTO);
+        AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.FIVE.getValue(), agvCallDTO);
+        if (ajaxResult.isSuccess()) {
+            PlcService.plcWritepassedProductLeftBlanking();
+        }
         return AjaxResult.success();
     }
 
@@ -225,7 +229,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -239,7 +243,7 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.TWO.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedProductRightSky();
             }
         }
@@ -259,7 +263,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -273,7 +277,7 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.THREE.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedNoProductLeftSky();
             }
         }
@@ -293,7 +297,7 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationTo(locationTo);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
@@ -307,13 +311,14 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.FOUR.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedNoProductRightSky();
             }
         }
         return AjaxResult.success();
     }
 
+
     /**
      * 合格品左请求下料
      *
@@ -327,12 +332,20 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationFrom(locationFrom);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             Integer integer = PlcService.plcDateReading18();
             //库存列表
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+            if (integer == 0) {
+                AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+                LotattDTO lotattDTO = new LotattDTO();
+                agvCallItemDTO.setSku("sku001"); // 合格品
+                agvCallItemDTO.setQty(1.0);
+                agvCallItemDTO.setLotattDTO(lotattDTO);
+                agvCallItemDTOList.add(agvCallItemDTO);
+            }
             for (int i = 0; i < integer; i++) {
                 //单个库存
                 AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
@@ -344,23 +357,23 @@ public class PlcCallAgvService {
                 Integer integer3 = PlcService.plcDateReading18_3();
                 Integer integer4 = PlcService.plcDateReading18_4();
                 Integer integer5 = PlcService.plcDateReading18_5();
-                if (i == 0){
+                if (i == 0) {
                     lotattDTO.setLotatt01(integer1.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 1){
+                if (i == 1) {
                     lotattDTO.setLotatt01(integer2.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 2){
+                if (i == 2) {
                     lotattDTO.setLotatt01(integer3.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 3){
+                if (i == 3) {
                     lotattDTO.setLotatt01(integer4.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 4){
+                if (i == 4) {
                     lotattDTO.setLotatt01(integer5.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
@@ -371,82 +384,92 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.FIVE.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedProductLeftBlanking();
             }
         }
-            return AjaxResult.success();
-        }
+        return AjaxResult.success();
+    }
 
 
-        /**
-         * 合格品右请求下料
-         * @return
-         */
-        public AjaxResult readThepassedProductLowerFeeRight () {
-            boolean b = PlcService.plcDateReading15();
-            if (b) {
-                String locationFrom = "100003";
-                String locationTo = "";
-                WcsTask wcsTask = new WcsTask();
-                wcsTask.setLocationFrom(locationFrom);
-                List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-                if (wcsTasks.size()>0 && wcsTasks!= null){
-                    return AjaxResult.error("已经有正在进行的任务了");
+    /**
+     * 合格品右请求下料
+     *
+     * @return
+     */
+    public AjaxResult readThepassedProductLowerFeeRight() {
+        boolean b = PlcService.plcDateReading15();
+        if (b) {
+            String locationFrom = "100003";
+            String locationTo = "";
+            WcsTask wcsTask = new WcsTask();
+            wcsTask.setLocationFrom(locationFrom);
+            List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
+                return AjaxResult.error("已经有正在进行的任务了");
+            }
+            Integer integer = PlcService.plcDateReading19();
+            //库存列表
+            List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+            if (integer == 0) {
+                AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+                LotattDTO lotattDTO = new LotattDTO();
+                agvCallItemDTO.setSku("sku001"); // 合格品
+                agvCallItemDTO.setQty(1.0);
+                agvCallItemDTO.setLotattDTO(lotattDTO);
+                agvCallItemDTOList.add(agvCallItemDTO);
+            }
+            for (int i = 1; i < integer; i++) {
+                //单个库存
+                AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+                LotattDTO lotattDTO = new LotattDTO();
+                agvCallItemDTO.setSku("sku001"); // 合格品
+                agvCallItemDTO.setQty(1.0);
+                Integer integer1 = PlcService.plcDateReading19_1();
+                Integer integer2 = PlcService.plcDateReading19_2();
+                Integer integer3 = PlcService.plcDateReading19_3();
+                Integer integer4 = PlcService.plcDateReading19_4();
+                Integer integer5 = PlcService.plcDateReading19_5();
+                if (i == 0) {
+                    lotattDTO.setLotatt01(integer1.toString());
+                    agvCallItemDTO.setLotattDTO(lotattDTO);
+                }
+                if (i == 1) {
+                    lotattDTO.setLotatt01(integer2.toString());
+                    agvCallItemDTO.setLotattDTO(lotattDTO);
+                }
+                if (i == 2) {
+                    lotattDTO.setLotatt01(integer3.toString());
+                    agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                Integer integer = PlcService.plcDateReading19();
-                //库存列表
-                List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-                for (int i = 0; i < integer; i++) {
-                    //单个库存
-                    AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-                    LotattDTO lotattDTO = new LotattDTO();
-                    agvCallItemDTO.setSku("sku001"); // 合格品
-                    agvCallItemDTO.setQty(1.0);
-                    Integer integer1 = PlcService.plcDateReading19_1();
-                    Integer integer2 = PlcService.plcDateReading19_2();
-                    Integer integer3 = PlcService.plcDateReading19_3();
-                    Integer integer4 = PlcService.plcDateReading19_4();
-                    Integer integer5 = PlcService.plcDateReading19_5();
-                    if (i == 0){
-                        lotattDTO.setLotatt01(integer1.toString());
-                        agvCallItemDTO.setLotattDTO(lotattDTO);
-                    }
-                    if (i == 1){
-                        lotattDTO.setLotatt01(integer2.toString());
-                        agvCallItemDTO.setLotattDTO(lotattDTO);
-                    }
-                    if (i == 2){
-                        lotattDTO.setLotatt01(integer3.toString());
-                        agvCallItemDTO.setLotattDTO(lotattDTO);
-                    }
-                    if (i == 3){
-                        lotattDTO.setLotatt01(integer4.toString());
-                        agvCallItemDTO.setLotattDTO(lotattDTO);
-                    }
-                    if (i == 4){
-                        lotattDTO.setLotatt01(integer5.toString());
-                        agvCallItemDTO.setLotattDTO(lotattDTO);
-                    }
-                    agvCallItemDTOList.add(agvCallItemDTO);
+                if (i == 3) {
+                    lotattDTO.setLotatt01(integer4.toString());
+                    agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                AgvCallDTO agvCallDTO = new AgvCallDTO();
-                agvCallDTO.setLocationFrom(locationFrom);
-                agvCallDTO.setLocationTo(locationTo);
-                agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-                AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SIX.getValue(), agvCallDTO);
-                if (ajaxResult.isSuccess()){
-                    PlcService.plcWritepassedProductRightBlanking();
+                if (i == 4) {
+                    lotattDTO.setLotatt01(integer5.toString());
+                    agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
+                agvCallItemDTOList.add(agvCallItemDTO);
+            }
+            AgvCallDTO agvCallDTO = new AgvCallDTO();
+            agvCallDTO.setLocationFrom(locationFrom);
+            agvCallDTO.setLocationTo(locationTo);
+            agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+            AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SIX.getValue(), agvCallDTO);
+            if (ajaxResult.isSuccess()) {
+                PlcService.plcWritepassedProductRightBlanking();
             }
-            return AjaxResult.success();
         }
+        return AjaxResult.success();
+    }
 
     /**
      * 不合格品左请求下料
+     *
      * @return
      */
-    public AjaxResult readThepassedNoProductLowerFeeLeft () {
+    public AjaxResult readThepassedNoProductLowerFeeLeft() {
         boolean b = PlcService.plcDateReading16();
         if (b) {
             String locationFrom = "100000";
@@ -454,12 +477,20 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationFrom(locationFrom);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             Integer integer = PlcService.plcDateReading20();
             //库存列表
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+            if (integer == 0) {
+                AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+                LotattDTO lotattDTO = new LotattDTO();
+                agvCallItemDTO.setSku("sku001"); // 合格品
+                agvCallItemDTO.setQty(1.0);
+                agvCallItemDTO.setLotattDTO(lotattDTO);
+                agvCallItemDTOList.add(agvCallItemDTO);
+            }
             for (int i = 0; i < integer; i++) {
                 //单个库存
                 AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
@@ -471,23 +502,23 @@ public class PlcCallAgvService {
                 Integer integer3 = PlcService.plcDateReading20_3();
                 Integer integer4 = PlcService.plcDateReading20_4();
                 Integer integer5 = PlcService.plcDateReading20_5();
-                if (i == 0){
+                if (i == 0) {
                     lotattDTO.setLotatt01(integer1.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 1){
+                if (i == 1) {
                     lotattDTO.setLotatt01(integer2.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 2){
+                if (i == 2) {
                     lotattDTO.setLotatt01(integer3.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 3){
+                if (i == 3) {
                     lotattDTO.setLotatt01(integer4.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 4){
+                if (i == 4) {
                     lotattDTO.setLotatt01(integer5.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
@@ -498,7 +529,7 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SEVEN.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedNoProductLeftBlanking();
             }
         }
@@ -507,9 +538,10 @@ public class PlcCallAgvService {
 
     /**
      * 不合格品右请求下料
+     *
      * @return
      */
-    public AjaxResult readThepassedNoProductLowerFeeRight () {
+    public AjaxResult readThepassedNoProductLowerFeeRight() {
         boolean b = PlcService.plcDateReading17();
         if (b) {
             String locationFrom = "100002";
@@ -517,12 +549,20 @@ public class PlcCallAgvService {
             WcsTask wcsTask = new WcsTask();
             wcsTask.setLocationFrom(locationFrom);
             List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
-            if (wcsTasks.size()>0 && wcsTasks!= null){
+            if (wcsTasks.size() > 0 && wcsTasks != null) {
                 return AjaxResult.error("已经有正在进行的任务了");
             }
             Integer integer = PlcService.plcDateReading21();
             //库存列表
             List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+            if (integer == 0) {
+                AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+                LotattDTO lotattDTO = new LotattDTO();
+                agvCallItemDTO.setSku("sku001"); // 合格品
+                agvCallItemDTO.setQty(1.0);
+                agvCallItemDTO.setLotattDTO(lotattDTO);
+                agvCallItemDTOList.add(agvCallItemDTO);
+            }
             for (int i = 0; i < integer; i++) {
                 //单个库存
                 AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
@@ -534,23 +574,23 @@ public class PlcCallAgvService {
                 Integer integer3 = PlcService.plcDateReading21_3();
                 Integer integer4 = PlcService.plcDateReading21_4();
                 Integer integer5 = PlcService.plcDateReading21_5();
-                if (i == 0){
+                if (i == 0) {
                     lotattDTO.setLotatt01(integer1.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 1){
+                if (i == 1) {
                     lotattDTO.setLotatt01(integer2.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 2){
+                if (i == 2) {
                     lotattDTO.setLotatt01(integer3.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 3){
+                if (i == 3) {
                     lotattDTO.setLotatt01(integer4.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
-                if (i == 4){
+                if (i == 4) {
                     lotattDTO.setLotatt01(integer5.toString());
                     agvCallItemDTO.setLotattDTO(lotattDTO);
                 }
@@ -561,7 +601,7 @@ public class PlcCallAgvService {
             agvCallDTO.setLocationTo(locationTo);
             agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
             AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.EIGHT.getValue(), agvCallDTO);
-            if (ajaxResult.isSuccess()){
+            if (ajaxResult.isSuccess()) {
                 PlcService.plcWritepassedNoProductRightBlanking();
             }
         }

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/AciService.java

@@ -112,7 +112,7 @@ public class AciService {
                 taskBean.setAciAccept(0);
                 taskBean.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_POWER.getValue());
                 taskBean = amsTaskService.selectAmsTaskByModel(taskBean);
-                s = "87CD0008000C000100710006630100010001%04X";
+                s = "87CD000800080001007100046301%04X";
                 if (taskBean != null) {
 
                     s = String.format(s, Integer.parseInt(taskBean.getDeviceName()));

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -97,7 +97,6 @@ public class BusinessServiceImpl implements IBusinessService {
     public AjaxResult agvCall(Long flowId, AgvCallDTO agvCallDTO) {
         //查询所属流程
         FlowConfigHeaderVO flowConfigHeaderVO = flowConfigHeaderService.selectFlowConfigHeaderById(flowId);
-
         List<AgvCallDTO> agvCallDTOList = new ArrayList<>();
         agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
         agvCallDTOList.add(agvCallDTO);
@@ -396,22 +395,7 @@ public class BusinessServiceImpl implements IBusinessService {
         BaseLocationInfo locationInfo = null;
         String fromMsg = "";
         String toMsg = "";
-        if (type.equals("ASN")) { // 入库
-            if (locationType.equals("locationFrom")) {
-            } else { //目标库位
-            }
-        } else if (type.equals("SO")) { // 出库
-            if (locationType.equals("locationFrom")) {
-            } else { //目标库位
-            }
-        } else { //移库
-            if (locationType.equals("locationFrom")) {
-            } else {
-            }
-        }
         if (locationType.equals("locationFrom")) {
-            for (BaseLocationInfo b : locationInfoList) {
-            }
             locationInfo = checkTheSameColumnLocation(locationInfoList, token, false);
             if (locationInfo == null) {
                 if (type.equals("ASN")) { // 入库
@@ -424,8 +408,6 @@ public class BusinessServiceImpl implements IBusinessService {
                 throw new ServiceException(fromMsg, token);
             }
         } else {
-            for (BaseLocationInfo b : locationInfoList) {
-            }
             locationInfo = checkTheSameColumnLocation(locationInfoList, token, true);
             if (locationInfo == null) {
                 if (type.equals("ASN")) { // 入库

warewms-hard/src/main/java/com/ruoyi/hard/plc/PlcService.java

@@ -176,6 +176,7 @@ public class PlcService {
     public static boolean plcDateReading15(){
         HslTools hslTools = HslTools.getInstance();
         boolean bool = hslTools.getBool("DB11.2.5");
+        log.info("plc信号合格品右下料:{}",bool);
         return bool;
     }
 
@@ -186,6 +187,7 @@ public class PlcService {
     public static boolean plcDateReading16(){
         HslTools hslTools = HslTools.getInstance();
         boolean bool = hslTools.getBool("DB11.2.6");
+        log.info("plc信号不合格左下料:{}",bool);
         return bool;
     }
 
@@ -196,6 +198,7 @@ public class PlcService {
     public static boolean plcDateReading17(){
         HslTools hslTools = HslTools.getInstance();
         boolean bool = hslTools.getBool("DB11.2.7");
+        log.info("plc信号不合格右下料:{}",bool);
         return bool;
     }