diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 9a03fb5e..9a50bab3 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -767,7 +767,7 @@ public class NormalPGIController extends BaseController { content.setReceiveType("BY_DELIVERY"); content.setLineVOList(new ArrayList<>()); dto.setContent(content); - dto.setCode("SCAN_RCV_RECEIVE_TO_SRM"); + dto.setCode("WMS_RCV_RECEIVE_TO_SRM"); qcDto.setPushDto(dto); } srmPushDto = qcDto.getPushDto(); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 0e871c97..b63ba101 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -94,6 +94,7 @@ public class OutAssistanceController extends BaseController { @Resource private IOptRecordService optRecordService; + @Resource private IWmsOutProduceService outProduceService; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 7e525486..d2519cde 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -452,9 +452,9 @@ public class StructuralPackageOrderController extends BaseController { // 获取托盘号:如果物料项有关联的托盘,则使用托盘号;否则为空 if (item.getTrayId() != null) { WmsStructuralPackageOrderTray tray = trays.stream() - .filter(t -> t.getId().equals(item.getTrayId())) - .findFirst() - .orElse(null); + .filter(t -> t.getId().equals(item.getTrayId())) + .findFirst() + .orElse(null); if (tray != null) { ivo.setNo(tray.getNo()); } else { @@ -519,6 +519,7 @@ public class StructuralPackageOrderController extends BaseController { /** * 获取托盘零件列表 + * * @param id 订单id */ @GetMapping("getItems")