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-03-30 16:19:05 +08:00
parent aa72f63f35 f1302fdf49
commit e8609eca0c
12 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
View File

@ -154,7 +154,7 @@ public class ComponentOutboundController extends BaseController {
}
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(outbound.getVbelv());
optRecordDTO.setOrderId(outbound.getPackingNo());
optRecordService.add(optRecordDTO);
// 组装SAP的信息
ZWM3A20DTO zwm3a20DTO = new ZWM3A20DTO()
@ -212,7 +212,7 @@ public class ComponentOutboundController extends BaseController {
//List<String> codeIds = new ArrayList<>();
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(packing.getVbelv());
optRecordDTO.setOrderId(packing.getNo());
optRecordService.add(optRecordDTO);
ZWM3A20DTO zwm3a20DTO = new ZWM3A20DTO()
.setItSernrPatch(new ArrayList<>())
@ -468,7 +468,7 @@ public class ComponentOutboundController extends BaseController {
});
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(ticket.getOutboundNo());
optRecordDTO.setOrderId(ticket.getPackingNo());
optRecordService.add(optRecordDTO);
Pair<String, String> result = sapService.zwm3a20(zwm3a20DTO);
wmsComponentOutboundService.lambdaUpdate()

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

@ -323,8 +323,8 @@ public class InCostCenterBackController extends BaseController {
);
Map<String, List<InMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(InMaterialScanRecord::getKey7));
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(ticket.getNo());
optRecordDTO.setOperationType((short) 1)
.setOrderId(ticket.getNo());
optRecordService.add(optRecordDTO);
C_MaterialReturnDTO vo = sapService.zwm00_MB112(new C_MaterialReturnQO()
.setResbRsNum(order.getRsnum())

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

@ -338,8 +338,8 @@ public class InProduceBackController extends BaseController {
);
Map<String, List<InMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(InMaterialScanRecord::getKey7));
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(ticket.getNo());
optRecordDTO.setOperationType((short)1)
.setOrderId(ticket.getNo());
optRecordService.add(optRecordDTO);
Zwm3a11VO vo = sapService.zwm3a11(new Zwm3a11QO()
.setAufnr(order.getAufnr())

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

@ -611,8 +611,8 @@ public class InProduceOrderController extends BaseController {
);
}
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short) 1);
optRecordDTO.setOrderId(order.getNo());
optRecordDTO.setOperationType((short) 1)
.setOrderId(order.getNo());
optRecordService.add(optRecordDTO);
//同步入库信息到SAP
Zwm00Mb107DTO dto = sapService.zwm00_mb107(order.getOrderNo(), UserUtil.getUserName(), input1, sernrs);

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

@ -450,8 +450,8 @@ public class OutAssistanceController extends BaseController {
);
Map<String, List<OutMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7));
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short) 1);
optRecordDTO.setOrderId(order.getNo());
optRecordDTO.setOperationType((short) 1)
.setOrderId(order.getNo());
optRecordService.add(optRecordDTO);
SubcontractedOrderConfirmDTO dto = sapService.zwm3a04(new SubcontractedOrderConfirmQO()
.setIEbeln(order.getEbeln())

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

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

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

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

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

@ -319,8 +319,8 @@ public class OutPurchaseController extends BaseController {
.update();
}
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(outPurchaseNo);
optRecordDTO.setOperationType((short)1)
.setOrderId(outPurchaseNo);
optRecordService.add(optRecordDTO);
Pair<String, String> result = sapService.zwm3A06(request.getEbeln(), input1, input2);
outPurchaseService.lambdaUpdate()

12
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -1003,10 +1003,10 @@ public class StructuralPackageOrderController extends BaseController {
VUtil.trueThrowBusinessError(Objects.isNull(dto)).throwMessage("ZIM_004未查询到数据");
VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空");
BigDecimal num = BigDecimal.valueOf(order.getNum());
OptRecordDTO optRecordDTO1 = new OptRecordDTO();
optRecordDTO1.setOperationType((short) 1);
optRecordDTO1.setOrderId(order.getOrderNo());
optRecordService.add(optRecordDTO1);
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short) 1)
.setOrderId(order.getOrderNo());
optRecordService.add(optRecordDTO);
Pair<Pair<String, String>, Pair<String, String>> pair = sapService.zwm3a17(new ZWM3A17DTO()
.setEbeln(order.getExternalOrderNo())
.setUsnam(UserUtil.getUserName())
@ -1030,10 +1030,6 @@ public class StructuralPackageOrderController extends BaseController {
)
);
if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) {
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short) 1);
optRecordDTO.setOrderId(order.getOrderNo());
optRecordService.add(optRecordDTO);
sapService.zwm3a18(new ZWM3A18DTO()
.setEbeln(order.getExternalOrderNo())
.setUsnam(UserUtil.getUserName())

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -481,8 +481,8 @@ public class TransferCompanyController extends BaseController {
).toList()
);
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(order.getNo());
optRecordDTO.setOperationType((short)1)
.setOrderId(order.getNo());
optRecordService.add(optRecordDTO);
ZWM00_MB116VO vo = sapService.zwm00_mb116(new ZWM00_MB116QO()
.setEbeln(order.getEbeln())
@ -753,8 +753,8 @@ public class TransferCompanyController extends BaseController {
);
inMaterialScanRecordRespository.saveAll(records);
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(ticket.getTicketNo());
optRecordDTO.setOperationType((short)1)
.setOrderId(ticket.getTicketNo());
optRecordService.add(optRecordDTO);
Pair<Pair<String, String>, Pair<String, String>> vos = sapService.zwm3a17(new ZWM3A17DTO()
.setEbeln(ticket.getEbeln())

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

@ -742,8 +742,8 @@ public class TransferFactoryController extends BaseController {
)
);
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(ticket.getNo());
optRecordDTO.setOperationType((short)1)
.setOrderId(ticket.getNo());
optRecordService.add(optRecordDTO);
transferFactoryTicketService.lambdaUpdate()
.set(WmsTransferFactoryTicket::getMatDoc, vo.getEMblnr())

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentOutboundControllerService.java
View File

@ -80,8 +80,8 @@ public class ComponentOutboundControllerService {
if (Objects.nonNull(zwm3a20DTO)) {
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(outbound.getOutboundNo());
optRecordDTO.setOperationType((short)1)
.setOrderId(outbound.getPackingNo());
optRecordService.add(optRecordDTO);
// 处理SAP的信息，并写入物料凭证和物料年度凭证信息到出口单中
Pair<String, String> result = sapService.zwm3a20(zwm3a20DTO);
@ -118,8 +118,8 @@ public class ComponentOutboundControllerService {
//加操作记录
WmsComponentOutbound outbound = wmsComponentOutboundService.getById(outboundId);
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOrderId(outbound.getOutboundNo());
optRecordDTO.setOperationType((short)1)
.setOrderId(outbound.getPackingNo());
optRecordService.add(optRecordDTO);
//SAP冲销
Pair<String, String> result = sapService.zwm3a20(zwm3a20DTO);