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

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

This commit is contained in:
10001392 2026-06-02 20:08:48 +08:00
parent b237e333c8 3aa6a3846c
commit 8c909bfd3b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -767,7 +767,7 @@ public class NormalPGIController extends BaseController {
content.setReceiveType("BY_DELIVERY"); content.setReceiveType("BY_DELIVERY");
content.setLineVOList(new ArrayList<>()); content.setLineVOList(new ArrayList<>());
dto.setContent(content); dto.setContent(content);
dto.setCode("SCAN_RCV_RECEIVE_TO_SRM"); dto.setCode("WMS_RCV_RECEIVE_TO_SRM");
qcDto.setPushDto(dto); qcDto.setPushDto(dto);
} }
srmPushDto = qcDto.getPushDto(); srmPushDto = qcDto.getPushDto();

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

@ -94,6 +94,7 @@ public class OutAssistanceController extends BaseController {
@Resource @Resource
private IOptRecordService optRecordService; private IOptRecordService optRecordService;
@Resource @Resource
private IWmsOutProduceService outProduceService; private IWmsOutProduceService outProduceService;

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

@ -452,9 +452,9 @@ public class StructuralPackageOrderController extends BaseController {
// 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空 // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
if (item.getTrayId() != null) { if (item.getTrayId() != null) {
WmsStructuralPackageOrderTray tray = trays.stream() WmsStructuralPackageOrderTray tray = trays.stream()
.filter(t -> t.getId().equals(item.getTrayId())) .filter(t -> t.getId().equals(item.getTrayId()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (tray != null) { if (tray != null) {
ivo.setNo(tray.getNo()); ivo.setNo(tray.getNo());
} else { } else {
@ -519,6 +519,7 @@ public class StructuralPackageOrderController extends BaseController {
/** /**
* 获取托盘零件列表 * 获取托盘零件列表
*
* @param id 订单id * @param id 订单id
*/ */
@GetMapping("getItems") @GetMapping("getItems")