diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index db45f305..2bc329d0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -443,8 +443,8 @@ public class OutCostCenterController extends BaseController { ); Map> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(records.get(0).getKey7()); + optRecordDTO.setOperationType((short)1) + .setOrderId(order.getNo()); optRecordService.add(optRecordDTO); C_MaterialOutboundDTO vo = sapService.ZWM00_MB115(new C_MaterialOutboundQO() .setResbRsNum(order.getRsnum()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 26aae8dc..3a985f9b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -576,8 +576,8 @@ public class OutProduceController extends BaseController { ); Map> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(records.get(0).getKey7()); + optRecordDTO.setOperationType((short)1) + .setOrderId(order.getNo()); optRecordService.add(optRecordDTO); Zwm3a10VO vo = sapService.zwm3A10(new Zwm3a10QO() .setAufnr(order.getAufnr()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 27f6093c..fba82098 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -139,7 +139,6 @@ public class OutPurchaseController extends BaseController { @Transactional @PostMapping("save") public ApiResult save(@Valid @RequestBody ZWM3A05VO request) { - String outPurchaseNo = serialNumberControllerService.generateSerialNumber(20); Long orderId = IdUtil.getSnowflakeNextId(); List items = new ArrayList<>(); List records = new ArrayList<>(); @@ -268,7 +267,7 @@ public class OutPurchaseController extends BaseController { qrCodeMasterService.updateBarCode(qrCodeMasters); outPurchaseService.save( new WmsOutPurchase() - .setNo(outPurchaseNo) + .setNo(serialNumberControllerService.generateSerialNumber(20)) .setId(orderId) .setEbeln(request.getEbeln()) .setLifnr(request.getLifnr()) @@ -320,7 +319,7 @@ public class OutPurchaseController extends BaseController { } OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short)1) - .setOrderId(outPurchaseNo); + .setOrderId(returnRequestService.getById(request.getPurchaseOrderId()).getApplicationNo()); optRecordService.add(optRecordDTO); Pair result = sapService.zwm3A06(request.getEbeln(), input1, input2); outPurchaseService.lambdaUpdate()