From f88d4d8fe749a913cf81b5b23cfe3532632697bd Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Thu, 16 Apr 2026 00:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/model/entity/MaterialInfoDO.java |   5 ++
 .../model/query/MaterialInfoQuery.java        |  14 ++++
 .../material/model/req/BatchImportRowReq.java |   8 +++
 .../material/model/req/MaterialInfoReq.java   |   6 ++
 .../material/model/resp/MaterialInfoResp.java |   7 ++
 .../service/impl/MaterialInfoServiceImpl.java |   1 +
 .../weighManage/model/entity/WorkOrderDO.java |  10 +++
 .../model/entity/WorkOrderInfoDO.java         |  16 +++++
 .../model/query/WorkOrderQuery.java           |  13 +++-
 .../model/req/WorkOrderInfoReq.java           |   5 ++
 .../weighManage/model/req/WorkOrderReq.java   |  10 +++
 .../model/resp/WorkOrderInfoResp.java         |  16 +++++
 .../weighManage/model/resp/WorkOrderResp.java |   4 ++
 .../service/impl/WorkOrderServiceImpl.java    |  28 +++++---
 .../resources/mapper/MeterialInfoMapper.xml   |  10 ++-
 .../materialType/MaterialTypeController.java  |   6 +-
 .../controller/vm/VmCommandController.java    |   2 +-
 .../weighManage/ah/AHDZCConnect.java          |  61 +++++++++---------
 .../resources/templates/import/batch.xlsx     | Bin 9048 -> 9087 bytes
 19 files changed, 177 insertions(+), 45 deletions(-)

diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java
index 1ae1aa9..f599b53 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java
@@ -72,4 +72,9 @@ public class MaterialInfoDO extends BaseDO {
      */
     private String batch;
 
+    /**
+     * 标记
+     */
+    private String mark;
+
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java
index 7a1daed..b5b696f 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java
@@ -36,4 +36,18 @@ public class MaterialInfoQuery implements Serializable {
     @Schema(description = "物料编码")
     @Query(type = QueryType.EQ)
     private String encoding;
+
+    /**
+     * 批次
+     */
+    @Schema(description = "批次")
+    @Query(type = QueryType.EQ)
+    private String batch;
+
+    /**
+     * 标记
+     */
+    @Schema(description = "标记")
+    @Query(type = QueryType.EQ)
+    private String mark;
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java
index d8742f2..a9f1c88 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java
@@ -30,4 +30,12 @@ public class BatchImportRowReq implements Serializable {
     @Length(max = 255, message = "批次长度不能超过 {max} 个字符")
     private String batch;
 
+    /**
+     * 标记
+     */
+    @Schema(description = "标记")
+    @NotBlank(message = "标记不能为空")
+    @Length(max = 25, message = "标记长度不能超过 {max} 个字符")
+    private String mark;
+
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java
index 1dee185..8ac95f6 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java
@@ -92,4 +92,10 @@ public class MaterialInfoReq implements Serializable {
     @Schema(description = "批次")
     private String batch;
 
+    /**
+     * 标记
+     */
+    @Schema(description = "标记")
+    private String mark;
+
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java
index 0079e4d..b2f9f90 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java
@@ -113,4 +113,11 @@ public class MaterialInfoResp extends BaseDetailResp {
     @ExcelProperty(value = "批次", order = 7)
     private String batch;
 
+    /**
+     * 标记
+     */
+    @Schema(description = "标记")
+    @ExcelProperty(value = "标记", order = 8)
+    private String mark;
+
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
index 518b83e..27836b7 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
@@ -543,6 +543,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
             MaterialInfoDO materialInfoDO = new MaterialInfoDO();
             materialInfoDO.setEncoding(row.getEncoding());
             materialInfoDO.setBatch(row.getBatch());
+            materialInfoDO.setMark(row.getMark());
             materialInfoDO.setUpdateUser(UserContextHolder.getUserId());
             return materialInfoDO;
         }).toList();
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java
index d3a7216..608b483 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java
@@ -52,4 +52,14 @@ public class WorkOrderDO extends BaseDO {
      */
     private Integer totalCount;
 
+    /**
+     * 批次
+     */
+    private String batch;
+
+    /**
+     * 标记号
+     */
+    private String mark;
+
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderInfoDO.java
index 1de9862..b081a37 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderInfoDO.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderInfoDO.java
@@ -56,4 +56,20 @@ public class WorkOrderInfoDO extends BaseDO {
      * 计算重量
      */
     private BigDecimal calculatedWeight;
+
+    /**
+     * 批次
+     */
+    private String batch;
+
+    /**
+     * 标记号
+     */
+    private String mark;
+
+    /**
+     * 称重数量
+     */
+    private Integer weightQuantity;
+
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java
index 85d5c73..cedf1ca 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java
@@ -3,6 +3,7 @@ package top.wms.admin.weighManage.model.query;
 import lombok.Data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -56,11 +57,19 @@ public class WorkOrderQuery implements Serializable {
      * 创建开始时间
      */
     @Schema(description = "创建开始时间")
-    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startDate;
 
     /**
      * 创建结束时间
      */
     @Schema(description = "创建结束时间")
-    private Date endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+
+    /**
+     * 批次
+     */
+    private String batch;
+
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderInfoReq.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderInfoReq.java
index bdb3717..f7fbb11 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderInfoReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderInfoReq.java
@@ -65,4 +65,9 @@ public class WorkOrderInfoReq implements Serializable {
     @Schema(description = "抓拍的图片")
     private String imgUrl;
 
+    /**
+     * 称重数量
+     */
+    private Integer weightQuantity;
+
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
index 92f7c01..8c70c12 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
@@ -52,4 +52,14 @@ public class WorkOrderReq implements Serializable {
      */
     private String calculatedWeight;
 
+    /**
+     * 批次
+     */
+    private String batch;
+
+    /**
+     * 标记号
+     */
+    private String mark;
+
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderInfoResp.java
index 79c81fc..cfde16a 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderInfoResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderInfoResp.java
@@ -69,4 +69,20 @@ public class WorkOrderInfoResp {
     @Schema(description = "抓拍的图片")
     private String imgUrl;
 
+    /**
+     * 批次
+     */
+    @Schema(description = "批次")
+    private String batch;
+
+    /**
+     * 标记号
+     */
+    private String mark;
+
+    /**
+     * 称重数量
+     */
+    private Integer weightQuantity;
+
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java
index 18e6fbf..c6375f0 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java
@@ -108,4 +108,8 @@ public class WorkOrderResp extends BaseDetailResp {
     @Schema(description = "批次")
     private String batch;
 
+    /**
+     * 标记号
+     */
+    private String mark;
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
index 137cc0d..06107a0 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
@@ -20,7 +20,6 @@ import top.wms.admin.material.mapper.MaterialInfoMapper;
 import top.wms.admin.material.model.entity.MaterialInfoDO;
 import top.wms.admin.materialType.mapper.MaterialTypeMapper;
 import top.wms.admin.materialType.model.entity.MaterialTypeDO;
-import top.wms.admin.system.service.ConfigService;
 import top.wms.admin.weighManage.mapper.WorkOrderInfoMapper;
 import top.wms.admin.weighManage.mapper.WorkOrderMapper;
 import top.wms.admin.weighManage.model.entity.WorkOrderDO;
@@ -55,13 +54,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final MaterialTypeMapper materialTypeMapper;
 
-    private final ConfigService configService;
-
     @Override
     public PageResp<WorkOrderResp> page(WorkOrderQuery query, PageQuery pageQuery) {
         QueryWrapper<WorkOrderDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StrUtil.isNotBlank(query.getMaterialName()), "m.material_name", query.getMaterialName());
         queryWrapper.eq(null != query.getOrderNo(), "w.order_no", query.getOrderNo());
+        queryWrapper.eq(StrUtil.isNotBlank(query.getBatch()), "w.batch", query.getBatch());
+        queryWrapper.eq(StrUtil.isNotBlank(query.getUserName()), "u.username", query.getUserName());
+        queryWrapper.eq(StrUtil.isNotBlank(query.getCarNo()), "u.card_no", query.getCarNo());
+        queryWrapper.eq(StrUtil.isNotBlank(query.getEncoding()), "m.encoding", query.getEncoding());
+        queryWrapper.ge(null != query.getStartDate(), "w.create_time", query.getStartDate());
+        queryWrapper.le(null != query.getEndDate(), "w.create_time", query.getEndDate());
         this.sort(queryWrapper, pageQuery);
 
         IPage<WorkOrderResp> page = baseMapper.selectWorkOrderPage(new Page<>(pageQuery.getPage(), pageQuery
@@ -78,9 +81,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             MaterialInfoDO materialInfoDO = materialInfoMapper.selectById(workOrderDO.getMaterialId());
             workOrderResp.setMaterialName(materialInfoDO.getMaterialName());
             workOrderResp.setEncoding(materialInfoDO.getEncoding());
-            workOrderResp.setBatch(materialInfoDO.getBatch());
         }
-
+        List<WorkOrderInfoDO> infos = workOrderInfoMapper.selectList(new QueryWrapper<WorkOrderInfoDO>()
+            .eq("work_order_id", id));
+        if (CollUtil.isNotEmpty(infos)) {
+            workOrderResp.setWorkOrderInfos(BeanUtil.copyToList(infos, WorkOrderInfoResp.class));
+        }
         return workOrderResp;
     }
 
@@ -118,6 +124,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             .getUsername() + "-" + materialInfoDO.getMaterialName();
         workOrder.setTitle(title);
         workOrder.setMaterialId(req.getMaterialId());
+        workOrder.setBatch(materialInfoDO.getBatch());
+        workOrder.setMark(materialInfoDO.getMark());
         workOrder.setTotalWeight(totalWeight);
         workOrder.setTotalCount(totalCount);
         workOrder.setTotalCalculatedWeight(materialInfoDO.getUnitWeight().multiply(BigDecimal.valueOf(totalCount)));
@@ -125,7 +133,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         //新增工单详情列表信息
         List<WorkOrderInfoDO> workOrderInfoDOList = BeanUtil.copyToList(req.getWorkOrderInfos(), WorkOrderInfoDO.class);
-        workOrderInfoDOList.forEach(workOrderInfoDO -> workOrderInfoDO.setWorkOrderId(workOrder.getId()));
+        workOrderInfoDOList.forEach(workOrderInfoDO -> {
+            workOrderInfoDO.setWorkOrderId(workOrder.getId());
+            workOrderInfoDO.setBatch(materialInfoDO.getBatch());
+            workOrderInfoDO.setMark(materialInfoDO.getMark());
+        });
         workOrderInfoMapper.insertBatch(workOrderInfoDOList);
 
         return BeanUtil.copyProperties(workOrder, WorkOrderResp.class);
@@ -162,7 +174,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (ratio.compareTo(upFloatRatio) > 0) {
             log.info("比值超过 {}%", upFloatRatio);
             map.put("code", "502");
-            map.put("msg", "数量不足");
+            map.put("msg", "数量过多，请减少");
             return map;
         }
 
@@ -170,7 +182,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (ratio.compareTo(downFloatRatio) < 0) {
             log.info("比值超过下限 {}%", downFloatRatio);
             map.put("code", "501");
-            map.put("msg", "数量过多");
+            map.put("msg", "数量不足，请添加");
             return map;
         }
 
diff --git a/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml b/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
index 508a558..9477ffc 100644
--- a/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
+++ b/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
@@ -78,7 +78,7 @@
     </update>
 
    <update id="updateBatchNull">
-        UPDATE sys_material_info SET batch = null
+        UPDATE sys_material_info SET batch = null, mark = null
     </update>
 
     <update id="updateBatchByCode">
@@ -93,6 +93,14 @@
                     </foreach>
                     ELSE batch
                 END,
+                mark = CASE
+                    <foreach collection="list" item="item" separator="">
+                        <if test="item.mark != null and item.mark != ''">
+                            WHEN encoding = #{item.encoding} THEN #{item.mark}
+                        </if>
+                    </foreach>
+                    ELSE mark
+                END,
                 update_user = CASE
                     <foreach collection="list" item="item" separator="">
                         <if test="item.updateUser != null">
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/materialType/MaterialTypeController.java b/wms-webapi/src/main/java/top/wms/admin/controller/materialType/MaterialTypeController.java
index 3f1d11d..edf00ac 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/materialType/MaterialTypeController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/materialType/MaterialTypeController.java
@@ -50,7 +50,7 @@ public class MaterialTypeController extends BaseController<MaterialTypeService,
 
     @Log(ignore = true)
     @Operation(summary = "下载导入模板", description = "下载导入模板")
-    @SaCheckPermission("admin:materialType:import")
+    @SaCheckPermission("materialType:materialType:import")
     @GetMapping(value = "/importTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     public void downloadImportTemplate(HttpServletResponse response) throws IOException {
         baseService.downloadImportTemplate(response);
@@ -58,7 +58,7 @@ public class MaterialTypeController extends BaseController<MaterialTypeService,
 
     @Log(ignore = true)
     @Operation(summary = "解析导入数据", description = "解析导入数据")
-    @SaCheckPermission("admin:materialType:import")
+    @SaCheckPermission("materialType:materialType:import")
     @PostMapping("/parseImport")
     public MaterialTypeImportParseResp parseImport(@NotNull(message = "文件不能为空") MultipartFile file) {
         ValidationUtils.throwIf(file::isEmpty, "文件不能为空");
@@ -66,7 +66,7 @@ public class MaterialTypeController extends BaseController<MaterialTypeService,
     }
 
     @Operation(summary = "导入数据", description = "导入数据")
-    @SaCheckPermission("admin:materialType:import")
+    @SaCheckPermission("materialType:materialType:import")
     @PostMapping(value = "/import")
     public MaterialTypeImportResp importMaterial(@Validated @RequestBody MaterialTypeImportReq req) {
         return baseService.importMaterial(req);
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java
index c41cd44..ec0f32d 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java
@@ -76,7 +76,7 @@ public class VmCommandController {
             } catch (NumberFormatException e) {
                 throw new BusinessException("相机识别异常");
             }
-
+            response = "success";
         } else if (StrUtil.equals(response, materialCode)) {
             response = "success";
         } else {
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
index fac987d..090c8f7 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
 public class AHDZCConnect {
 
     //老设备（只能跑jar包的）
-    //    private static final String PORT_NAME = "COM12";
+    private static final String PORT_NAME = "COM12";
     //新设备（环境齐全的）
-    private static final String PORT_NAME = "COM13";
+    //    private static final String PORT_NAME = "COM13";
     private static final int BAUD_RATE = 9600;
     private static final int DATA_BITS = 8;
     private static final int STOP_BITS = 1;
@@ -55,9 +55,9 @@ public class AHDZCConnect {
     private ScheduledExecutorService executorService;
 
     // todo 模拟数据生成
-    //    private ScheduledFuture<?> mockDataTask;
-    //    private final AtomicBoolean isMockDataRunning = new AtomicBoolean(false);
-    //    private final Random random = new Random();
+    //        private ScheduledFuture<?> mockDataTask;
+    //        private final AtomicBoolean isMockDataRunning = new AtomicBoolean(false);
+    //        private final Random random = new Random();
 
     /**
      * 初始化并启动电子秤服务
@@ -76,8 +76,8 @@ public class AHDZCConnect {
         start();
 
         // todo 模拟数据生成
-        //        isMockDataRunning.set(true);
-        //        startMockData();
+        //                isMockDataRunning.set(true);
+        //                startMockData();
 
         return R.ok();
     }
@@ -227,6 +227,7 @@ public class AHDZCConnect {
 
                         // 解析数据，提取数字和重量单位
                         String weightStr = data.trim();
+                        log.info("电子称原始数据: {}", weightStr);
                         // 使用正则表达式提取数字（包括小数点）
                         Pattern pattern = Pattern.compile("[-+]?\\d*\\.?\\d+");
                         Matcher matcher = pattern.matcher(weightStr);
@@ -339,7 +340,7 @@ public class AHDZCConnect {
         log.info("========================================");
 
         // todo 模拟数据生成
-        //        stopMockData();
+        //                stopMockData();
 
         try {
             if (executorService != null && !executorService.isShutdown()) {
@@ -361,32 +362,32 @@ public class AHDZCConnect {
     }
 
     // todo 模拟数据生成
-    //    private void startMockData() {
-    //        if (executorService == null || executorService.isShutdown()) {
-    //            log.warn("[模拟数据] 线程池未初始化或已关闭");
-    //            return;
-    //        }
-    //
-    //        mockDataTask = executorService.scheduleAtFixedRate(() -> {
-    //            if (!isMockDataRunning.get()) {
+    //        private void startMockData() {
+    //            if (executorService == null || executorService.isShutdown()) {
+    //                log.warn("[模拟数据] 线程池未初始化或已关闭");
     //                return;
     //            }
     //
-    //            try {
-    //                ScaleWebSocketHandler.sendMessage(String.valueOf(random.nextInt(100) + 1));
-    //                log.debug("[模拟数据] 发送重量数据: 37.8");
-    //            } catch (Exception e) {
-    //                log.error("[模拟数据] 发送异常: {}", e.getMessage());
-    //            }
-    //        }, 0, 1, TimeUnit.SECONDS);
-    //    }
+    //            mockDataTask = executorService.scheduleAtFixedRate(() -> {
+    //                if (!isMockDataRunning.get()) {
+    //                    return;
+    //                }
     //
-    //    private void stopMockData() {
-    //        if (mockDataTask != null && !mockDataTask.isCancelled()) {
-    //            mockDataTask.cancel(false);
-    //            mockDataTask = null;
+    //                try {
+    //                    ScaleWebSocketHandler.sendMessage(String.valueOf(random.nextInt(100) + 1));
+    //                    log.debug("[模拟数据] 发送重量数据: 37.8");
+    //                } catch (Exception e) {
+    //                    log.error("[模拟数据] 发送异常: {}", e.getMessage());
+    //                }
+    //            }, 0, 3, TimeUnit.SECONDS);
+    //        }
+    //
+    //        private void stopMockData() {
+    //            if (mockDataTask != null && !mockDataTask.isCancelled()) {
+    //                mockDataTask.cancel(false);
+    //                mockDataTask = null;
+    //            }
+    //            isMockDataRunning.set(false);
     //        }
-    //        isMockDataRunning.set(false);
-    //    }
 
 }
\ No newline at end of file
diff --git a/wms-webapi/src/main/resources/templates/import/batch.xlsx b/wms-webapi/src/main/resources/templates/import/batch.xlsx
index c5ba600a43972191c7518b8569476a350dda9513..3889cad88677f47f746761d5cee284b7f7449bc1 100644
GIT binary patch
delta 2248
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
TiR+z`5}_(fh(lII|E~QT3`+rw

delta 2171
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