rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
曹鹏飞 2026-04-01 10:43:37 +08:00
parent fb4def1604 21599dcc2d
commit 93d9572c83
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
View File

@ -378,7 +378,8 @@ public class NormalQMController extends BaseController {
List<WmsQcReceive> qcReceives = wmsQcReceiveService List<WmsQcReceive> qcReceives = wmsQcReceiveService
.lambdaQuery() .lambdaQuery()
.in(WmsQcReceive::getId, request.getIds()) .in(WmsQcReceive::getId, request.getIds())
.ne(WmsQcReceive::getIsCompleted, 2) // .ne(WmsQcReceive::getIsCompleted, 2)
.ne(WmsQcReceive::getIsCompleted, 0)
.eq(WmsQcReceive::getIsCheck, 1) .eq(WmsQcReceive::getIsCheck, 1)
.list(); .list();

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -443,8 +443,8 @@ public class OutCostCenterController extends BaseController {
); );
Map<String, List<OutMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); Map<String, List<OutMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7));
OptRecordDTO optRecordDTO = new OptRecordDTO(); OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1); optRecordDTO.setOperationType((short)1)
optRecordDTO.setOrderId(records.get(0).getKey7()); .setOrderId(order.getNo());
optRecordService.add(optRecordDTO); optRecordService.add(optRecordDTO);
C_MaterialOutboundDTO vo = sapService.ZWM00_MB115(new C_MaterialOutboundQO() C_MaterialOutboundDTO vo = sapService.ZWM00_MB115(new C_MaterialOutboundQO()
.setResbRsNum(order.getRsnum()) .setResbRsNum(order.getRsnum())

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -576,8 +576,8 @@ public class OutProduceController extends BaseController {
); );
Map<String, List<OutMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); Map<String, List<OutMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7));
OptRecordDTO optRecordDTO = new OptRecordDTO(); OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1); optRecordDTO.setOperationType((short)1)
optRecordDTO.setOrderId(records.get(0).getKey7()); .setOrderId(order.getNo());
optRecordService.add(optRecordDTO); optRecordService.add(optRecordDTO);
Zwm3a10VO vo = sapService.zwm3A10(new Zwm3a10QO() Zwm3a10VO vo = sapService.zwm3A10(new Zwm3a10QO()
.setAufnr(order.getAufnr()) .setAufnr(order.getAufnr())

5
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
View File

@ -139,7 +139,6 @@ public class OutPurchaseController extends BaseController {
@Transactional @Transactional
@PostMapping("save") @PostMapping("save")
public ApiResult<Void> save(@Valid @RequestBody ZWM3A05VO request) { public ApiResult<Void> save(@Valid @RequestBody ZWM3A05VO request) {
String outPurchaseNo = serialNumberControllerService.generateSerialNumber(20);
Long orderId = IdUtil.getSnowflakeNextId(); Long orderId = IdUtil.getSnowflakeNextId();
List<WmsOutPurchaseItem> items = new ArrayList<>(); List<WmsOutPurchaseItem> items = new ArrayList<>();
List<OutMaterialScanRecord> records = new ArrayList<>(); List<OutMaterialScanRecord> records = new ArrayList<>();
@ -268,7 +267,7 @@ public class OutPurchaseController extends BaseController {
qrCodeMasterService.updateBarCode(qrCodeMasters); qrCodeMasterService.updateBarCode(qrCodeMasters);
outPurchaseService.save( outPurchaseService.save(
new WmsOutPurchase() new WmsOutPurchase()
.setNo(outPurchaseNo) .setNo(serialNumberControllerService.generateSerialNumber(20))
.setId(orderId) .setId(orderId)
.setEbeln(request.getEbeln()) .setEbeln(request.getEbeln())
.setLifnr(request.getLifnr()) .setLifnr(request.getLifnr())
@ -320,7 +319,7 @@ public class OutPurchaseController extends BaseController {
} }
OptRecordDTO optRecordDTO = new OptRecordDTO(); OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1) optRecordDTO.setOperationType((short)1)
.setOrderId(outPurchaseNo); .setOrderId(returnRequestService.getById(request.getPurchaseOrderId()).getApplicationNo());
optRecordService.add(optRecordDTO); optRecordService.add(optRecordDTO);
Pair<String, String> result = sapService.zwm3A06(request.getEbeln(), input1, input2); Pair<String, String> result = sapService.zwm3A06(request.getEbeln(), input1, input2);
outPurchaseService.lambdaUpdate() outPurchaseService.lambdaUpdate()