diff --git a/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java b/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java index e6346ab..b50470a 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java +++ b/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java @@ -602,10 +602,10 @@ public class RCSUtil { Result result = new Result(); result.setCode(200); result.setResult(true); - + BasePoint basePoint = null; //空治具回库 if (taskType.equals(TaskTypeEnum.emptyCon.getValue())) { - BasePoint basePoint = null; + BusinDataTask fontbusinDataTask = businDataTaskMapper.selectfrontById(businDataTask); if (ObjectUtils.isNotEmpty(fontbusinDataTask)) { QueryWrapper pickupQueryWrapper = new QueryWrapper<>(); @@ -625,13 +625,24 @@ public class RCSUtil { basePoint = iBasePointService.selectBasePointByPointNo(fromSide); } } + } - if (basePoint != null) { - basePoint.setIsOccupy("0"); - iBasePointService.updateById(basePoint); + if (taskType.equals(TaskTypeEnum.byhand_in.getValue())) { + String fromSide = businDataTask.getFromSide(); + if (StringUtils.isNotEmpty(fromSide)) { + if ("1".equals(bo.getSn()) && "completed".equals(bo.getStatus())) { + log.info("人工入库时,上报时释放码头信息:" + JsonUtil.toJSONString(businDataTask)); + basePoint = iBasePointService.selectBasePointByPointNo(fromSide); + } } } + + if (basePoint != null) { + basePoint.setIsOccupy("0"); + iBasePointService.updateById(basePoint); + } + List propertyList = iWcsPlcPropertyService.getWcsPlcPropertyByPlcId(plcId); for (WcsPlcProperty wcsPlcProperty : propertyList) { /**