From 02fcea13509a57ca93812d0bf36a5f787dba39ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 17 Jun 2026 08:32:51 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat(ad):=20=E6=B7=BB=E5=8A=A0ad=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=B4=E9=9A=94=E5=AD=97=E6=AE=B5=E5=88=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 getList 查询中新增 interval 字段
- 在 getInfo 查询中新增 interval 字段
- 格式化 SQL 语句缩进以提高可读性
---
 nflg-wms-repository/src/main/resources/mapper/AdMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
index f1d46535..717c1b20 100644
--- a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.wms.repository.mapper.AdMapper">
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.dto.AdDTO">
-        select a.*,ac.map_from,ac.map_to,ac.next_sync_date,ac.enable as enableSync,ac.id as syncId,ac.type
+        select a.*,ac.map_from,ac.map_to,ac.next_sync_date,ac.enable as enableSync,ac.id as syncId,ac.type,ac.interval
         from ad a
         inner join ad_sync ac on a.id = ac.ad_id
         where a.enable
@@ -11,9 +11,9 @@
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.dto.AdDTO">
-        select a.*,ac.map_from,ac.map_to,ac.next_sync_date,ac.enable as enableSync,ac.id as syncId,ac.type
+        select a.*,ac.map_from,ac.map_to,ac.next_sync_date,ac.enable as enableSync,ac.id as syncId,ac.type,ac.interval
         from ad a
-                 inner join ad_sync ac on a.id = ac.ad_id
+        inner join ad_sync ac on a.id = ac.ad_id
         where a.enable and a.id = #{id}
     </select>
 </mapper>

From 73f6c8c5cba8f196a5d9fc74e8d2fa68616a76f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 17 Jun 2026 09:15:52 +0800
Subject: [PATCH 02/13] =?UTF-8?q?perf(config):=20=E5=A2=9E=E5=8A=A0RestTem?=
 =?UTF-8?q?plate=E8=AF=BB=E5=8F=96=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将RestTemplate的读取超时时间从10秒增加到60秒
- 提高网络请求的容错性，避免因超时导致的请求失败
---
 .../java/com/nflg/wms/starter/config/RestTemplateConfig.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/RestTemplateConfig.java b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/RestTemplateConfig.java
index 4852493d..ad7183c2 100644
--- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/RestTemplateConfig.java
+++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/RestTemplateConfig.java
@@ -14,7 +14,7 @@ public class RestTemplateConfig {
     public RestTemplate restTemplate() {
         SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
         factory.setConnectTimeout(3_000);
-        factory.setReadTimeout(10_000);
+        factory.setReadTimeout(60_000);
         return new RestTemplate(factory);
     }
 

From e10ab1dabde821264b53ddda68161b77942a0447 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Wed, 17 Jun 2026 19:01:57 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-?=
 =?UTF-8?q?=E9=92=A2=E7=BB=93=E6=9E=84=E8=AF=A6=E6=83=85=EF=BC=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E7=9B=B8=E5=90=8C=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=AE=B0=E5=BD=95=E5=8F=96=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...msStructuralPackageOrderTrayItemMapper.xml | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
index 99eddd7f..b71b8846 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
@@ -23,15 +23,28 @@
     </select>
 
     <select id="getListByOrderId" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">
-        SELECT ROW_NUMBER() OVER (ORDER BY oti.id) AS "index",m.image,m.drawing_no,oti.*,ot."no" as "tray_no",ot."state",
-            sp."no" as "package_no",sp."name" as "package_desc"
+        SELECT ROW_NUMBER() OVER (ORDER BY oti.id) AS "index",
+               m.image,
+               m.drawing_no,
+               oti.*,
+               ot."no" as "tray_no",
+               ot."state",
+               sp."no" as "package_no",
+               sp."name" as "package_desc"
         FROM wms_structural_package_order o
         INNER JOIN wms_structural_package_order_tray_item oti ON o."id"=oti.order_id
         LEFT JOIN wms_structural_package_order_tray ot ON oti.tray_id=ot."id"
         LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
-        LEFT JOIN wms_material m ON oti.material_no=m."no" and oti."version"=m."version"
-        where o.id=#{orderId}
-        order by oti.id
+        LEFT JOIN wms_material m ON m."id" = (
+            SELECT m2."id" 
+            FROM wms_material m2 
+            WHERE m2."no" = oti.material_no 
+              AND m2."version" = oti."version"
+            ORDER BY m2."id" DESC 
+            LIMIT 1
+        )
+        WHERE o.id=#{orderId}
+        ORDER BY oti.id
     </select>
 
     <select id="getListVOByIds" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">

From d368ec1515c335d9a8f98b1f2ae11332c54dfafb Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 10:18:48 +0800
Subject: [PATCH 04/13] =?UTF-8?q?1573=20=E6=89=98=E7=9B=98=E8=80=81?=
 =?UTF-8?q?=E9=BC=A0=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E3=80=90=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/admin/controller/StructuralPackageOrderController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 b787d2c2..c3b16cb7 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
@@ -557,6 +557,7 @@ public class StructuralPackageOrderController extends BaseController {
         DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在");
 
+        DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id);
         PackageVO vo = new PackageVO()
                 .setNo(trayVO.getPackageNo())
                 .setExternalOrderNo(trayVO.getExternalOrderNo())
@@ -567,7 +568,7 @@ public class StructuralPackageOrderController extends BaseController {
                 .setEco(trayVO.getEco())
                 .setWorkbenchCode(trayVO.getWorkbenchCode())
                 .setCate(trayVO.getPackageCate())
-                .setWeight(trayVO.getWeight())
+                .setWeight(orderVO.getWeight())
                 .setDrawingNo(trayVO.getPackageDrawingNo())
                 .setName(trayVO.getPackageDesc())
                 .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));

From 5e9eaadb8b93a6bcbd5f457c8343ea9e6c796eca Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 11:36:11 +0800
Subject: [PATCH 05/13] =?UTF-8?q?1574=20=E3=80=90=E9=92=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=AE=A2=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-=E9=92=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E3=80=91=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=B7=E3=80=91=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StructuralPackageOrderController.java           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 c3b16cb7..60cae812 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
@@ -13,6 +13,7 @@ import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.google.common.collect.Maps;
 import com.nflg.wms.admin.pojo.dto.*;
 import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@@ -449,6 +450,12 @@ public class StructuralPackageOrderController extends BaseController {
                 .setMaterialDesc(orderVO.getPackageDesc())).toList()
         );
         List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
+        List<DeliverStructuralPackageOrderTrayItemVO> itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id);
+        Map<Long, DeliverStructuralPackageOrderTrayItemVO> deliverStructuralPackageOrderTrayItemMap = CollectionUtil.isNotEmpty(itemVOs) ?
+                itemVOs.stream().filter(d -> d.getId() != null).collect(Collectors.toMap(DeliverStructuralPackageOrderTrayItemVO::getId, d -> d))
+                : Maps.newHashMap();
+
+
         vo.setItems(items.stream().map(item -> {
             TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
             // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
@@ -472,6 +479,12 @@ public class StructuralPackageOrderController extends BaseController {
                     ivo.setStoreNum(item.getStoreNum());
                 }
             }
+
+            DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId());
+            if (itemVO != null) {
+                ivo.setDrawingNo(itemVO.getDrawingNo());
+            }
+
             return ivo;
         }).toList());
         return ApiResult.success(vo);

From bef4bbd18ebb49a28b74e428068340954bdc4eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 18 Jun 2026 15:37:58 +0800
Subject: [PATCH 06/13] =?UTF-8?q?feat(test):=20=E6=B7=BB=E5=8A=A0=E8=A1=A5?=
 =?UTF-8?q?=E5=81=BF=20ZWM3A18=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入 ZWM3A18DTO、ZWM3A18Item1DTO、ZWM3A17Item2DTO 数据传输对象
- 注入 IWmsSrmQualityInspectionService 和 IWmsQcReceiveItemService 服务
- 移除未使用的 ILanguageService 和注释掉的代码
- 实现 compensateZwm3a18 接口，支持通过单号进行补偿操作
- 集成 SAP 服务调用 zwm3a18 方法完成物料凭证处理
- 添加序列号处理逻辑，根据检验结果设置标识
- 更新质量检验记录的入库状态和相关凭证信息
---
 .../wms/admin/controller/TestController.java  | 101 +++++++++++++-----
 1 file changed, 74 insertions(+), 27 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TestController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TestController.java
index bbd1cc0a..8104d107 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TestController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TestController.java
@@ -1,22 +1,36 @@
 package com.nflg.wms.admin.controller;
 
+import cn.hutool.core.lang.Pair;
+import cn.hutool.core.util.StrUtil;
+import com.nflg.wms.admin.pojo.dto.ZWM3A17Item2DTO;
+import com.nflg.wms.admin.pojo.dto.ZWM3A18DTO;
+import com.nflg.wms.admin.pojo.dto.ZWM3A18Item1DTO;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
 import com.nflg.wms.admin.service.SapService;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.dto.LdapDepartmentDTO;
 import com.nflg.wms.common.pojo.dto.LdapUserDTO;
+import com.nflg.wms.common.util.UserUtil;
 import com.nflg.wms.common.util.VUtil;
+import com.nflg.wms.repository.entity.WmsQcReceiveItem;
+import com.nflg.wms.repository.entity.WmsSrmQualityInspection;
 import com.nflg.wms.repository.service.ILanguageService;
+import com.nflg.wms.repository.service.IWmsQcReceiveItemService;
+import com.nflg.wms.repository.service.IWmsSrmQualityInspectionService;
 import com.nflg.wms.starter.BaseController;
 import com.sap.conn.jco.JCoException;
 import jakarta.annotation.Resource;
 import jakarta.validation.metadata.ValidateUnwrappedValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 测试
@@ -25,37 +39,17 @@ import java.util.List;
 @RequestMapping("/test")
 public class TestController extends BaseController {
 
-    @Resource
-    private ILanguageService languageService;
-
     @Resource
     private BasdeSerialNumberControllerService basdeSerialNumberControllerService;
-//    @Resource
-//    private LdapService ldapService;
-
 
     @Resource
     private SapService sapService;
-    @GetMapping("/add")
-    public void add() throws JCoException {
 
-//        try {
-            sapService.zwm00_MB017("1309976");
-//        }
-//        catch (Exception e)
-//        {
-//
-//        }
+    @Resource
+    private IWmsSrmQualityInspectionService wmsSrmQualityInspectionService;
 
-
-//        Language language = new Language()
-//                .setCode("test1")
-//                .setName("测试1")
-//                .setValue("aaa")
-//                .setIco("")
-//                .setZone("");
-//        languageService.save(language);
-    }
+    @Resource
+    private IWmsQcReceiveItemService wmsQcReceiveItemService;
 
     /**
      * 同步AD部门列表
@@ -75,13 +69,66 @@ public class TestController extends BaseController {
 
     @GetMapping("/ad/string")
     public ApiResult<String> getString() {
-        String ids=basdeSerialNumberControllerService.generateSerialNumber(0);
+        String ids = basdeSerialNumberControllerService.generateSerialNumber(0);
         return ApiResult.success(ids);
     }
 
     @GetMapping("/businessError")
     public void testThrowBusinessError() throws Exception {
-        int a=0;
-        Integer b =100/a;
+        int a = 0;
+        Integer b = 100 / a;
+    }
+
+    /**
+     * 补偿 zwm3a18
+     */
+    @GetMapping("compensateZwm3a18")
+    public ApiResult<Void> compensateZwm3a18(@RequestParam String no) {
+        WmsSrmQualityInspection srmQualityInspection = wmsSrmQualityInspectionService.lambdaQuery()
+                .eq(WmsSrmQualityInspection::getInspectionNum, no)
+                .one();
+        VUtil.trueThrowBusinessError(Objects.isNull(srmQualityInspection)).throwMessage("该单号不存在");
+        VUtil.trueThrowBusinessError(Boolean.TRUE.equals(srmQualityInspection.getIsIn())).throwMessage("该单号已入库，无需补偿");
+
+        // 入库单行，物料凭证取自入库单
+        WmsQcReceiveItem wmsQcReceiveItem = wmsQcReceiveItemService.getById(srmQualityInspection.getReceiveId());
+        VUtil.trueThrowBusinessError(Objects.isNull(wmsQcReceiveItem)).throwMessage("未找到对应的入库单行");
+
+        // 组装SAP表头信息（参照 NormalQMController.confirm 中 ZWM3A18DTO 的构建逻辑）
+        ZWM3A18DTO dto = new ZWM3A18DTO()
+                .setEbeln(srmQualityInspection.getPoNum())
+                .setUsnam(UserUtil.getUserName())
+                .setMblnr(wmsQcReceiveItem.getMaterialDoc())
+                .setMjahr(wmsQcReceiveItem.getMaterialDocYear())
+                .setItem1(new ArrayList<>())
+                .setItem2(new ArrayList<>());
+
+        // 组装SAP行项目信息（参照 NormalQMController.set3A18DTOS）
+        dto.getItem1().add(new ZWM3A18Item1DTO()
+                .setErfmg(srmQualityInspection.getInspectionQty())
+                .setErfmg1(srmQualityInspection.getQualifiedQty())
+                .setErfmg2(srmQualityInspection.getUnqualifiedQty())
+                .setEbelp(srmQualityInspection.getPoLineNumber())
+                .setMatnr(srmQualityInspection.getItemCode())
+                .setMeins(srmQualityInspection.getUnit())
+                .setCharg(srmQualityInspection.getMaterialBatch())
+                .setLgort(srmQualityInspection.getReceivedWarehouse())
+                .setSgtxt("")
+                .setWerks(srmQualityInspection.getFactory()));
+
+        if (StrUtil.isNotBlank(srmQualityInspection.getSerialNum())) {
+            String flag = "合格".equals(srmQualityInspection.getInspectionResult()) ? "X" : "";
+            dto.getItem2().add(new ZWM3A17Item2DTO()
+                    .setEBELP(srmQualityInspection.getPoLineNumber())
+                    .setSERNR(srmQualityInspection.getSerialNum())
+                    .setFLAG(flag));
+        }
+        Pair<String, String> zwm3a18 = sapService.zwm3a18(dto);
+        srmQualityInspection.setIsIn(true);
+        srmQualityInspection.setInTime(LocalDateTime.now());
+        srmQualityInspection.setMaterialDoc105(zwm3a18.getKey());
+        srmQualityInspection.setMaterialDocYear105(zwm3a18.getValue());
+        wmsSrmQualityInspectionService.updateById(srmQualityInspection);
+        return ApiResult.success();
     }
 }
\ No newline at end of file

From a00ec8232a0b2b5e0a18ca1152c61e695dab1d14 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 10:18:48 +0800
Subject: [PATCH 07/13] =?UTF-8?q?1573=20=E6=89=98=E7=9B=98=E8=80=81?=
 =?UTF-8?q?=E9=BC=A0=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E3=80=90=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/admin/controller/StructuralPackageOrderController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 b787d2c2..c3b16cb7 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
@@ -557,6 +557,7 @@ public class StructuralPackageOrderController extends BaseController {
         DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在");
 
+        DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id);
         PackageVO vo = new PackageVO()
                 .setNo(trayVO.getPackageNo())
                 .setExternalOrderNo(trayVO.getExternalOrderNo())
@@ -567,7 +568,7 @@ public class StructuralPackageOrderController extends BaseController {
                 .setEco(trayVO.getEco())
                 .setWorkbenchCode(trayVO.getWorkbenchCode())
                 .setCate(trayVO.getPackageCate())
-                .setWeight(trayVO.getWeight())
+                .setWeight(orderVO.getWeight())
                 .setDrawingNo(trayVO.getPackageDrawingNo())
                 .setName(trayVO.getPackageDesc())
                 .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));

From f7ddc0d0c485e2b757b9a7cd43bcd61343386c54 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 11:36:11 +0800
Subject: [PATCH 08/13] =?UTF-8?q?1574=20=E3=80=90=E9=92=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=AE=A2=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-=E9=92=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E3=80=91=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=B7=E3=80=91=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StructuralPackageOrderController.java           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 c3b16cb7..60cae812 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
@@ -13,6 +13,7 @@ import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.google.common.collect.Maps;
 import com.nflg.wms.admin.pojo.dto.*;
 import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@@ -449,6 +450,12 @@ public class StructuralPackageOrderController extends BaseController {
                 .setMaterialDesc(orderVO.getPackageDesc())).toList()
         );
         List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
+        List<DeliverStructuralPackageOrderTrayItemVO> itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id);
+        Map<Long, DeliverStructuralPackageOrderTrayItemVO> deliverStructuralPackageOrderTrayItemMap = CollectionUtil.isNotEmpty(itemVOs) ?
+                itemVOs.stream().filter(d -> d.getId() != null).collect(Collectors.toMap(DeliverStructuralPackageOrderTrayItemVO::getId, d -> d))
+                : Maps.newHashMap();
+
+
         vo.setItems(items.stream().map(item -> {
             TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
             // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
@@ -472,6 +479,12 @@ public class StructuralPackageOrderController extends BaseController {
                     ivo.setStoreNum(item.getStoreNum());
                 }
             }
+
+            DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId());
+            if (itemVO != null) {
+                ivo.setDrawingNo(itemVO.getDrawingNo());
+            }
+
             return ivo;
         }).toList());
         return ApiResult.success(vo);

From 774ec0c1559925fa240b4f56ee0c0fd83d585f9e Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 16:44:23 +0800
Subject: [PATCH 09/13] =?UTF-8?q?Revert=20"1574=20=E3=80=90=E9=92=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=AE=A2=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-?=
 =?UTF-8?q?=E9=92=A2=E7=BB=93=E6=9E=84=E3=80=91=E7=9A=84=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90?=
 =?UTF-8?q?=E5=9B=BE=E5=8F=B7=E3=80=91=E5=88=97"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f7ddc0d0c485e2b757b9a7cd43bcd61343386c54.
---
 .../StructuralPackageOrderController.java           | 13 -------------
 1 file changed, 13 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 60cae812..c3b16cb7 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
@@ -13,7 +13,6 @@ import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.google.common.collect.Maps;
 import com.nflg.wms.admin.pojo.dto.*;
 import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@@ -450,12 +449,6 @@ public class StructuralPackageOrderController extends BaseController {
                 .setMaterialDesc(orderVO.getPackageDesc())).toList()
         );
         List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
-        List<DeliverStructuralPackageOrderTrayItemVO> itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id);
-        Map<Long, DeliverStructuralPackageOrderTrayItemVO> deliverStructuralPackageOrderTrayItemMap = CollectionUtil.isNotEmpty(itemVOs) ?
-                itemVOs.stream().filter(d -> d.getId() != null).collect(Collectors.toMap(DeliverStructuralPackageOrderTrayItemVO::getId, d -> d))
-                : Maps.newHashMap();
-
-
         vo.setItems(items.stream().map(item -> {
             TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
             // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
@@ -479,12 +472,6 @@ public class StructuralPackageOrderController extends BaseController {
                     ivo.setStoreNum(item.getStoreNum());
                 }
             }
-
-            DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId());
-            if (itemVO != null) {
-                ivo.setDrawingNo(itemVO.getDrawingNo());
-            }
-
             return ivo;
         }).toList());
         return ApiResult.success(vo);

From 0876d5fa8b8cfde5a07b3c16620f8193195c7f26 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 16:44:28 +0800
Subject: [PATCH 10/13] =?UTF-8?q?Revert=20"1573=20=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E8=80=81=E9=BC=A0=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E3=80=90=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a00ec8232a0b2b5e0a18ca1152c61e695dab1d14.
---
 .../wms/admin/controller/StructuralPackageOrderController.java | 3 +--
 1 file changed, 1 insertion(+), 2 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 c3b16cb7..b787d2c2 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
@@ -557,7 +557,6 @@ public class StructuralPackageOrderController extends BaseController {
         DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在");
 
-        DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id);
         PackageVO vo = new PackageVO()
                 .setNo(trayVO.getPackageNo())
                 .setExternalOrderNo(trayVO.getExternalOrderNo())
@@ -568,7 +567,7 @@ public class StructuralPackageOrderController extends BaseController {
                 .setEco(trayVO.getEco())
                 .setWorkbenchCode(trayVO.getWorkbenchCode())
                 .setCate(trayVO.getPackageCate())
-                .setWeight(orderVO.getWeight())
+                .setWeight(trayVO.getWeight())
                 .setDrawingNo(trayVO.getPackageDrawingNo())
                 .setName(trayVO.getPackageDesc())
                 .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));

From 4f9b727fdbdff1b2399d5ef186c8ec9a60942373 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 10:18:48 +0800
Subject: [PATCH 11/13] =?UTF-8?q?1573=20=E6=89=98=E7=9B=98=E8=80=81?=
 =?UTF-8?q?=E9=BC=A0=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E3=80=90=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/admin/controller/StructuralPackageOrderController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 b787d2c2..c3b16cb7 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
@@ -557,6 +557,7 @@ public class StructuralPackageOrderController extends BaseController {
         DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在");
 
+        DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id);
         PackageVO vo = new PackageVO()
                 .setNo(trayVO.getPackageNo())
                 .setExternalOrderNo(trayVO.getExternalOrderNo())
@@ -567,7 +568,7 @@ public class StructuralPackageOrderController extends BaseController {
                 .setEco(trayVO.getEco())
                 .setWorkbenchCode(trayVO.getWorkbenchCode())
                 .setCate(trayVO.getPackageCate())
-                .setWeight(trayVO.getWeight())
+                .setWeight(orderVO.getWeight())
                 .setDrawingNo(trayVO.getPackageDrawingNo())
                 .setName(trayVO.getPackageDesc())
                 .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));

From 29b5881f39d86e6a768aaac8553154226b96f1e8 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Thu, 18 Jun 2026 11:36:11 +0800
Subject: [PATCH 12/13] =?UTF-8?q?1574=20=E3=80=90=E9=92=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=AE=A2=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-=E9=92=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E3=80=91=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=B7=E3=80=91=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StructuralPackageOrderController.java           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 c3b16cb7..60cae812 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
@@ -13,6 +13,7 @@ import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.google.common.collect.Maps;
 import com.nflg.wms.admin.pojo.dto.*;
 import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@@ -449,6 +450,12 @@ public class StructuralPackageOrderController extends BaseController {
                 .setMaterialDesc(orderVO.getPackageDesc())).toList()
         );
         List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
+        List<DeliverStructuralPackageOrderTrayItemVO> itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id);
+        Map<Long, DeliverStructuralPackageOrderTrayItemVO> deliverStructuralPackageOrderTrayItemMap = CollectionUtil.isNotEmpty(itemVOs) ?
+                itemVOs.stream().filter(d -> d.getId() != null).collect(Collectors.toMap(DeliverStructuralPackageOrderTrayItemVO::getId, d -> d))
+                : Maps.newHashMap();
+
+
         vo.setItems(items.stream().map(item -> {
             TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
             // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
@@ -472,6 +479,12 @@ public class StructuralPackageOrderController extends BaseController {
                     ivo.setStoreNum(item.getStoreNum());
                 }
             }
+
+            DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId());
+            if (itemVO != null) {
+                ivo.setDrawingNo(itemVO.getDrawingNo());
+            }
+
             return ivo;
         }).toList());
         return ApiResult.success(vo);

From 2ddaedeb9967acf9f8021180ee183a54b37d3ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 23 Jun 2026 11:02:44 +0800
Subject: [PATCH 13/13] =?UTF-8?q?refactor(utils):=20=E4=BC=98=E5=8C=96HTML?=
 =?UTF-8?q?=E8=BD=AC=E5=9B=BE=E7=89=87=E5=B7=A5=E5=85=B7=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E7=94=9F=E6=88=90=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入IdUtil雪花算法ID替代时间戳
- 修改文件命名策略为基于唯一ID的方式
- 在WMS管理模块中应用新的ID生成方式
- 在WMS发货模块中统一ID生成逻辑
- 保持原有的临时文件目录创建和清理机制不变
---
 .../main/java/com/nflg/wms/admin/util/HtmlToImageUtil.java    | 3 ++-
 .../main/java/com/nflg/wms/shipment/util/HtmlToImageUtil.java | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/HtmlToImageUtil.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/HtmlToImageUtil.java
index b728557e..324a8638 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/HtmlToImageUtil.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/HtmlToImageUtil.java
@@ -1,6 +1,7 @@
 package com.nflg.wms.admin.util;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
@@ -28,7 +29,7 @@ public class HtmlToImageUtil {
             if (!Files.exists(tempDir)) {
                 Files.createDirectories(tempDir);
             }
-            long t = System.currentTimeMillis();
+            String t = IdUtil.getSnowflakeNextIdStr();
             inputHtmlPath = tempDir.resolve("input_" + t + ".html");
             outputImgPath = tempDir.resolve("output_" + t + ".png");
             Files.write(inputHtmlPath, htmlContent.getBytes());
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/HtmlToImageUtil.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/HtmlToImageUtil.java
index c455bf50..eaf6c9fb 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/HtmlToImageUtil.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/HtmlToImageUtil.java
@@ -1,6 +1,7 @@
 package com.nflg.wms.shipment.util;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
@@ -10,6 +11,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class HtmlToImageUtil {
@@ -28,7 +30,7 @@ public class HtmlToImageUtil {
             if (!Files.exists(tempDir)) {
                 Files.createDirectories(tempDir);
             }
-            long t = System.currentTimeMillis();
+            String t = IdUtil.getSnowflakeNextIdStr();
             inputHtmlPath = tempDir.resolve("input_" + t + ".html");
             outputImgPath = tempDir.resolve("output_" + t + ".png");
             Files.write(inputHtmlPath, htmlContent.getBytes());