diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 33c7ca75c..6cddacf12 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1137,17 +1137,20 @@ public class IoCodeTempController extends BaseController { UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); // 只要是一单的话就用同一个 虚拟槽位 加载orderQueueCode !!!! IoOrderEntity byBillNo = orderService.findByBillNo(orderId); - String queueCode; - if (StrUtil.isBlank(addOrderRequest.getWorkPlaceQueueCode())){ - if (byBillNo != null && !StrUtil.isBlank(byBillNo.getWorkPlaceQueueCode())){ - queueCode = byBillNo.getWorkPlaceQueueCode(); - } else { - // userId 没有什么用 设置为1 问题不大 避免空指针 - queueCode = ioSplitFifoInvService.setQueueCode(addOrderRequest.getWorkPlaceCode(),1+"",udiRelevanceResponse1.getRelId()); - addCodeResult.setQueueCode(queueCode); + String queueCode = ""; + + if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)){ + if (StrUtil.isBlank(addOrderRequest.getWorkPlaceQueueCode())){ + if (byBillNo != null && !StrUtil.isBlank(byBillNo.getWorkPlaceQueueCode())){ + queueCode = byBillNo.getWorkPlaceQueueCode(); + } else { + // userId 没有什么用 设置为1 问题不大 避免空指针 + queueCode = ioSplitFifoInvService.setQueueCode(addOrderRequest.getWorkPlaceCode(),1+"",udiRelevanceResponse1.getRelId()); + addCodeResult.setQueueCode(queueCode); + } + }else { + queueCode = addOrderRequest.getWorkPlaceQueueCode(); } - }else { - queueCode = addOrderRequest.getWorkPlaceQueueCode(); } IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); @@ -1653,7 +1656,20 @@ public class IoCodeTempController extends BaseController { UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); // 只要是一单的话就用同一个 虚拟槽位 加载orderQueueCode !!!! IoOrderEntity byBillNo = orderService.findByBillNo(orderId); - String queueCode; + String queueCode = ""; + if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)){ + if (StrUtil.isBlank(addOrderRequest.getWorkPlaceQueueCode())){ + if (byBillNo != null && !StrUtil.isBlank(byBillNo.getWorkPlaceQueueCode())){ + queueCode = byBillNo.getWorkPlaceQueueCode(); + } else { + // userId 没有什么用 设置为1 问题不大 避免空指针 + queueCode = ioSplitFifoInvService.setQueueCode(addOrderRequest.getWorkPlaceCode(),1+"",udiRelevanceResponse1.getRelId()); + addCodeResult.setQueueCode(queueCode); + } + }else { + queueCode = addOrderRequest.getWorkPlaceQueueCode(); + } + } if (StrUtil.isBlank(addOrderRequest.getWorkPlaceQueueCode())){ if (byBillNo != null && !StrUtil.isBlank(byBillNo.getWorkPlaceQueueCode())){ queueCode = byBillNo.getWorkPlaceQueueCode();