|
|
|
@ -602,10 +602,10 @@ public class RCSUtil { |
|
|
|
Result result = new Result(); |
|
|
|
Result result = new Result(); |
|
|
|
result.setCode(200); |
|
|
|
result.setCode(200); |
|
|
|
result.setResult(true); |
|
|
|
result.setResult(true); |
|
|
|
|
|
|
|
BasePoint basePoint = null; |
|
|
|
//空治具回库
|
|
|
|
//空治具回库
|
|
|
|
if (taskType.equals(TaskTypeEnum.emptyCon.getValue())) { |
|
|
|
if (taskType.equals(TaskTypeEnum.emptyCon.getValue())) { |
|
|
|
BasePoint basePoint = null; |
|
|
|
|
|
|
|
BusinDataTask fontbusinDataTask = businDataTaskMapper.selectfrontById(businDataTask); |
|
|
|
BusinDataTask fontbusinDataTask = businDataTaskMapper.selectfrontById(businDataTask); |
|
|
|
if (ObjectUtils.isNotEmpty(fontbusinDataTask)) { |
|
|
|
if (ObjectUtils.isNotEmpty(fontbusinDataTask)) { |
|
|
|
QueryWrapper<BusinPickup> pickupQueryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<BusinPickup> pickupQueryWrapper = new QueryWrapper<>(); |
|
|
|
@ -625,13 +625,24 @@ public class RCSUtil { |
|
|
|
basePoint = iBasePointService.selectBasePointByPointNo(fromSide); |
|
|
|
basePoint = iBasePointService.selectBasePointByPointNo(fromSide); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (basePoint != null) { |
|
|
|
if (taskType.equals(TaskTypeEnum.byhand_in.getValue())) { |
|
|
|
basePoint.setIsOccupy("0"); |
|
|
|
String fromSide = businDataTask.getFromSide(); |
|
|
|
iBasePointService.updateById(basePoint); |
|
|
|
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<WcsPlcProperty> propertyList = iWcsPlcPropertyService.getWcsPlcPropertyByPlcId(plcId); |
|
|
|
List<WcsPlcProperty> propertyList = iWcsPlcPropertyService.getWcsPlcPropertyByPlcId(plcId); |
|
|
|
for (WcsPlcProperty wcsPlcProperty : propertyList) { |
|
|
|
for (WcsPlcProperty wcsPlcProperty : propertyList) { |
|
|
|
/** |
|
|
|
/** |
|
|
|
|