From a888fd727ea78662a2c199326cd3f3d3d03c29a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 30 May 2026 10:42:35 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix(order):=20=E4=BC=98=E5=8C=96=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=89=98=E7=9B=98=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在查询托盘编号时增加状态筛选，仅获取运输中的托盘 - 移除冗余的待收货托盘存在性校验，改为直接判断托盘列表是否为空 - 校验请求中的托盘编号集合是否与实际托盘集合匹配，确保托盘齐套 - 更新托盘状态时，设置为已收货并记录接收人信息 --- .../admin/controller/StructuralPackageOrderController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 c268d230..c39691a8 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 @@ -1165,17 +1165,14 @@ public class StructuralPackageOrderController extends BaseController { List trayNos = structuralPackageOrderTrayService.lambdaQuery() .select(WmsStructuralPackageOrderTray::getNo) .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId()) + .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState()) .list() .stream() .map(WmsStructuralPackageOrderTray::getNo) .toList(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(trayNos)).throwMessage("没有需要收货的数据"); VUtil.trueThrowBusinessError(!new HashSet<>(trayNos).equals(new HashSet<>(request.getTrayNos()))) .throwMessage("托盘未齐套"); - VUtil.trueThrowBusinessError(!structuralPackageOrderTrayService.lambdaQuery() - .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId()) - .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState()) - .exists()) - .throwMessage("没有需要收货的数据"); structuralPackageOrderTrayService.lambdaUpdate() .set(WmsStructuralPackageOrderTray::getState, OrderState.Received.getState()) .set(WmsStructuralPackageOrderTray::getReceiveBy, UserUtil.getUserName()) From d91c0717cad4bdf659caecf061cf353dd55eac62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 30 May 2026 11:46:07 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix(pdf):=20=E8=B0=83=E6=95=B4=E9=92=A2?= =?UTF-8?q?=E6=9E=84=E4=BB=B6=E8=80=81=E9=BC=A0=E5=9B=BE=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将分页数量从9或6调整为15，优化PDF分页显示 - 修正数据库查询回显结构，确保材料列表正确转换 - 缩小字体和内边距，提升页面布局紧凑度 - 调整图片尺寸及表格单元格样式，使显示更美观与统一 - 修改部分文本样式和位置，提高信息呈现清晰度 --- .../StructuralPackageOrderController.java | 4 +- .../StructuralPackageControllerService.java | 2 +- .../template/钢构件老鼠图.html | 41 ++++++++----------- .../impl/WmsStructuralPackageServiceImpl.java | 4 +- 4 files changed, 23 insertions(+), 28 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 c39691a8..d2519cde 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 @@ -582,7 +582,7 @@ public class StructuralPackageOrderController extends BaseController { ).collect(Collectors.toList()); Map variables = new HashMap<>(); variables.put("info", vo); - variables.put("pages", PdfPageDTO.create(items, 9, new PackageMaterialDTO())); + variables.put("pages", PdfPageDTO.create(items, 15, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); // PdfGeneratorUtil.generatePdf(vo.getExternalOrderNo() + "-" + vo.getWorkbenchCode() + "老鼠图", html, response); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); @@ -2122,7 +2122,7 @@ public class StructuralPackageOrderController extends BaseController { ).collect(Collectors.toList()); Map variables = new HashMap<>(); variables.put("info", vo); - variables.put("pages", PdfPageDTO.create(items, 9, new PackageMaterialDTO())); + variables.put("pages", PdfPageDTO.create(items, 15, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); URL baseUrl = new ClassPathResource("template/").getURL(); PdfGeneratorUtil.generatePdf("钢构件老鼠图", html, baseUrl.toString(), response); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java index 8bcdead9..60187304 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java @@ -454,7 +454,7 @@ public class StructuralPackageControllerService { vo.setQrCode(QRCodeUtil.generateQRCodeBase64(vo.getNo(), 100, 100)); Map variables = new HashMap<>(); variables.put("info", vo); - variables.put("pages", PdfPageDTO.create(vo.getMaterialList(), 6, new PackageMaterialDTO())); + variables.put("pages", PdfPageDTO.create(vo.getMaterialList(), 15, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); PdfGeneratorUtil.generatePdf(vo.getNo() + "老鼠图", html, outputStream); diff --git a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html index 70bcb0a0..13c85556 100644 --- a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html +++ b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html @@ -13,7 +13,7 @@ body { font-family: SimSun, serif; - font-size: 9pt; + font-size: 8pt; padding: 10px; margin: 0 auto; max-width: 100%; @@ -25,7 +25,7 @@ .logo img { height: 40px; - padding: 10px; + padding: 5px; } table { @@ -36,7 +36,7 @@ td { border: 1px solid #000; - padding: 7px; + padding: 4px; } tr:first-child td { @@ -67,10 +67,9 @@ } .cell-img { - display: table-cell; vertical-align: middle; text-align: center; - padding: 10px; + padding: 5px; height: auto; overflow: hidden; } @@ -82,7 +81,7 @@ .cell { border-bottom: 1px solid #000; - padding: 7px; + padding: 4px; overflow: hidden; } @@ -107,19 +106,19 @@ - - + + - - - + + - + - + @@ -132,21 +131,15 @@
订单号：12255665451615行号：1111订单号：7500381665行号：10 供应商：1111 + 供应商：首钢凯西钢铁有限公司
机型：12255665451615机型：12255665451615 版本：1机台号：1机台号：NFJ1280EB5 种类：1 总重：348.41
-
+
-
-
SAP编码：2222222222
-
图号：图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号 -
-
名称：名称名称名称名称名称名称名称名称名称名名称名名称名称名称称名称名称名称称名称名称名称 -
-
数量：1    重量：348.41
+
SAP编码：2222222222 图号：1280-008-006-WF
+
名称：受料斗前支腿
+
数量：1   重量：348.41
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java index cb4b1a38..2934a054 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java @@ -97,7 +97,9 @@ public class WmsStructuralPackageServiceImpl extends ServiceImpl Date: Sat, 30 May 2026 14:39:35 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat(package):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=9B=B6=E4=BB=B6=E7=89=88=E6=9C=AC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 结构包控制器添加 refreshItems 接口，支持根据包ID刷新零件版本 - 结构包服务实现中新增 refreshItems 方法，更新零件信息（版本、名称、图号、图片、重量） - 结构包控制器服务中简化 getInfo 方法，取消材料信息解码和赋值逻辑 - 结构包服务接口 getInfo 返回值取消材料解码，由调用方处理 - PackageVO 类中取消重复定义的 getMaterialList 方法，改用正式实现版本 --- .../StructuralPackageController.java | 9 +++++++ .../StructuralPackageControllerService.java | 26 +++++++++++-------- .../nflg/wms/common/pojo/vo/PackageVO.java | 12 ++++----- .../impl/WmsStructuralPackageServiceImpl.java | 4 +-- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java index 332d52ce..d016f1e9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java @@ -88,6 +88,15 @@ public class StructuralPackageController extends BaseController { return ApiResult.success(packageControllerService.getInfo(id)); } + /** + * 刷新零件版本 + * @param id 包ID + */ + @GetMapping("/refreshItems") + public ApiResult> refreshItems(@Valid @RequestParam @NotNull Long id){ + return ApiResult.success(packageControllerService.refreshItems(id)); + } + /** * 获取老鼠图 * @param request 搜索参数 diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java index 60187304..2feaa229 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java @@ -173,17 +173,7 @@ public class StructuralPackageControllerService { } public PackageVO getInfo(@Valid @NotNull Long id) { - PackageVO vo = packageService.getInfo(id); - vo.setMaterialList(JSONUtil.toList(vo.getMaterials(), PackageMaterialDTO.class)); - vo.getMaterialList().forEach(it -> { - WmsMaterial material = materialService.getCurrent(it.getNo()); - it.setVersion(material.getVersion()); - it.setName(material.getDescribe()); - it.setDrawingNo(material.getDrawingNo()); - it.setImage(material.getImage()); - it.setWeight(material.getWeight()); - }); - return vo; + return packageService.getInfo(id); } public PageData getMaterials(@Valid PackageMaterialSearchQO request) { @@ -663,4 +653,18 @@ public class StructuralPackageControllerService { log.info("批量从MPM系统同步钢构包数据完成"); } + + public List refreshItems(Long id) { + WmsStructuralPackage structuralPackage = packageService.getById(id); + List items = JSONUtil.toList(structuralPackage.getMaterials(), PackageMaterialDTO.class); + items.forEach(it -> { + WmsMaterial material = materialService.getCurrent(it.getNo()); + it.setVersion(material.getVersion()); + it.setName(material.getDescribe()); + it.setDrawingNo(material.getDrawingNo()); + it.setImage(material.getImage()); + it.setWeight(material.getWeight()); + }); + return items; + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java index 671ff58d..68f2bb20 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java @@ -124,12 +124,12 @@ public class PackageVO { */ private List materialList; -// public List getMaterialList() { -// if (StrUtil.isBlank(materials)) { -// return Collections.emptyList(); -// } -// return JSONUtil.toList(materials, PackageMaterialDTO.class); -// } + public List getMaterialList() { + if (StrUtil.isBlank(materials)) { + return Collections.emptyList(); + } + return JSONUtil.toList(materials, PackageMaterialDTO.class); + } /** * 供应商名称 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java index 2934a054..cb4b1a38 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java @@ -97,9 +97,7 @@ public class WmsStructuralPackageServiceImpl extends ServiceImpl Date: Tue, 2 Jun 2026 09:54:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix(material):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0=E6=97=B6=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将更新操作中的 createBy 和 createTime 字段设置为正确的值 - 注释掉 updateBy 和 updateTime 字段的设置以避免冲突 - 确保物料更新时正确记录创建者和创建时间信息 --- .../nflg/wms/admin/service/MaterialControllerService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index c7ae307d..4e59542e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -115,8 +115,10 @@ public class MaterialControllerService { VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！"); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); wmsMaterial.setVersion(old.getVersion()); - wmsMaterial.setUpdateBy(UserUtil.getUserName()); - wmsMaterial.setUpdateTime(LocalDateTime.now()); + wmsMaterial.setCreateBy(UserUtil.getUserName()); + wmsMaterial.setCreateTime(LocalDateTime.now()); +// wmsMaterial.setUpdateBy(UserUtil.getUserName()); +// wmsMaterial.setUpdateTime(LocalDateTime.now()); materialService.add(wmsMaterial); } From 7037de9c5d7f834ac6096dda6e9fafc7796ead87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jun 2026 10:11:35 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix(material):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0=E6=97=B6ID=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在更新物料信息时重新生成雪花ID确保唯一性 - 避免因ID冲突导致的数据更新异常 - 保持版本号不变以维护数据一致性 --- .../com/nflg/wms/admin/service/MaterialControllerService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index 4e59542e..cd2b2b48 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -114,6 +114,7 @@ public class MaterialControllerService { WmsMaterial old = materialService.getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！"); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); + wmsMaterial.setId(IdUtil.getSnowflakeNextId()); wmsMaterial.setVersion(old.getVersion()); wmsMaterial.setCreateBy(UserUtil.getUserName()); wmsMaterial.setCreateTime(LocalDateTime.now()); From fd0f18fe130a7f3cd4fa6c2485304f16a2345717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jun 2026 10:28:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix(inventory):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=85=A5=E5=BA=93=E8=AE=A2=E5=8D=95=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将默认序号值从100调整为1000000 - 添加StrUtil工具类导入用于字符串处理 - 实现getOrder方法支持从批次号解析序号 - 修复getKey方法中序号获取逻辑确保一致性 --- .../controller/InProduceOrderSurplusController.java | 2 +- .../com/nflg/wms/common/pojo/dto/InventoryInDTO.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java index 1a8aa048..d3354aad 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java @@ -339,7 +339,7 @@ public class InProduceOrderSurplusController extends BaseController { .stream() .map(list -> new InventoryInDTO() .setMaterialNo(list.get(0).getMaterialNo()) - .setOrder(100) + .setOrder(1000000) .setBatchNo(list.get(0).getBatchNo()) .setSerialNo(list.get(0).getSerialNo()) .setFactoryNo(list.get(0).getFactoryNo()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java index aa90ec76..1df0237c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.dto; +import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -62,10 +63,17 @@ public class InventoryInDTO { */ private Integer order; + public Integer getOrder() { + if (Objects.isNull(order) && StrUtil.isNotBlank(getBatchNo())) { + return Integer.parseInt(getBatchNo().substring(4)); + } + return order; + } + private String key; public String getKey() { return getMaterialNo() + "|" + getFactoryNo() + "|" + getWarehouseNo() + "|" + getBatchNo() + "|" - + getSerialNo() + "|" + order + "|" + getBinLocation(); + + getSerialNo() + "|" + getOrder() + "|" + getBinLocation(); } } From 6b95e2a81def68c1ac8e29a98b09bbecc3483951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Jun 2026 09:58:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(packing):=20=E6=81=A2=E5=A4=8DPO?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=92=8C=E8=A1=8C=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了PO编号和PO行号查询条件的注释 - 恢复了基于PO编号和行号的精确匹配逻辑 - 确保了送货单验证功能的完整性 --- .../java/com/nflg/wms/admin/controller/PackingController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java index 77d2169c..efdddf02 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java @@ -297,8 +297,8 @@ public class PackingController extends BaseController { WmsSrmOrderItem item = srmOrderItemService.lambdaQuery() .eq(WmsSrmOrderItem::getNoteNum, request.getDeliveryNo()) .eq(WmsSrmOrderItem::getItemCode, materialCode) -// .eq(WmsSrmOrderItem::getPoNum, qrCodeMaster.getPoNumber()) -// .eq(WmsSrmOrderItem::getPoLineNumber, qrCodeMaster.getPoLineNumber()) + .eq(WmsSrmOrderItem::getPoNum, qrCodeMaster.getPoNumber()) + .eq(WmsSrmOrderItem::getPoLineNumber, qrCodeMaster.getPoLineNumber()) .one(); //和送货单进行验证 srmOrderValidation(item, quantity); From 4eaf89dd3c2104992a82a143ba7371e55bd80867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Jun 2026 18:49:24 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix(WmsPackageMapper):=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了packing_quantity字段的计算方式 - 将sum函数从else分支移动到case表达式外部 - 确保无论packaging_type为何值都进行正确的数量汇总 --- .../src/main/resources/mapper/WmsPackageMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml index 3775467c..254396da 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml @@ -203,9 +203,9 @@ when c.packaging_type = 0 then c.delivery_line_no else d.delivery_line_no end as delivery_line_no, case when c.packaging_type = 0 then c.delivery_no else d.delivery_no end as delivery_no, - case - when c.packaging_type = 0 then c.quantity - else sum(d.quantity) end as packing_quantity + sum( case + when c.packaging_type = 0 then c.quantity + else d.quantity end) as packing_quantity from wms_package a inner join wms_package_item b on a.id = b.package_id left join wms_qr_code_master c on b.barcode_code = c.barcode_code