From 37bb24eadf86856005f79bafdf03ca329ceeb7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 26 Jun 2026 14:10:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=9B=B4=E6=96=B0=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=8C=96=E5=8C=85=E8=A3=85=E8=AE=A2=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E8=BD=AC=E8=BF=90=E5=85=AC=E5=8F=B8=E5=AE=9E=E4=BD=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsStructuralPackageOrder 实体中添加 matDoc 和 docYear 字段 - 在 WmsTransferCompany 实体中添加 matDoc 和 docYear 字段 - 更新 StructuralPackageOrderController 中的业务逻辑以设置凭证信息 - 修改 TransferCompanyController 中的更新操作目标为正确的实体和服务 - 在 SRMController 的质检流程中添加合格数量和不合格数量参数 - 注释掉 QmsController 中的检查数量更新调用 - 优化 StructuralPackageOrderController 中的代码格式和查询逻辑 --- .../StructuralPackageOrderController.java | 24 +++++++++++-------- .../controller/TransferCompanyController.java | 8 +++---- .../entity/WmsStructuralPackageOrder.java | 10 ++++++++ .../repository/entity/WmsTransferCompany.java | 10 ++++++++ .../srm/receive/controller/QmsController.java | 2 +- .../srm/receive/controller/SRMController.java | 2 +- 6 files changed, 40 insertions(+), 16 deletions(-) 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 52e46cbc..2424f700 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 @@ -319,7 +319,7 @@ public class StructuralPackageOrderController extends BaseController { request.getItems().forEach(orderQO -> { WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO); order.setOrderNo(orderNo); - + if (Objects.isNull(order.getId())) { order.setId(IdUtil.getSnowflakeNextId()); order.setCreateBy(UserUtil.getUserName()); @@ -460,9 +460,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 { @@ -533,7 +533,6 @@ public class StructuralPackageOrderController extends BaseController { /** * 获取托盘零件列表 - * * @param id 订单id */ @GetMapping("getItems") @@ -1088,10 +1087,10 @@ public class StructuralPackageOrderController extends BaseController { // 只统计已打包的托盘数量（状态为1：已打包、2：在途、3：已收货） it.setTrayNum(Math.toIntExact(structuralPackageOrderTrayService.lambdaQuery() .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId()) - .in(WmsStructuralPackageOrderTray::getState, - OrderState.Packaged.getState(), - OrderState.InTransit.getState(), - OrderState.Received.getState()) + .in(WmsStructuralPackageOrderTray::getState, + OrderState.Packaged.getState(), + OrderState.InTransit.getState(), + OrderState.Received.getState()) .count())); }); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); @@ -1258,6 +1257,11 @@ public class StructuralPackageOrderController extends BaseController { ) ) ); + structuralPackageOrderService.lambdaUpdate() + .set(WmsStructuralPackageOrder::getMatDoc, pair.getValue().getKey()) + .set(WmsStructuralPackageOrder::getDocYear, pair.getValue().getValue()) + .eq(WmsStructuralPackageOrder::getId, request.getId()) + .update(); if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) { sapService.zwm3a18(new ZWM3A18DTO() .setEbeln(order.getExternalOrderNo()) @@ -2124,7 +2128,7 @@ public class StructuralPackageOrderController extends BaseController { * @param ids 托盘id列表 */ @PostMapping("exportPdfByTrayIds") - public void exportPdfByTrayIds(HttpServletResponse response,@RequestBody @NotEmpty List ids) throws Exception { + public void exportPdfByTrayIds(HttpServletResponse response, @RequestBody @NotEmpty List ids) throws Exception { List list = structuralPackageOrderTrayItemService.getListVOByTrayIds(ids); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("数据不存在"); DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(list.get(0).getTrayId()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 475a04e0..58fdef8a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -703,10 +703,10 @@ public class TransferCompanyController extends BaseController { ).toList() ) ); - transferCompanyTicketService.lambdaUpdate() - .set(WmsTransferCompanyTicket::getMatDoc, vo.getMblnr()) - .set(WmsTransferCompanyTicket::getDocYear, vo.getMjahr()) - .eq(WmsTransferCompanyTicket::getId, ticket.getId()) + transferCompanyService.lambdaUpdate() + .set(WmsTransferCompany::getMatDoc, vo.getMblnr()) + .set(WmsTransferCompany::getDocYear, vo.getMjahr()) + .eq(WmsTransferCompany::getId, order.getId()) .update(); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java index dfd052f5..74c82b6d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java @@ -136,4 +136,14 @@ public class WmsStructuralPackageOrder implements Serializable { * 状态，0：未打包；1：已打包；2-在途；3-已收货 */ private Short state; + + /** + * 凭证号 + */ + private String matDoc; + + /** + * 凭证年份 + */ + private String docYear; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java index e2421d06..8c916b68 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java @@ -94,4 +94,14 @@ public class WmsTransferCompany implements Serializable { * 备注 */ private String remark; + + /** + * 凭证号 + */ + private String matDoc; + + /** + * 凭证年份 + */ + private String docYear; } diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java index be18d590..b3cdd784 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java @@ -212,7 +212,7 @@ public class QmsController extends BaseController { .eq(WmsQcReceive::getOrderNo, inspect.getNoteNum()) .set(WmsQcReceive::getIsCheck, isCheck) .update(); - qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), inspect.getReceiveNum()); +// qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), inspect.getReceiveNum()); //更新二维码数量 if (CollectionUtil.isNotEmpty(qo.getQrCodes())) { List qrCodeMasters = qrCodeMasterService.getByCodes(qo.getQrCodes().stream().map(MaterialQrCodeDTO::getQrCode).toList()); diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java index 845b6fe6..007e9d08 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java @@ -294,7 +294,7 @@ public class SRMController extends BaseController { .eq(WmsQcReceive::getOrderNo, inspect.getNoteNum()) .set(WmsQcReceive::getIsCheck, isCheck) .update(); - qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), inspect.getReceiveNum()); + qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), inspect.getReceiveNum(),inspect.getQualifiedQty(),inspect.getUnqualifiedQty()); log.info("质检单处理完成: {}, 结果: {}", data.getInspectionNum(), inspect.getInspectionResult()); return 0; } catch (Exception ex) {