diff --git a/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java b/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java index af0ef85..e5318ac 100644 --- a/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java +++ b/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java @@ -9,7 +9,7 @@ public class PalletWareHouseData { private String palletId;//栈板ID private String taskNo; private Integer itemNo; - private String transTypeDesc;//立库出入库类型 出库 入库 + private String transTypeDesc;//立库出入库类型:出库 入库 取货通知 // private String toWareHouseId;//入库需要告知 仓库编码 private String toBarcode ;//入库需要告知 库位编码 } 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 5dd3b2d..7be8c02 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 @@ -216,11 +216,14 @@ public class WmsMessageServiceImpl implements WmsMessageService { // 如果是入库,同时更新对应的wms_order_task状态 if ("入库".equals(inData.getTransTypeDesc())) { updateOrderTaskStatusForInboundCallback(inData); + //防止没有组盘入库 + wcsIntegrationMapper.updatePalletDetailWcsFlag(inData.getSite(),inData.getPalletId()); wcsIntegrationMapper.updatePalletCallingFlag(inData.getSite(), inData.getPalletId(), "N", "SYS_WMS"); } // 如果是入库,同时更新对应的wms_order_task状态 if ("出库".equals(inData.getTransTypeDesc())) { updateOrderTaskStatusForOutCallback(inData); + //可能是移库出库 wcsIntegrationMapper.reUpdatePalletDetailWcsFlag(inData.getSite(),inData.getPalletId()); wcsIntegrationMapper.updatePalletCallingFlag(inData.getSite(), inData.getPalletId(), "Y", "SYS_WMS"); }