-- 成品下线入库业务拆分成成品下线，成品入库两段任务

ruoyi-admin/src/main/java/com/ruoyi/nieyan/controller/pda/PdaAgvCallController.java

@@ -183,13 +183,8 @@ public class PdaAgvCallController {
         String createUser = agvCallForm.getCreateUser();
         Boolean theWrapped = agvCallForm.getTheWrapped(); // 是否裹膜
         Boolean theWeighing = agvCallForm.getTheWeighing(); // 是否复称
-
-        List<AgvCallItemDTO> agvCallItemDTOList = agvCallForm.getAgvCallItemDTOList();
-        return agvCallProxyService.productsDownLineLSN(locationFrom, locationTo, createUser
-                ,theWrapped , theWeighing, agvCallItemDTOList);
-
         // 如果裹膜，就先不去称重
-        /*if (theWrapped) {
+        if (theWrapped) {
             theWeighing = false;
         }
         List<AgvCallItemDTO> agvCallItemDTOList = agvCallForm.getAgvCallItemDTOList();
@@ -198,7 +193,7 @@ public class PdaAgvCallController {
                         , theWeighing, agvCallItemDTOList)
                 :
                 agvCallProxyService.productsDownLineInvLSN(locationFrom, locationTo, createUser
-                        , theWeighing, agvCallItemDTOList);*/
+                        , theWeighing, agvCallItemDTOList);
     }
 
     /**
@@ -219,13 +214,8 @@ public class PdaAgvCallController {
         String createUser = agvCallForm.getCreateUser();
         Boolean theWrapped = agvCallForm.getTheWrapped();
         Boolean theWeighing = agvCallForm.getTheWeighing();
-
-        List<AgvCallItemDTO> agvCallItemDTOList = agvCallForm.getAgvCallItemDTOList();
-        return  agvCallProxyService.productsDownLineLHN(locationFrom, locationTo, createUser
-                ,theWrapped, theWeighing, agvCallItemDTOList);
-
         // 如果裹膜，就先不去称重
-        /*if (theWrapped) {
+        if (theWrapped) {
             theWeighing = false;
         }
         List<AgvCallItemDTO> agvCallItemDTOList = agvCallForm.getAgvCallItemDTOList();
@@ -234,7 +224,7 @@ public class PdaAgvCallController {
                         , theWeighing, agvCallItemDTOList)
                 :
                 agvCallProxyService.productsDownLineInvLHN(locationFrom, locationTo, createUser
-                        , theWeighing, agvCallItemDTOList);*/
+                        , theWeighing, agvCallItemDTOList);
     }
 
     /**
@@ -285,10 +275,10 @@ public class PdaAgvCallController {
     @ApiOperation("成品中转（硫酸镍｜氯化镍）")
     @PostMapping("productsDownLineToCache")
     public AjaxResult productsDownLineToCache(@RequestBody AgvCallForm agvCallForm) {
+        String locationFrom = agvCallForm.getLocationFrom();
+        String locationTo = agvCallForm.getLocationTo();
         String createUser = agvCallForm.getCreateUser();
-        Boolean theWrapped = agvCallForm.getTheWrapped();
-        Boolean theWeighing = agvCallForm.getTheWeighing();
-        return agvCallProxyService.productsDownLineToCache(theWrapped, theWeighing,createUser);
+        return agvCallProxyService.productsDownLineToCache(locationFrom, locationTo, createUser);
     }
 
     /**

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -312,57 +312,45 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
     @Override
     public void gateOpen(Integer doorNo){
 
-        if(redisCache.checkIsLock("open")){
+        try {
 
-            try {
-
-                int state = modbusTcpWeigherClient.redGateState(4);
-                if(state == 1){
-                    log.info("gateOpen允许AGV通过！门号：" + doorNo);
-                    feedbackTS(doorNo);
-                }
-                //发送开门信号
-                boolean state2 = modbusTcpWeigherClient.writeGateOpen();
-                log.info("gateOpen发送开门信号！状态：" + state2);
-                Thread.sleep(3000);
-
-                //清除开门信号
-                boolean state3 = modbusTcpWeigherClient.clearOpenStaate();
-                log.info("gateOpen清除开门信号！状态：" + state3);
+            int state = modbusTcpWeigherClient.redGateState(4);
+            log.info("gateOpen当前状态！门号：" + doorNo);
+            if(state == 1){
+                feedbackTS(doorNo);
+            }
+            //发送开门信号
+            boolean state2 = modbusTcpWeigherClient.writeGateOpen();
+            log.info("gateOpen发送开门信号！状态：" + state2);
+            Thread.sleep(3000);
 
-            } catch (InterruptedException e) {
+            //清除开门信号
+            boolean state3 = modbusTcpWeigherClient.clearOpenStaate();
+            log.info("gateOpen清除开门信号！状态：" + state3);
 
-                e.printStackTrace();
-            }finally {
+        } catch (InterruptedException e) {
 
-                redisCache.expire("open",12000);
-            }
+            e.printStackTrace();
         }
     }
 
     @Override
     public void gateClose(Integer doorNo) {
 
-        if(redisCache.checkIsLock("close")){
-
-            try {
+        try {
 
-                //发送关门信号
-                boolean state2 = modbusTcpWeigherClient.writeGateClose();
-                log.info("gateClose发送关门信号！状态：" + state2);
-                Thread.sleep(3000);
+            //发送关门信号
+            boolean state2 = modbusTcpWeigherClient.writeGateClose();
+            log.info("gateClose发送关门信号！状态：" + state2);
+            Thread.sleep(3000);
 
-                //清除关门信号
-                boolean state3 = modbusTcpWeigherClient.clearCloseState();
-                log.info("gateClose清除关门信号！状态：" + state3);
+            //清除关门信号
+            boolean state3 = modbusTcpWeigherClient.clearCloseState();
+            log.info("gateClose清除关门信号！状态：" + state3);
 
-            } catch (InterruptedException e) {
+        } catch (InterruptedException e) {
 
-                e.printStackTrace();
-            } finally {
-
-                redisCache.expire("close",12000);
-            }
+            e.printStackTrace();
         }
     }
 }

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

@@ -125,7 +125,6 @@ public class BusinessServiceImpl implements IBusinessService {
     public AjaxResult agvCall(FlowConfigHeaderVO flowConfigHeaderVO, List<AgvCallDTO> agvCallDTOList) {
         //唯一操作标识，用于redis标记。报错时根据该id进行删除
         Long token = SnowflakeIdWorker.generateId();
-        Map<String, String> map = new HashMap<>();
         try {
             //查询全局配置策略
             AsnSoStrategy asnSoStrategy = asnSoStrategyMapper.selectAsnSoStrategy();
@@ -148,26 +147,10 @@ public class BusinessServiceImpl implements IBusinessService {
                 }
 
                 if (flowConfigHeaderVO.getFlowType().equals("ASN")) {
-
-                    List<BaseLocationInfo> locationFromList = new ArrayList<>();
-                    //如果是中转入库
-                    if(agvCallDTO.getAsnType()){
-
-                        locationFromList = baseLocationInfoMapper.selectSortedLocationLotattListByZoneIdListOrderBy(zoneIdList
-                                , Constant.WAREHOUSE_ID, map, "", "inv.create_time");
-                        locationFrom = this.zoneLocationAllocation(locationFromList, "locationFrom", "ASN", asnSoStrategy, token);
-                        //获取库存
-                        List<InvLotLocIdLotattVO> invList = invLotLocIdService.selectInvLocIdLotattByLocationId(locationFrom.getId());
-                        if(invList.size() < 1) return AjaxResult.error("该起始库位没有库存!");
-                        paramLocationTo = "Y".equals(invList.get(0).getLotatt18()) ? "8,9,10":"11";
-                    }else{
-
-                        locationFromList = this.convertLocation(paramLocationFrom, agvCallDTO.getWarehouseId(), null);
-                        locationFrom = this.zoneLocationAllocation(locationFromList, "locationFrom", "ASN", asnSoStrategy, token);
-                    }
+                    List<BaseLocationInfo> locationFromList = this.convertLocation(paramLocationFrom, agvCallDTO.getWarehouseId(), null);
                     List<BaseLocationInfo> locationToList = this.convertLocation(paramLocationTo, agvCallDTO.getWarehouseId(), null);
+                    locationFrom = this.zoneLocationAllocation(locationFromList, "locationFrom", "ASN", asnSoStrategy, token);
                     locationTo = this.zoneLocationAllocation(locationToList, "locationTo", "ASN", asnSoStrategy, token);
-
                     // 初始化库存
                     if (agvCallDTO.getAgvCallItemDTOList().size() > 0) {
                         iInvLotAttService.deleteInvLotAttBylocationId(locationFrom.getId());
@@ -176,11 +159,6 @@ public class BusinessServiceImpl implements IBusinessService {
                     }
                     wcsTaskList.addAll(this.genTask(locationFrom, locationTo, flowConfigHeaderVO, agvCallDTO, token));
 
-                    BaseLocationInfo bli = new BaseLocationInfo();
-                    bli.setId(Long.parseLong("10639"));
-                    bli.setStockStatus("10");
-                    baseLocationInfoService.updateBaseLocationInfo(bli);
-
                 } else if (flowConfigHeaderVO.getFlowType().equals("SO")) {
                     List<BaseLocationInfo> locationFromListEnd = new ArrayList<>();
                     boolean isLocation = baseLocationInfoService.checkIsLocation(paramLocationFrom, Constant.WAREHOUSE_ID);
@@ -475,8 +453,9 @@ public class BusinessServiceImpl implements IBusinessService {
             wcsTask.setTaskType(Constant.TASK_TYPE.FORWARD.getValue());
             wcsTask.setExt8(token.toString());
             wcsTask.setExt7(flowConfigHeaderVO.getId().toString());
-            wcsTask.setExt3(agvCallDTO.getExt3() == null || "".equals(agvCallDTO.getExt3())?
-                                "0000": agvCallDTO.getExt3());
+            // 是否复称
+            wcsTask.setExt3(agvCallDTO.getTheWeighing() == null ? "0000"
+                    : agvCallDTO.getTheWeighing() ? "0001" : "0000");
             wcsTask.setExtParam(agvCallDTO.getExtParam());
             wcsTaskList.add(wcsTask);
             businessService.addTask(wcsTask);

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

@@ -228,6 +228,59 @@ public class AgvCallProxyService {
         return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SEVEN.getValue(), agvCallDTO);
     }
 
+    /**
+     * 成品下线（硫酸镍）->裹膜|成品暂存区
+     *
+     * @param locationFrom
+     * @param locationTo
+     * @param createUser
+     * @param theWeighing
+     * @param agvCallItemDTOList
+     * @return
+     */
+    public AjaxResult productsDownLineLSN(String locationFrom, String locationTo, String createUser
+            , Boolean theWeighing
+            , List<AgvCallItemDTO> agvCallItemDTOList) {
+        AgvCallDTO agvCallDTO = new AgvCallDTO();
+        agvCallDTO.setLocationFrom(locationFrom);
+        agvCallDTO.setLocationTo(locationTo);
+        agvCallDTO.setCreateUser(createUser);
+        agvCallDTO.setTheWeighing(theWeighing);
+        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+        // 增加硫酸镍标识
+        for (AgvCallItemDTO agvCallItemDTO : agvCallItemDTOList) {
+            agvCallItemDTO.getLotattDTO().setLotatt18("Y"); //是否硫酸镍，Y代表是
+        }
+        createWmsDoc(createUser, agvCallItemDTOList);
+        return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.EIGHT.getValue(), agvCallDTO);
+    }
+
+    /**
+     * 成品下线（硫酸镍）->仓储区
+     *
+     * @param locationFrom
+     * @param locationTo
+     * @param createUser
+     * @param theWeighing
+     * @param agvCallItemDTOList
+     * @return
+     */
+    public AjaxResult productsDownLineInvLSN(String locationFrom, String locationTo, String createUser
+            , Boolean theWeighing
+            , List<AgvCallItemDTO> agvCallItemDTOList) {
+        AgvCallDTO agvCallDTO = new AgvCallDTO();
+        agvCallDTO.setLocationFrom(locationFrom);
+        agvCallDTO.setLocationTo(locationTo);
+        agvCallDTO.setCreateUser(createUser);
+        agvCallDTO.setTheWeighing(theWeighing);
+        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+        // 增加硫酸镍标识
+        for (AgvCallItemDTO agvCallItemDTO : agvCallItemDTOList) {
+            agvCallItemDTO.getLotattDTO().setLotatt18("Y"); //是否硫酸镍，Y代表是
+        }
+        createWmsDoc(createUser, agvCallItemDTOList);
+        return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.NINE.getValue(), agvCallDTO);
+    }
 
     public void createWmsDoc(String createUser
             , List<AgvCallItemDTO> agvCallItemDTOList){
@@ -306,121 +359,6 @@ public class AgvCallProxyService {
         }
     }
 
-
-    /**
-     *获取目标库位
-     * @param theWrapped 是否裹膜
-     * @param theWeighing 是否复称
-     * @param taskType 任务类型  0-硫酸镍    1-氯化镍
-     * @return
-     */
-    public String queryBaslocationTo(Boolean theWrapped,Boolean theWeighing,List<BaseLocationInfo> blfList
-            ,Integer taskType){
-
-        if(theWrapped) {
-
-            if (blfList.size() > 0) {
-                return taskType == 0 ? "8,9,10" : "11";
-            } else {
-                return "17";
-            }
-        }else{
-
-            return taskType == 0 ? "8,9,10" : "11";
-        }
-    }
-
-    /**
-     * 获取NDC任务类型
-     * @param theWrapped 是否裹膜
-     * @param theWeighing 是否复称
-     * @return
-     */
-    public String queryTaskType(Boolean theWrapped,Boolean theWeighing,List<BaseLocationInfo> blfList){
-
-        if(theWrapped && theWeighing){
-
-            if(blfList.size() > 0){
-                return "0003";
-            }else{
-                return "0000";
-            }
-        }else if(theWrapped && !theWeighing){
-
-            if(blfList.size() > 0){
-                return "0002";
-            }else{
-                return "0000";
-            }
-        }else if(!theWrapped && theWeighing){
-
-            return "0001";
-        }else{
-
-            return "0000";
-        }
-    }
-
-
-
-    /**
-     * 成品下线（硫酸镍）->裹膜|成品暂存区
-     *
-     * @param locationFrom
-     * @param locationTo
-     * @param createUser
-     * @param theWeighing
-     * @param agvCallItemDTOList
-     * @return
-     */
-    public AjaxResult productsDownLineLSN(String locationFrom, String locationTo, String createUser,
-                                          Boolean theWrapped, Boolean theWeighing, List<AgvCallItemDTO> agvCallItemDTOList) {
-
-        //根据裹膜库位的状态判断目标点
-        List<BaseLocationInfo> bliList = baseLocationInfoService.selectEmptyLocationByZoneId("15");
-        //获取目标库区
-        String zoneList = queryBaslocationTo(theWrapped,theWeighing,bliList,0);
-
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setLocationFrom(locationFrom);
-        agvCallDTO.setLocationTo(zoneList);
-        agvCallDTO.setCreateUser(createUser);
-        agvCallDTO.setTheWeighing(theWeighing);
-        agvCallDTO.setExt3(queryTaskType(theWrapped,theWeighing,bliList));
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        agvCallDTO.setAsnType(false);//下线入库
-        // 增加硫酸镍标识
-        for (AgvCallItemDTO agvCallItemDTO : agvCallItemDTOList) {
-            agvCallItemDTO.getLotattDTO().setLotatt18("Y"); //是否硫酸镍，Y代表否
-        }
-        createWmsDoc(createUser, agvCallItemDTOList);
-        return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.EIGHT.getValue(), agvCallDTO);
-    }
-
-    /**
-     * 成品下线（硫酸镍）->仓储区
-     *
-     * @param locationFrom
-     * @param locationTo
-     * @param createUser
-     * @param theWeighing
-     * @param agvCallItemDTOList
-     * @return
-     */
-    public AjaxResult productsDownLineInvLSN(String locationFrom, String locationTo, String createUser
-            , Boolean theWeighing
-            , List<AgvCallItemDTO> agvCallItemDTOList) {
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setLocationFrom(locationFrom);
-        agvCallDTO.setLocationTo(locationTo);
-        agvCallDTO.setCreateUser(createUser);
-        agvCallDTO.setTheWeighing(theWeighing);
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        agvCallDTO.setAsnType(false);//下线入库
-        createWmsDoc(createUser, agvCallItemDTOList);
-        return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.NINE.getValue(), agvCallDTO);
-    }
-
     /**
      * 成品下线（氯化镍）->裹膜
      *
@@ -432,29 +370,20 @@ public class AgvCallProxyService {
      * @return
      */
     public AjaxResult productsDownLineLHN(String locationFrom, String locationTo, String createUser
-            , Boolean theWrapped, Boolean theWeighing
+            , Boolean theWeighing
             , List<AgvCallItemDTO> agvCallItemDTOList) {
-
-        //根据裹膜库位的状态判断目标点
-        List<BaseLocationInfo> bliList = baseLocationInfoService.selectEmptyLocationByZoneId("15");
-        //获取目标库区
-        String zoneList = queryBaslocationTo(theWrapped,theWeighing,bliList,1);
-
         AgvCallDTO agvCallDTO = new AgvCallDTO();
         agvCallDTO.setLocationFrom(locationFrom);
-        agvCallDTO.setLocationTo(zoneList);
+        agvCallDTO.setLocationTo(locationTo);
         agvCallDTO.setCreateUser(createUser);
         agvCallDTO.setTheWeighing(theWeighing);
-        agvCallDTO.setExt3(queryTaskType(theWrapped,theWeighing,bliList));
-        agvCallDTO.setAsnType(false);//下线入库
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
         // 增加氯化镍标识
         for (AgvCallItemDTO agvCallItemDTO : agvCallItemDTOList) {
             agvCallItemDTO.getLotattDTO().setLotatt18("N"); //是否硫酸镍，N代表否
         }
         createWmsDoc(createUser, agvCallItemDTOList);
-
-        return iBusinessService.agvCall( Constant.FLOW_CONFIG_ID.TWELVE.getValue(), agvCallDTO);
+        return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.ELEVEN.getValue(), agvCallDTO);
     }
 
     /**
@@ -476,7 +405,10 @@ public class AgvCallProxyService {
         agvCallDTO.setCreateUser(createUser);
         agvCallDTO.setTheWeighing(theWeighing);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        agvCallDTO.setAsnType(false);//下线入库
+        // 增加氯化镍标识
+        for (AgvCallItemDTO agvCallItemDTO : agvCallItemDTOList) {
+            agvCallItemDTO.getLotattDTO().setLotatt18("N"); //是否硫酸镍，N代表否
+        }
         createWmsDoc(createUser, agvCallItemDTOList);
         return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.TWELVE.getValue(), agvCallDTO);
     }
@@ -528,19 +460,15 @@ public class AgvCallProxyService {
     /**
      * 成品中转（硫酸镍｜氯化镍）->裹膜
      *
+     * @param locationFrom
+     * @param locationTo
      * @param createUser
      * @return
      */
-    public AjaxResult productsDownLineToCache(Boolean theWrapped, Boolean theWeighing,String createUser) {
-
-        //根据裹膜库位的状态判断目标点
-        List<BaseLocationInfo> bliList = baseLocationInfoService.selectEmptyLocationByZoneId("15");
-        if(theWrapped && bliList.size() < 1) return AjaxResult.error("裹膜库位被占用,无法下发任务,请确认库位状态!");
-
+    public AjaxResult productsDownLineToCache(String locationFrom, String locationTo, String createUser) {
         AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setAsnType(true);//中转入库
-        agvCallDTO.setTheWeighing(true);
-        agvCallDTO.setExt3(queryTaskType(theWrapped,theWeighing,bliList));
+        agvCallDTO.setLocationFrom(locationFrom);
+        agvCallDTO.setLocationTo(locationTo);
         agvCallDTO.setCreateUser(createUser);
         return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SIXTEEN.getValue(), agvCallDTO);
     }

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

@@ -466,11 +466,6 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                         if (!StringUtils.isEmpty(wcsTask.getExt8())) {
                             redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
                         }
-                        //释放裹膜位置库位
-                        BaseLocationInfo bli6 = new BaseLocationInfo();
-                        bli6.setId(Long.parseLong("10639"));
-                        bli6.setStockStatus("00");
-                        baseLocationInfoService.updateBaseLocationInfo(bli6);
                         break;
                     case 7://取消
                         wcsTask.setEndTime(new Date());
@@ -490,11 +485,6 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                         }
                         // 取消任务删除中间缓存库存
 //                        cancelTaskDelMiddleCache(wcsTask);
-                        //释放裹膜位置库位
-                        BaseLocationInfo bli7 = new BaseLocationInfo();
-                        bli7.setId(Long.parseLong("10639"));
-                        bli7.setStockStatus("00");
-                        baseLocationInfoService.updateBaseLocationInfo(bli7);
                         break;
                     case 8:
                         log.error("任务异常状态------------" + wcsTask.getTaskNo());