diff --git a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java index d2b7bfd..0fbc310 100644 --- a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java +++ b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java @@ -516,10 +516,10 @@ public class WmsMessageServiceImpl implements WmsMessageService { // 1. 站点编码转换(WCS的1099/1093映射为D1/D2)- rqrq convertStationCode(inData); - // 2. 验证只能是滚筒对接区 - rqrq - if (!inData.getToBarcode().startsWith("D")) { - throw new RuntimeException("目前只有滚筒对接区(D1/D2)可以执行取走栈板操作,当前站点:" + inData.getToBarcode()); - } + // 2. 验证只能是滚筒对接区 - rqrq 还有异常位 +// if (!inData.getToBarcode().startsWith("D")) { +// throw new RuntimeException("目前只有滚筒对接区(D1/D2)可以执行取走栈板操作,当前站点:" + inData.getToBarcode()); +// } // 3. 设置目标位置 - rqrq String toWarehouseId = BufferZoneConfig.BUFFER_WAREHOUSE_ID.getValue(); diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java index aa8cfaf..c630de9 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java @@ -116,12 +116,12 @@ public class WcsTaskServiceImpl implements WcsTaskService { updateOrderTaskStatusForInbound(callbackTask); palletMapper.updateLocationWithPalletId(request.getSite(), request.getPalletId(), request.getToStation(), request.getToStation()); - wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "N", null, "SYS_WMS"); +// wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "N", null, "SYS_WMS"); } else { palletMapper.updateLocationWithPalletId(request.getSite(), request.getPalletId(), "Virtual_AS", null); // wcsIntegrationMapper.updatePalletWcsLocation(callbackTask.getSite(), callbackTask.getPalletId(), null); - wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "Y", null, "SYS_WMS"); +// wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "Y", null, "SYS_WMS"); } } else if ("取货通知".equals(callbackTask.getTransTypeDesc())) { // 取货通知:更新托盘位置和订单任务状态 - rqrq @@ -569,10 +569,13 @@ public class WcsTaskServiceImpl implements WcsTaskService { System.out.println("开始处理取走栈板 - rqrq,palletId=" + callbackTask.getPalletId() + ", toStation=" + callbackTask.getToStation()); try { - // 1. 检查toStation是否以D开头(滚筒对接区)- rqrq - if (callbackTask.getToStation() == null || !callbackTask.getToStation().startsWith("D")) { - throw new RuntimeException("目前只有滚筒对接区(D1/D2)可以执行取走栈板操作,当前站点:" + callbackTask.getToStation()); - } + // 1. 检查toStation是否以D开头(滚筒对接区)- rqrq 还有异常位 +// if (callbackTask.getToStation() == null || !callbackTask.getToStation().startsWith("D")) { +// throw new RuntimeException("目前只有滚筒对接区(D1/D2)可以执行取走栈板操作,当前站点:" + callbackTask.getToStation()); +// } + //进入立库后调用变成N + + wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "N", null, "SYS_WMS"); // 2. 更新站点状态为空闲 - rqrq // wcsIntegrationMapper.updateAgvStationStatus(callbackTask.getToStation(), 0, "空闲");