优化

Merge branch 'refs/heads/master_lz'
tcp服务启动
2026-03-13 10:30:55 +08:00 · 2026-03-12 20:20:46 +08:00 · 2026-03-12 19:45:07 +08:00 · 2026-03-12 16:54:55 +08:00 · 2026-03-11 17:53:58 +08:00 · 2026-03-11 17:44:57 +08:00
71 changed files with 2753 additions and 363 deletions
--- a/wms-common/.flattened-pom.xml
+++ b/wms-common/.flattened-pom.xml
@@ -119,5 +119,10 @@
      <groupId>org.springframework</groupId>
      <artifactId>spring-test</artifactId>
    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-all</artifactId>
+      <version>4.1.100.Final</version>
+    </dependency>
  </dependencies>
 </project>
--- a/wms-common/pom.xml
+++ b/wms-common/pom.xml
@@ -155,5 +155,12 @@
            <artifactId>spring-test</artifactId>
        </dependency>

+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.100.Final</version> <!-- 使用较新稳定版本 -->
+        </dependency>
+
+
    </dependencies>
-</project>
+</project>
--- a/wms-module-system/.flattened-pom.xml
+++ b/wms-module-system/.flattened-pom.xml
@@ -21,5 +21,11 @@
      <groupId>top.wms</groupId>
      <artifactId>wms-common</artifactId>
    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+      <scope>provided</scope>
+    </dependency>
  </dependencies>
 </project>
--- a/wms-module-system/pom.xml
+++ b/wms-module-system/pom.xml
@@ -18,5 +18,12 @@
            <groupId>top.wms</groupId>
            <artifactId>wms-common</artifactId>
        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+            <scope>provided</scope>
+        </dependency>
    </dependencies>
-</project>
+</project>
--- a/wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java
+++ b/wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java
@@ -13,7 +13,6 @@ import top.wms.admin.common.context.UserContext;
 import top.wms.admin.common.context.UserContextHolder;
 import top.wms.admin.common.context.UserExtraContext;
 import top.wms.admin.common.enums.DisEnableStatusEnum;
-import top.wms.admin.system.model.entity.DeptDO;
 import top.wms.admin.system.model.entity.UserDO;
 import top.wms.admin.system.model.resp.ClientResp;
 import top.wms.admin.system.service.DeptService;
@@ -106,7 +105,7 @@ public abstract class AbstractLoginHandler<T extends LoginReq> implements LoginH
     */
    protected void checkUserStatus(UserDO user) {
        CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, user.getStatus(), "此账号已被禁用，如有疑问，请联系管理员");
-//        DeptDO dept = deptService.getById(user.getDeptId());
-//        CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, dept.getStatus(), "此账号所属部门已被禁用，如有疑问，请联系管理员");
+        //        DeptDO dept = deptService.getById(user.getDeptId());
+        //        CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, dept.getStatus(), "此账号所属部门已被禁用，如有疑问，请联系管理员");
    }
-}
+}
--- a/wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java
+++ b/wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java
@@ -1,24 +1,23 @@
 package top.wms.admin.auth.handler;

 import jakarta.servlet.http.HttpServletRequest;
-import top.continew.starter.cache.redisson.util.RedisUtils;
+import org.springframework.stereotype.Component;
 import top.continew.starter.core.validation.ValidationUtils;
 import top.wms.admin.auth.AbstractLoginHandler;
 import top.wms.admin.auth.enums.AuthTypeEnum;
 import top.wms.admin.auth.model.req.CardLoginReq;
-import top.wms.admin.auth.model.req.PhoneLoginReq;
 import top.wms.admin.auth.model.resp.LoginResp;
-import top.wms.admin.common.constant.CacheConstants;
 import top.wms.admin.system.model.entity.UserDO;
 import top.wms.admin.system.model.resp.ClientResp;

-public class CardLoginHandler  extends AbstractLoginHandler<CardLoginReq> {
+@Component
+public class CardLoginHandler extends AbstractLoginHandler<CardLoginReq> {

    @Override
    public LoginResp login(CardLoginReq req, ClientResp client, HttpServletRequest request) {
        // 验证手机号
        UserDO user = userService.getByCard(req.getCardNumber());
-        ValidationUtils.throwIfNull(user, "此手机号未绑定本系统账号");
+        ValidationUtils.throwIfNull(user, "此卡号未绑定本系统账号");
        // 检查用户状态
        super.checkUserStatus(user);
        // 执行认证
@@ -27,17 +26,12 @@ public class CardLoginHandler  extends AbstractLoginHandler<CardLoginReq> {
    }

    @Override
-    public void preLogin(PhoneLoginReq req, ClientResp client, HttpServletRequest request) {
-        String phone = req.getPhone();
-        String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + phone;
-        String captcha = RedisUtils.get(captchaKey);
-        ValidationUtils.throwIfBlank(captcha, CAPTCHA_EXPIRED);
-        ValidationUtils.throwIfNotEqualIgnoreCase(req.getCaptcha(), captcha, CAPTCHA_ERROR);
-        RedisUtils.delete(captchaKey);
+    public void preLogin(CardLoginReq req, ClientResp client, HttpServletRequest request) {
+        super.preLogin(req, client, request);
    }

    @Override
    public AuthTypeEnum getAuthType() {
-        return AuthTypeEnum.PHONE;
+        return AuthTypeEnum.CARD;
    }
 }
--- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java
@@ -38,12 +38,6 @@ public class UserInfoResp implements Serializable {
    @Schema(description = "用户名", example = "zhangsan")
    private String username;

-    /**
-     * 昵称
-     */
-    @Schema(description = "昵称", example = "张三")
-    private String nickname;
-
    /**
     * 性别
     */
--- a/wms-module-system/src/main/java/top/wms/admin/material/mapper/MaterialInfoMapper.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/mapper/MaterialInfoMapper.java
@@ -4,6 +4,8 @@ import top.continew.starter.data.mp.base.BaseMapper;
 import top.wms.admin.material.model.entity.MaterialInfoDO;
 import org.springframework.stereotype.Repository;

+import java.util.List;
+
 /**
 * 物料信息 Mapper
 *
@@ -12,5 +14,7 @@ import org.springframework.stereotype.Repository;
 */
@Repository
 public interface MaterialInfoMapper extends BaseMapper<MaterialInfoDO> {
+    public int updateByName(List<MaterialInfoDO> list);

+    public int updateByCode(List<MaterialInfoDO> list);
 }
--- 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
@@ -37,10 +37,10 @@ public class MaterialInfoDO extends BaseDO {
     */
    private BigDecimal unitWeight;

-    /**
-     * 物料单次可称量最大重量(kg)
-     */
-    private BigDecimal maxWeight;
+    /*
+        物料规格
+    */
+    private String materialSpec;

    /**
     * 物料照片地址
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java
@@ -0,0 +1,45 @@
+package top.wms.admin.material.model.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@Schema(description = "物料信息导入行数据")
+public class MaterialImportRowReq implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料名称
+     */
+    @Schema(description = "物料名称")
+    @NotBlank(message = "物料名称不能为空")
+    @Length(max = 255, message = "物料名称长度不能超过 {max} 个字符")
+    private String materialName;
+
+    /**
+     * 物料编码
+     */
+    @Schema(description = "物料编码")
+    @NotBlank(message = "物料编码不能为空")
+    @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符")
+    private String encoding;
+
+    /**
+     * 物料单位重量(g)
+     */
+    @Schema(description = "物料单位重量(g)")
+    private BigDecimal unitWeight;
+
+    /*
+     * 物料规格
+     * */
+    @Schema(description = "物料规格")
+    private String materialSpec;
+}
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoImportReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoImportReq.java
@@ -0,0 +1,47 @@
+package top.wms.admin.material.model.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import top.wms.admin.common.enums.DisEnableStatusEnum;
+import top.wms.admin.system.enums.ImportPolicyEnum;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+@Schema(description = "物料导入参数")
+public class MaterialInfoImportReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 导入会话KEY
+     */
+    @Schema(description = "导入会话KEY", example = "1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed")
+    @NotBlank(message = "导入已过期，请重新上传")
+    private String importKey;
+
+    /**
+     * 物料名称重复策略
+     */
+    @Schema(description = "物料名称重复策略", example = "1")
+    @NotNull(message = "物料名称重复策略不能为空")
+    private ImportPolicyEnum duplicateName;
+
+    /**
+     * 重复编码策略
+     */
+    @Schema(description = "重复编码策略", example = "1")
+    @NotNull(message = "重复编码策略不能为空")
+    private ImportPolicyEnum duplicateCode;
+
+    /**
+     * 默认状态
+     */
+    @Schema(description = "默认状态", example = "1")
+    private DisEnableStatusEnum defaultStatus;
+
+}
--- 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
@@ -46,11 +46,11 @@ public class MaterialInfoReq implements Serializable {
    @Schema(description = "物料单位重量(g)")
    private Double unitWeight;

-    /**
-     * 物料单次可称量最大重量(kg)
-     */
-    @Schema(description = "物料单次可称量最大重量(kg)")
-    private Double maxWeight;
+    /*
+    * 物料规格
+    * */
+    @Schema(description = "物料规格")
+    private String materialSpec;

    /**
     * 物料照片地址
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialImportParseResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialImportParseResp.java
@@ -0,0 +1,55 @@
+package top.wms.admin.material.model.resp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 物料导入解析结果
+ *
+ * @author kils
+ * @since 2024/6/18 14:37
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "用户导入解析结果")
+public class MaterialImportParseResp implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 导入会话 Key
+     */
+    @Schema(description = "导入会话Key", example = "1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed")
+    private String importKey;
+
+    /**
+     * 总计行数
+     */
+    @Schema(description = "总计行数", example = "100")
+    private Integer totalRows;
+
+    /**
+     * 有效行数
+     */
+    @Schema(description = "有效行数", example = "100")
+    private Integer validRows;
+
+    /**
+     * 重复物料名行数
+     */
+    @Schema(description = "重复物料名行数", example = "100")
+    private Integer duplicateNameRows;
+
+    /**
+     * 重复物料编码行数
+     */
+    @Schema(description = "重复物料编码行数", example = "100")
+    private Integer duplicateCodeRows;
+}
--- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoImportResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoImportResp.java
@@ -0,0 +1,34 @@
+package top.wms.admin.material.model.resp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Schema(description = "物料信息导入结果")
+@AllArgsConstructor
+@NoArgsConstructor
+public class MaterialInfoImportResp implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总计行数
+     */
+    @Schema(description = "总计行数", example = "100")
+    private Integer totalRows;
+
+    /**
+     * 新增行数
+     */
+    @Schema(description = "新增行数", example = "100")
+    private Integer insertRows;
+
+    /**
+     * 修改行数
+     */
+    @Schema(description = "修改行数", example = "100")
+    private Integer updateRows;
+}
--- 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
@@ -45,11 +45,11 @@ public class MaterialInfoResp extends BaseDetailResp {
    private Double unitWeight;

    /**
-     * 物料单次可称量最大重量(kg)
+     * 物料规格
     */
-    @Schema(description = "物料单次可称量最大重量(kg)")
-    @ExcelProperty(value = "物料单次可称量最大重量(kg)")
-    private Double maxWeight;
+    @Schema(description = "物料规格")
+    @ExcelProperty(value = "物料规格")
+    private String materialSpec;

    /**
     * 物料照片地址
--- a/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
@@ -1,10 +1,18 @@
 package top.wms.admin.material.service;

+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.multipart.MultipartFile;
 import top.continew.starter.extension.crud.service.BaseService;
+import top.wms.admin.material.model.entity.MaterialInfoDO;
 import top.wms.admin.material.model.query.MaterialInfoQuery;
+import top.wms.admin.material.model.req.MaterialInfoImportReq;
 import top.wms.admin.material.model.req.MaterialInfoReq;
+import top.wms.admin.material.model.resp.MaterialImportParseResp;
+import top.wms.admin.material.model.resp.MaterialInfoImportResp;
 import top.wms.admin.material.model.resp.MaterialInfoResp;

+import java.io.IOException;
+
 /**
 * 物料信息业务接口
 *
@@ -13,4 +21,43 @@ import top.wms.admin.material.model.resp.MaterialInfoResp;
 */
 public interface MaterialInfoService extends BaseService<MaterialInfoResp, MaterialInfoResp, MaterialInfoQuery, MaterialInfoReq> {

+    /*
+    *
+    * 根据编码查询物料信息
+    * */
+    public MaterialInfoDO getMaterialInfoByCode(String code);
+
+    /**
+     * 下载导入模板
+     *
+     * @param response 响应对象
+     * @throws IOException /
+     */
+    void downloadImportTemplate(HttpServletResponse response) throws IOException;
+
+    /**
+     * 解析导入数据
+     *
+     * @param file 导入文件
+     * @return 解析结果
+     */
+    MaterialImportParseResp parseImport(MultipartFile file);
+
+    /**
+     * 导入数据
+     *
+     * @param req 导入信息
+     * @return 导入结果
+     */
+    MaterialInfoImportResp importMaterial(MaterialInfoImportReq req);
+
+    /*
+    * 照片批量上传处理
+    * */
+    void uploadMaterialPhotos(MultipartFile file);
+
+    /*
+    * 称重时照片抓取
+    * */
+    String catchPhoto(MultipartFile file);
 }
--- 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
@@ -1,16 +1,63 @@
 package top.wms.admin.material.service.impl;

+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.*;
+import cn.hutool.extra.validation.ValidationUtil;
+import cn.hutool.http.ContentType;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import jakarta.servlet.http.HttpServletResponse;
+import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;

+import lombok.extern.slf4j.Slf4j;
+import net.dreamlu.mica.core.result.R;
+import org.dromara.x.file.storage.core.FileInfo;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;

+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import top.continew.starter.cache.redisson.util.RedisUtils;
+import top.continew.starter.core.exception.BusinessException;
+import top.continew.starter.core.validation.CheckUtils;
 import top.continew.starter.extension.crud.service.BaseServiceImpl;
+import top.continew.starter.web.util.FileUploadUtils;
+import top.wms.admin.common.constant.CacheConstants;
+import top.wms.admin.common.context.UserContextHolder;
+import top.wms.admin.common.util.SecureUtils;
 import top.wms.admin.material.mapper.MaterialInfoMapper;
 import top.wms.admin.material.model.entity.MaterialInfoDO;
 import top.wms.admin.material.model.query.MaterialInfoQuery;
+import top.wms.admin.material.model.req.MaterialImportRowReq;
+import top.wms.admin.material.model.req.MaterialInfoImportReq;
 import top.wms.admin.material.model.req.MaterialInfoReq;
+import top.wms.admin.material.model.resp.MaterialImportParseResp;
+import top.wms.admin.material.model.resp.MaterialInfoImportResp;
 import top.wms.admin.material.model.resp.MaterialInfoResp;
 import top.wms.admin.material.service.MaterialInfoService;
+import top.wms.admin.system.service.FileService;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import static top.wms.admin.system.enums.ImportPolicyEnum.*;
+import static top.wms.admin.system.enums.ImportPolicyEnum.SKIP;

 /**
 * 物料信息业务实现
@@ -20,6 +67,358 @@ import top.wms.admin.material.service.MaterialInfoService;
 */
@Service
@RequiredArgsConstructor
+@Slf4j
 public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper, MaterialInfoDO, MaterialInfoResp, MaterialInfoResp, MaterialInfoQuery, MaterialInfoReq> implements MaterialInfoService {

+    private static final Set<String> IMAGE_EXTENSIONS = Set.of("jpg", "jpeg", "png", "gif", "bmp");
+
+    private final FileService fileService;
+
+    @Override
+    public MaterialInfoDO getMaterialInfoByCode(String code) {
+        if (StrUtil.isNotBlank(code)) {
+            return baseMapper.lambdaQuery().eq(MaterialInfoDO::getEncoding, code).one();
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void downloadImportTemplate(HttpServletResponse response) throws IOException {
+        try {
+            FileUploadUtils.download(response, ResourceUtil
+                .getStream("templates/import/materialInfo.xlsx"), "物料信息导入模板.xlsx");
+        } catch (Exception e) {
+            log.error("下载用户导入模板失败：{}", e);
+            response.setCharacterEncoding(CharsetUtil.UTF_8);
+            response.setContentType(ContentType.JSON.toString());
+            response.getWriter().write(JSONUtil.toJsonStr(R.fail("下载用户导入模板失败")));
+        }
+    }
+
+    @Override
+    public MaterialImportParseResp parseImport(MultipartFile file) {
+        MaterialImportParseResp materialImportResp = new MaterialImportParseResp();
+        List<MaterialImportRowReq> importRowList;
+        // 读取表格数据
+        try {
+            importRowList = EasyExcel.read(file.getInputStream())
+                .head(MaterialImportRowReq.class)
+                .sheet()
+                .headRowNumber(1)
+                .doReadSync();
+        } catch (Exception e) {
+            log.error("物料信息导入数据文件解析异常：{}", e);
+            throw new BusinessException("数据文件解析异常");
+        }
+        // 总计行数
+        materialImportResp.setTotalRows(importRowList.size());
+        CheckUtils.throwIfEmpty(importRowList, "数据文件格式错误");
+        // 有效行数：过滤无效(同名物料)数据
+        List<MaterialImportRowReq> validRowList = this.filterImportData(importRowList);
+        materialImportResp.setValidRows(validRowList.size());
+        CheckUtils.throwIfEmpty(validRowList, "数据文件格式错误");
+
+        // 检测表格内数据是否合法
+        Set<String> seenCode = new HashSet<>();
+        boolean hasDuplicateEncoding = validRowList.stream()
+            .map(MaterialImportRowReq::getEncoding)
+            .anyMatch(encoding -> encoding != null && !seenCode.add(encoding));
+        CheckUtils.throwIf(hasDuplicateEncoding, "存在重复物料编码,请检测数据");
+
+        // 查询重复用户
+        materialImportResp
+            .setDuplicateNameRows(countExistByField(validRowList, MaterialImportRowReq::getMaterialName, MaterialInfoDO::getMaterialName, false));
+        // 查询重复邮箱
+        materialImportResp
+            .setDuplicateCodeRows(countExistByField(validRowList, MaterialImportRowReq::getEncoding, MaterialInfoDO::getEncoding, false));
+        // 设置导入会话并缓存数据，有效期10分钟
+        String importKey = UUID.fastUUID().toString(true);
+        RedisUtils.set(CacheConstants.DATA_IMPORT_KEY + importKey, JSONUtil.toJsonStr(validRowList), Duration
+            .ofMinutes(10));
+        materialImportResp.setImportKey(importKey);
+        return materialImportResp;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MaterialInfoImportResp importMaterial(MaterialInfoImportReq req) {
+        // 校验导入会话是否过期
+        List<MaterialImportRowReq> importMaterialList;
+        try {
+            String data = RedisUtils.get(CacheConstants.DATA_IMPORT_KEY + req.getImportKey());
+            importMaterialList = JSONUtil.toList(data, MaterialImportRowReq.class);
+            CheckUtils.throwIf(CollUtil.isEmpty(importMaterialList), "导入已过期，请重新上传");
+        } catch (Exception e) {
+            log.error("导入异常:", e);
+            throw new BusinessException("导入已过期，请重新上传");
+        }
+        // 已存在数据查询
+        List<String> existName = listExistByField(importMaterialList, MaterialImportRowReq::getMaterialName, MaterialInfoDO::getMaterialName);
+        List<String> existCode = listExistByField(importMaterialList, MaterialImportRowReq::getEncoding, MaterialInfoDO::getEncoding);
+        CheckUtils.throwIf(isExitImportMaterial(req, importMaterialList, existName, existCode), "数据不符合导入策略，已退出导入");
+        // 批量操作数据库集合
+        List<MaterialInfoDO> insertList = new ArrayList<>();
+        List<MaterialInfoDO> updateByNameList = new ArrayList<>();
+        List<MaterialInfoDO> updateByCodeList = new ArrayList<>();
+        // ID生成器
+        //        IdGenerator idGenerator = DefaultIdGeneratorProvider.INSTANCE.getShare();
+        for (MaterialImportRowReq row : importMaterialList) {
+            if (isSkipMaterialImport(req, row, existName, existCode)) {
+                // 按规则跳过该行
+                continue;
+            }
+            MaterialInfoDO materialDO = BeanUtil.toBeanIgnoreError(row, MaterialInfoDO.class);
+            materialDO.setUnitWeight(NumberUtil.isValidNumber(row.getUnitWeight()) ? row.getUnitWeight() : null);
+            materialDO.setMaterialSpec(StrUtil.isNotBlank(row.getMaterialSpec()) ? row.getMaterialSpec() : null);
+            // 修改 or 新增
+            if (UPDATE.validate(req.getDuplicateName(), row.getMaterialName(), existName)) {
+                materialDO.setMaterialName(row.getMaterialName());
+                materialDO.setUpdateTime(LocalDateTime.now());
+                materialDO.setUpdateUser(UserContextHolder.getUserId());
+                updateByNameList.add(materialDO);
+            } else if (UPDATE.validate(req.getDuplicateCode(), row.getEncoding(), existCode)) {
+                materialDO.setEncoding(row.getEncoding());
+                materialDO.setUpdateTime(LocalDateTime.now());
+                materialDO.setUpdateUser(UserContextHolder.getUserId());
+                updateByCodeList.add(materialDO);
+            } else {
+                //                materialDO.setId(idGenerator.generate());
+                insertList.add(materialDO);
+            }
+        }
+        doImportMaterial(insertList, updateByNameList, updateByCodeList);
+        RedisUtils.delete(CacheConstants.DATA_IMPORT_KEY + req.getImportKey());
+        int insertCount = insertList.size();
+        int updateByNameCount = updateByNameList.size();
+        int updateByCodeCount = updateByCodeList.size();
+        int totalUpdateCount = updateByNameCount + updateByCodeCount;
+        int totalHandleCount = insertCount + totalUpdateCount;
+        return new MaterialInfoImportResp(totalHandleCount,  // 总处理数
+            insertCount,       // 新增数
+            totalUpdateCount   // 更新总数
+        );
+    }
+
+    /**
+     * 按指定数据集获取数据库已存在的数量
+     *
+     * @param materialRowList 导入的数据源
+     * @param rowField        导入数据的字段
+     * @param dbField         对比数据库的字段
+     * @return 存在的数量
+     */
+    private int countExistByField(List<MaterialImportRowReq> materialRowList,
+                                  Function<MaterialImportRowReq, String> rowField,
+                                  SFunction<MaterialInfoDO, ?> dbField,
+                                  boolean fieldEncrypt) {
+        List<String> fieldValues = materialRowList.stream().map(rowField).filter(Objects::nonNull).toList();
+        if (fieldValues.isEmpty()) {
+            return 0;
+        }
+        return (int)this.count(Wrappers.<MaterialInfoDO>lambdaQuery()
+            .in(dbField, fieldEncrypt ? SecureUtils.encryptFieldByAes(fieldValues) : fieldValues));
+    }
+
+    /**
+     * 过滤无效的导入用户数据（批量导入不严格校验数据）
+     *
+     * @param importRowList 导入数据
+     */
+    private List<MaterialImportRowReq> filterImportData(List<MaterialImportRowReq> importRowList) {
+        // 校验过滤
+        List<MaterialImportRowReq> list = importRowList.stream()
+            .filter(row -> ValidationUtil.validate(row).isEmpty())
+            .toList();
+        // 物料名去重
+        return list.stream()
+            .collect(Collectors.toMap(MaterialImportRowReq::getMaterialName, row -> row, (existing,
+                                                                                          replacement) -> existing))
+            .values()
+            .stream()
+            .toList();
+    }
+
+    /**
+     * 按指定数据集获取数据库已存在内容
+     *
+     * @param materialRowList 导入的数据源
+     * @param rowField        导入数据的字段
+     * @param dbField         对比数据库的字段
+     * @return 存在的内容
+     */
+    private List<String> listExistByField(List<MaterialImportRowReq> materialRowList,
+                                          Function<MaterialImportRowReq, String> rowField,
+                                          SFunction<MaterialInfoDO, String> dbField) {
+        List<String> fieldValues = materialRowList.stream().map(rowField).filter(Objects::nonNull).toList();
+        if (fieldValues.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<MaterialInfoDO> materialDOList = baseMapper.selectList(Wrappers.<MaterialInfoDO>lambdaQuery()
+            .in(dbField, fieldValues)
+            .select(dbField));
+        return materialDOList.stream().map(dbField).filter(Objects::nonNull).toList();
+    }
+
+    /**
+     * 判断是否退出导入
+     *
+     * @param req       导入参数
+     * @param list      导入数据
+     * @param existName 导入数据中已存在的物料名
+     * @param existCode 导入数据中已存在的物料编号
+     * @return 是否退出
+     */
+    private boolean isExitImportMaterial(MaterialInfoImportReq req,
+                                         List<MaterialImportRowReq> list,
+                                         List<String> existName,
+                                         List<String> existCode) {
+        return list.stream()
+            .anyMatch(row -> EXIT.validate(req.getDuplicateName(), row.getMaterialName(), existName) || EXIT
+                .validate(req.getDuplicateCode(), row.getEncoding(), existCode));
+    }
+
+    /**
+     * 判断是否跳过导入
+     *
+     * @param req       导入参数
+     * @param row       导入数据
+     * @param existName 导入数据中已存在的物料名称
+     * @param existCode 导入数据中已存在的物料编号
+     * @return 是否跳过
+     */
+    private boolean isSkipMaterialImport(MaterialInfoImportReq req,
+                                         MaterialImportRowReq row,
+                                         List<String> existName,
+                                         List<String> existCode) {
+        return SKIP.validate(req.getDuplicateName(), row.getMaterialName(), existName) || SKIP.validate(req
+            .getDuplicateCode(), row.getEncoding(), existCode);
+    }
+
+    /**
+     * 导入用户
+     *
+     * @param insertList       新增用户
+     * @param updateByNameList 修改用户
+     * @param updateByCodeList 用户角色关联
+     */
+    private void doImportMaterial(List<MaterialInfoDO> insertList,
+                                  List<MaterialInfoDO> updateByNameList,
+                                  List<MaterialInfoDO> updateByCodeList) {
+        if (CollUtil.isNotEmpty(insertList)) {
+            baseMapper.insertBatch(insertList);
+        }
+        if (CollUtil.isNotEmpty(updateByNameList)) {
+            baseMapper.updateByName(updateByNameList);
+        }
+        if (CollUtil.isNotEmpty(updateByCodeList)) {
+            baseMapper.updateByCode(updateByCodeList);
+        }
+    }
+
+    @Override
+    public void uploadMaterialPhotos(MultipartFile zipFile) {
+        // 1. 初始化物料编码-照片地址Map
+        Map<String, String> codeUrlMap = new HashMap<>();
+        // 物料照片存储路径（自定义，比如按日期分目录）
+        String photoStoragePath = "/" + DateUtil.today() + "/";
+
+        try (ZipInputStream zipInputStream = new ZipInputStream(zipFile.getInputStream())) {
+            ZipEntry zipEntry;
+            while ((zipEntry = zipInputStream.getNextEntry()) != null) {
+                // 跳过目录、非图片文件
+                if (zipEntry.isDirectory() || !isImageFile(zipEntry.getName())) {
+                    zipInputStream.closeEntry();
+                    continue;
+                }
+                // 2. 提取物料编码（照片名 = 物料编码，去掉后缀）
+                String fileName = zipEntry.getName();
+                log.info("正在处理的照片:" + fileName);
+                //去除windows或linux环境下 可能存在的多层级目录
+                if (fileName.contains("/")) {
+                    fileName = fileName.substring(fileName.lastIndexOf("/") + 1);
+                }
+                if (fileName.contains("\\")) {
+                    fileName = fileName.substring(fileName.lastIndexOf("\\") + 1);
+                }
+                String materialCode = fileName.substring(0, fileName.lastIndexOf("."));
+                // 3. 读取ZIP中的图片为BufferedImage
+                BufferedImage image = ImageIO.read(zipInputStream);
+                if (ObjectUtil.isEmpty(image)) {
+                    log.warn("无法读取图片: {}", fileName);
+                    zipInputStream.closeEntry();
+                    continue;
+                }
+                // 4. 将BufferedImage转为字节流
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                String imageExt = getImageExtension(fileName);
+                ImageIO.write(image, imageExt, baos);
+                byte[] imageBytes = baos.toByteArray();
+
+                // 5. 转换为MultipartFile（使用MockMultipartFile）
+                MultipartFile singleImageFile = new MockMultipartFile("file", fileName, "image/" + (imageExt
+                    .equals("jpg") ? "jpeg" : imageExt), imageBytes);
+
+                // 6. 调用upload方法上传图片
+                FileInfo fileInfo = fileService.upload(singleImageFile, photoStoragePath, null, true, true);
+
+                // 7. 将物料编码和图片URL存入Map
+                codeUrlMap.put(materialCode, fileInfo.getUrl());
+
+                zipInputStream.closeEntry();
+            }
+            setPhotosByCode(codeUrlMap);
+        } catch (Exception e) {
+            throw new BusinessException("照片批量导入失败：" + e.getMessage());
+        }
+    }
+
+    private boolean isImageFile(String fileName) {
+        if (fileName == null || !fileName.contains("."))
+            return false;
+        String ext = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
+        return IMAGE_EXTENSIONS.contains(ext);
+    }
+
+    private String getImageExtension(String fileName) {
+        String ext = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
+        return "jpeg".equals(ext) ? "jpg" : ext;
+    }
+
+    private void setPhotosByCode(Map<String, String> codeUrlMap) {
+        CheckUtils.throwIfEmpty(codeUrlMap, "照片为空，请重新上传");
+        List<MaterialInfoDO> existList = baseMapper.selectList(Wrappers.<MaterialInfoDO>lambdaQuery()
+            .in(MaterialInfoDO::getEncoding, codeUrlMap.keySet()));
+        if (existList.isEmpty()) {
+            log.warn("未找到任何匹配的物料编码");
+            return;
+        }
+        List<MaterialInfoDO> updateList = existList.stream().map(exist -> {
+            MaterialInfoDO updateDO = new MaterialInfoDO();
+            updateDO.setId(exist.getId());
+            updateDO.setPhotoUrl(codeUrlMap.get(exist.getEncoding()));
+            return updateDO;
+        }).collect(Collectors.toList());
+        if (!updateList.isEmpty()) {
+            baseMapper.updateBatchById(updateList);
+            log.info("成功更新 {} 个物料的照片", updateList.size());
+        }
+
+        //记录未找到的物料编码（可选，方便排查问题）
+        Set<String> existCodes = existList.stream().map(MaterialInfoDO::getEncoding).collect(Collectors.toSet());
+
+        codeUrlMap.keySet()
+            .stream()
+            .filter(code -> !existCodes.contains(code))
+            .forEach(code -> log.warn("物料编码 [{}] 不存在，照片更新失败", code));
+    }
+
+    @Override
+    public String catchPhoto(MultipartFile file) {
+        String photoStoragePath = "catch" + DateUtil.today() + "/";
+        FileInfo fileInfo = fileService.upload(file, photoStoragePath, null, true, true);
+        CheckUtils.throwIfNull(fileInfo, "照片上传失败");
+        return fileInfo.getUrl();
+    }
+
 }
--- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RuleRelationMapper.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RuleRelationMapper.java
@@ -1,18 +0,0 @@
-package top.wms.admin.system.mapper;
-
-import org.springframework.stereotype.Repository;
-import top.continew.starter.data.mp.base.BaseMapper;
-import top.wms.admin.system.model.entity.RuleRelationDO;
-
-/**
- * 通行规则-设备关联 Mapper
- *
- * @author zc
- * @since 2025/12/22 17:16
- */
-@Repository
-public interface RuleRelationMapper extends BaseMapper<RuleRelationDO> {
-
-    int deleteByRuleId(RuleRelationDO ruleRelation);
-
-}
--- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserMapper.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserMapper.java
@@ -94,4 +94,13 @@ public interface UserMapper extends DataPermissionMapper<UserDO> {
     * @return 用户数量
     */
    Long selectCountByPhone(@FieldEncrypt @Param("phone") String phone, @Param("id") Long id);
+
+    /**
+     * 根据卡片号查询
+     *
+     * @param card 卡片号
+     * @return 用户信息
+     */
+    @Select("SELECT * FROM sys_user WHERE card_no = #{card}")
+    UserDO selectByCard(@Param("card") String card);
 }
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RuleRelationDO.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RuleRelationDO.java
@@ -1,37 +0,0 @@
-package top.wms.admin.system.model.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 通行规则-设备关联实体
- *
- * @author zc
- * @since 2025/12/22 17:16
- */
-@Data
-@TableName("equipment_rule_relation")
-public class RuleRelationDO implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 平台侧规则ID（关联规则表主键）
-     */
-    private Long ruleId;
-
-    /**
-     * 设备ID（关联设备表主键）
-     */
-    private Long equipmentId;
-
-    /**
-     * 设备侧的规则ID（设备本地存储的规则标识）
-     */
-    private String equipmentRuleId;
-
-}
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserDO.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserDO.java
@@ -38,7 +38,6 @@ public class UserDO extends BaseDO {
    //    @FieldEncrypt(encryptor = BCryptEncryptor.class)
    private String password;

-
    /*
    * 卡号
    * */
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RuleRelationReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RuleRelationReq.java
@@ -1,52 +0,0 @@
-package top.wms.admin.system.model.req;
-
-import jakarta.validation.constraints.*;
-
-import lombok.Data;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import org.hibernate.validator.constraints.Length;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 创建或修改通行规则-设备关联参数
- *
- * @author zc
- * @since 2025/12/22 17:16
- */
-@Data
-@Schema(description = "创建或修改通行规则-设备关联参数")
-public class RuleRelationReq implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 平台侧规则ID（关联规则表主键）
-     */
-    @Schema(description = "平台侧规则ID（关联规则表主键）")
-    @NotNull(message = "平台侧规则ID（关联规则表主键）不能为空")
-    private Long ruleId;
-
-    /**
-     * 设备ID（关联设备表主键）
-     */
-    @Schema(description = "设备ID（关联设备表主键）")
-    @NotNull(message = "设备ID（关联设备表主键）不能为空")
-    private Long equipmentId;
-
-    /**
-     * 设备侧的规则ID（设备本地存储的规则标识）
-     */
-    @Schema(description = "设备侧的规则ID（设备本地存储的规则标识）")
-    @NotBlank(message = "设备侧的规则ID（设备本地存储的规则标识）不能为空")
-    @Length(max = 64, message = "设备侧的规则ID（设备本地存储的规则标识）长度不能超过 {max} 个字符")
-    private String equipmentRuleId;
-
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-}
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserBasicInfoUpdateReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserBasicInfoUpdateReq.java
@@ -25,12 +25,12 @@ public class UserBasicInfoUpdateReq implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
-     * 昵称
+     * 用户名
     */
-    @Schema(description = "昵称", example = "张三")
-    @NotBlank(message = "昵称不能为空")
+    @Schema(description = "用户名", example = "张三")
+    @NotBlank(message = "用户名不能为空")
    @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "昵称长度为 2-30 个字符，支持中文、字母、数字、下划线，短横线")
-    private String nickname;
+    private String userName;

    /**
     * 性别
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserReq.java
@@ -38,7 +38,6 @@ public class UserReq implements Serializable {
    @Pattern(regexp = RegexConstants.USERNAME, message = "用户名长度为 4-64 个字符，支持大小写字母、数字、下划线，以字母开头")
    private String username;

-
    /**
     * 密码（加密）
     */
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserDetailResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserDetailResp.java
@@ -1,10 +1,6 @@
 package top.wms.admin.system.model.resp.user;

 import cn.crane4j.annotation.Assemble;
-import cn.crane4j.annotation.AssembleMethod;
-import cn.crane4j.annotation.ContainerMethod;
-import cn.crane4j.annotation.Mapping;
-import cn.crane4j.annotation.condition.ConditionOnExpression;
 import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -15,8 +11,6 @@ import top.wms.admin.common.constant.ContainerConstants;
 import top.wms.admin.common.context.UserContextHolder;
 import top.wms.admin.common.enums.DisEnableStatusEnum;
 import top.wms.admin.common.enums.GenderEnum;
-import top.wms.admin.system.model.resp.DeptResp;
-import top.wms.admin.system.service.DeptService;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
 import top.continew.starter.file.excel.converter.ExcelListConverter;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;
@@ -48,13 +42,6 @@ public class UserDetailResp extends BaseDetailResp {
    @ExcelProperty(value = "用户名", order = 2)
    private String username;

-    /**
-     * 昵称
-     */
-    @Schema(description = "昵称", example = "张三")
-    @ExcelProperty(value = "昵称", order = 3)
-    private String nickname;
-
    /**
     * 状态
     */
@@ -69,22 +56,6 @@ public class UserDetailResp extends BaseDetailResp {
    @ExcelProperty(value = "性别", converter = ExcelBaseEnumConverter.class, order = 5)
    private GenderEnum gender;

-    /**
-     * 部门 ID
-     */
-    @Schema(description = "部门 ID", example = "5")
-    @ConditionOnExpression("#target.deptName == null")
-    @AssembleMethod(props = @Mapping(src = "name", ref = "deptName"), targetType = DeptService.class, method = @ContainerMethod(bindMethod = "get", resultType = DeptResp.class))
-    @ExcelProperty(value = "部门 ID", order = 6)
-    private Long deptId;
-
-    /**
-     * 所属部门
-     */
-    @Schema(description = "所属部门", example = "测试部")
-    @ExcelProperty(value = "所属部门", order = 7)
-    private String deptName;
-
    /**
     * 角色 ID 列表
     */
@@ -112,14 +83,6 @@ public class UserDetailResp extends BaseDetailResp {
    @ExcelProperty(value = "卡号", order = 11)
    private String cardNo;

-    /**
-     * 邮箱
-     */
-    @Schema(description = "邮箱", example = "123456789@qq.com")
-    @ExcelProperty(value = "邮箱", order = 12)
-    @FieldEncrypt
-    private String email;
-
    /**
     * 是否为系统内置数据
     */
--- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserResp.java
@@ -1,12 +1,10 @@
 package top.wms.admin.system.model.resp.user;

 import cn.crane4j.annotation.Assemble;
-import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.Value;
 import top.wms.admin.common.model.resp.BaseDetailResp;
 import top.wms.admin.common.constant.ContainerConstants;
 import top.wms.admin.common.context.UserContextHolder;
@@ -40,18 +38,10 @@ public class UserResp extends BaseDetailResp {
    @ExcelProperty(value = "用户名")
    private String username;

-
    @Schema(description = "卡号")
    @ExcelProperty(value = "卡号")
    private String cardNo;

-    /**
-     * 昵称
-     */
-    @Schema(description = "昵称", example = "张三")
-    @ExcelIgnore
-    private String nickname;
-
    /**
     * 性别
     */
@@ -65,14 +55,6 @@ public class UserResp extends BaseDetailResp {
    @ExcelIgnore
    private String avatar;

-    /**
-     * 邮箱
-     */
-    @Schema(description = "邮箱", example = "c*******@126.com")
-    @JsonMask(MaskType.EMAIL)
-    @ExcelIgnore
-    private String email;
-
    /**
     * 手机号码
     */
@@ -99,27 +81,6 @@ public class UserResp extends BaseDetailResp {
    @Schema(description = "描述", example = "张三描述信息")
    private String description;

-    /**
-     * 部门 ID
-     */
-    @Schema(description = "部门 ID", example = "5")
-    @ExcelIgnore
-    private Long deptId;
-
-    /**
-     * 所属部门
-     */
-    @Schema(description = "所属部门", example = "测试部")
-    @ExcelIgnore
-    private String deptName;
-
-    /**
-     * 角色 ID 列表
-     */
-    @Schema(description = "角色 ID 列表", example = "2")
-    @Assemble(prop = ":roleNames", container = ContainerConstants.USER_ROLE_NAME_LIST, handlerType = ManyToManyAssembleOperationHandler.class)
-    private List<Long> roleIds;
-
    /**
     * 角色名称列表
     */
--- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DeptServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DeptServiceImpl.java
@@ -24,7 +24,6 @@ import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;

 /**
 * 部门业务实现
@@ -87,17 +86,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptRes

    @Override
    public void beforeDelete(List<Long> ids) {
-        List<DeptDO> list = baseMapper.lambdaQuery()
-            .select(DeptDO::getName, DeptDO::getIsSystem)
-            .in(DeptDO::getId, ids)
-            .list();
-        Optional<DeptDO> isSystemData = list.stream().filter(DeptDO::getIsSystem).findFirst();
-        CheckUtils.throwIf(isSystemData::isPresent, "所选部门 [{}] 是系统内置部门，不允许删除", isSystemData.orElseGet(DeptDO::new)
-            .getName());
-        CheckUtils.throwIf(this.countChildren(ids) > 0, "所选部门存在下级部门，不允许删除");
-        CheckUtils.throwIf(userService.countByDeptIds(ids) > 0, "所选部门存在用户关联，请解除关联后重试");
-        // 删除角色和部门关联
-        roleDeptService.deleteByDeptIds(ids);
+
    }

    @Override
--- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java
@@ -100,13 +100,18 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
            }
        });
        // 处理本地存储文件 URL
-        FileInfo fileInfo = uploadPretreatment.upload();
-        String domain = StrUtil.appendIfMissing(storage.getDomain(), StringConstants.SLASH);
-        fileInfo.setUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getFilename()));
-        if (StrUtil.isNotBlank(fileInfo.getThFilename())) {
-            fileInfo.setThUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getThFilename()));
-        } else {
-            fileInfo.setThUrl(fileInfo.getUrl());
+        FileInfo fileInfo = null;
+        try {
+            fileInfo = uploadPretreatment.upload();
+            String domain = StrUtil.appendIfMissing(storage.getDomain(), StringConstants.SLASH);
+            fileInfo.setUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getFilename()));
+            if (StrUtil.isNotBlank(fileInfo.getThFilename())) {
+                fileInfo.setThUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getThFilename()));
+            } else {
+                fileInfo.setThUrl(fileInfo.getUrl());
+            }
+        } catch (Exception e) {
+
        }
        return fileInfo;
    }
@@ -146,4 +151,4 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
            fileResp.setStorageName("%s (%s)".formatted(storage.getName(), storage.getCode()));
        }
    }
-}
+}
--- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/PeopleEquipmentServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/PeopleEquipmentServiceImpl.java
@@ -1,23 +0,0 @@
-package top.wms.admin.system.service.impl;
-
-import lombok.RequiredArgsConstructor;
-
-import org.springframework.stereotype.Service;
-
-import top.continew.starter.extension.crud.service.BaseServiceImpl;
-import top.wms.admin.system.mapper.PeopleEquipmentMapper;
-import top.wms.admin.system.model.entity.PeopleEquipmentDO;
-import top.wms.admin.system.model.query.PeopleEquipmentQuery;
-import top.wms.admin.system.model.req.PeopleEquipmentReq;
-import top.wms.admin.system.model.resp.PeopleEquipmentResp;
-import top.wms.admin.system.service.PeopleEquipmentService;
-
-/**
- * 人员设备下发信息业务实现
- *
- * @author zc
- * @since 2025/03/27 14:59
- */
-@Service
-@RequiredArgsConstructor
-public class PeopleEquipmentServiceImpl extends BaseServiceImpl<PeopleEquipmentMapper, PeopleEquipmentDO, PeopleEquipmentResp, PeopleEquipmentResp, PeopleEquipmentQuery, PeopleEquipmentReq> implements PeopleEquipmentService {}
--- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserServiceImpl.java
@@ -36,6 +36,7 @@ import net.dreamlu.mica.core.result.R;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.dromara.x.file.storage.core.FileStorageService;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -131,6 +132,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
        CheckUtils.throwIf(StrUtil.isNotBlank(email) && this.isEmailExists(email, null), errorMsgTemplate, email);
        String phone = req.getPhone();
        CheckUtils.throwIf(StrUtil.isNotBlank(phone) && this.isPhoneExists(phone, null), errorMsgTemplate, phone);
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        req.setPassword("{bcrypt}" + encoder.encode(req.getPassword()));
    }

    @Override
@@ -158,10 +161,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
        UserDO oldUser = super.getById(id);
        if (Boolean.TRUE.equals(oldUser.getIsSystem())) {
            CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, newStatus, "[{}] 是系统内置用户，不允许禁用", oldUser
-                .getNickname());
+                .getUsername());
            Collection<Long> disjunctionRoleIds = CollUtil.disjunction(req.getRoleIds(), userRoleService
                .listRoleIdByUserId(id));
-            CheckUtils.throwIfNotEmpty(disjunctionRoleIds, "[{}] 是系统内置用户，不允许变更角色", oldUser.getNickname());
+            CheckUtils.throwIfNotEmpty(disjunctionRoleIds, "[{}] 是系统内置用户，不允许变更角色", oldUser.getUsername());
        }
        // 更新信息
        UserDO newUser = BeanUtil.toBean(req, UserDO.class);
@@ -186,12 +189,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
    public void delete(List<Long> ids) {
        CheckUtils.throwIf(CollUtil.contains(ids, UserContextHolder.getUserId()), "不允许删除当前用户");
        List<UserDO> list = baseMapper.lambdaQuery()
-            .select(UserDO::getNickname, UserDO::getIsSystem)
+            .select(UserDO::getUsername, UserDO::getIsSystem)
            .in(UserDO::getId, ids)
            .list();
        Optional<UserDO> isSystemData = list.stream().filter(UserDO::getIsSystem).findFirst();
        CheckUtils.throwIf(isSystemData::isPresent, "所选用户 [{}] 是系统内置用户，不允许删除", isSystemData.orElseGet(UserDO::new)
-            .getNickname());
+            .getUsername());
        // 删除用户和角色关联
        userRoleService.deleteByUserIds(ids);
        // 删除历史密码
@@ -335,7 +338,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
            userDO.setStatus(req.getDefaultStatus());
            userDO.setPwdResetTime(LocalDateTime.now());
            userDO.setGender(EnumUtil.getBy(GenderEnum::getDescription, row.getGender(), GenderEnum.UNKNOWN));
-            userDO.setDeptId(deptMap.get(row.getDeptName()));
            // 修改 or 新增
            if (UPDATE.validate(req.getDuplicateUser(), row.getUsername(), existUsernames)) {
                userDO.setId(userMap.get(row.getUsername()));
@@ -396,7 +398,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
    public void updateBasicInfo(UserBasicInfoUpdateReq req, Long id) {
        super.getById(id);
        baseMapper.lambdaUpdate()
-            .set(UserDO::getNickname, req.getNickname())
+            .set(UserDO::getUsername, req.getUserName())
            .set(UserDO::getGender, req.getGender())
            .eq(UserDO::getId, id)
            .update();
@@ -462,15 +464,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes

    @Override
    public UserDO getByCard(String card) {
-        return baseMapper.selectOne(new QueryWrapper<UserDO>().eq("card_no", card));
+        return baseMapper.selectByCard(card);
    }

    @Override
    public Long countByDeptIds(List<Long> deptIds) {
-        if (CollUtil.isEmpty(deptIds)) {
-            return 0L;
-        }
-        return baseMapper.lambdaQuery().in(UserDO::getDeptId, deptIds).count();
+        return 0L;
    }

    @Override
@@ -742,6 +741,4 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
        return null == userDO ? "" : userDO.getUsername();
    }

-
-
 }
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderInfoMapper.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderInfoMapper.java
@@ -0,0 +1,16 @@
+package top.wms.admin.weighManage.mapper;
+
+import top.continew.starter.data.mp.base.BaseMapper;
+import org.springframework.stereotype.Repository;
+import top.wms.admin.weighManage.model.entity.WorkOrderInfoDO;
+
+/**
+ * 任务工单详情 Mapper
+ *
+ * @author zc
+ * @since 2026/03/04 14:16
+ */
+@Repository
+public interface WorkOrderInfoMapper extends BaseMapper<WorkOrderInfoDO> {
+
+}
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderMapper.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderMapper.java
@@ -0,0 +1,43 @@
+package top.wms.admin.weighManage.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import top.continew.starter.data.mp.base.BaseMapper;
+import top.wms.admin.weighManage.model.entity.WorkOrderDO;
+import org.springframework.stereotype.Repository;
+import top.wms.admin.weighManage.model.resp.WorkOrderInfoResp;
+import top.wms.admin.weighManage.model.resp.WorkOrderResp;
+
+import java.util.List;
+
+/**
+ * 任务工单信息 Mapper
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Repository
+public interface WorkOrderMapper extends BaseMapper<WorkOrderDO> {
+
+    /**
+     * 获取任务工单分页列表
+     *
+     * @param objectPage   分页参数
+     * @param queryWrapper 查询参数
+     * @return 任务工单分页列表
+     */
+    IPage<WorkOrderResp> selectWorkOrderPage(@Param("page") Page<Object> objectPage,
+                                             @Param(Constants.WRAPPER) QueryWrapper<WorkOrderDO> queryWrapper);
+
+    /**
+     * 获取任务工单详情信息
+     *
+     * @param id 任务工单主键id
+     * @return 任务工单详情信息
+     */
+    List<WorkOrderInfoResp> getDetail(Long id);
+
+}
--- 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
@@ -0,0 +1,50 @@
+package top.wms.admin.weighManage.model.entity;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import top.wms.admin.common.model.entity.BaseDO;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 任务工单信息实体
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Data
+@TableName("sys_work_order")
+public class WorkOrderDO extends BaseDO {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 任务工单号
+     */
+    private String orderNo;
+
+    /**
+     * 物料主键id
+     */
+    private Long materialId;
+
+    /**
+     * 总重量
+     */
+    private BigDecimal totalWeight;
+
+    /**
+     * 总数量
+     */
+    private Integer totalCount;
+
+}
--- 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
@@ -0,0 +1,59 @@
+package top.wms.admin.weighManage.model.entity;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import top.wms.admin.common.model.entity.BaseDO;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 任务工单详情实体
+ *
+ * @author zc
+ * @since 2026/03/04 14:16
+ */
+@Data
+@TableName("sys_work_order_info")
+public class WorkOrderInfoDO extends BaseDO {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工单主键id
+     */
+    private Long workOrderId;
+
+    /**
+     * 物料主键id
+     */
+    private Long materialId;
+
+    /**
+     * 称重次数
+     */
+    private int weightTime;
+
+    /**
+     * 抓拍的图片
+     */
+    private String imgUrl;
+
+    /**
+     * 物料数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 称重重量
+     */
+    private BigDecimal weight;
+
+    /**
+     * 计算重量
+     */
+    private BigDecimal calculatedWeight;
+}
--- 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
@@ -0,0 +1,66 @@
+package top.wms.admin.weighManage.model.query;
+
+import lombok.Data;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.*;
+import java.util.Date;
+
+/**
+ * 任务工单信息查询条件
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Data
+@Schema(description = "任务工单信息查询条件")
+public class WorkOrderQuery implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务工单号
+     */
+    @Schema(description = "任务工单号")
+    private String orderNo;
+
+    /**
+     * 物料名称
+     */
+    @Schema(description = "物料名称")
+    private String materialName;
+
+    /**
+     * 物料编码
+     */
+    @Schema(description = "物料编码")
+    private String encoding;
+
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    private String userName;
+
+    /**
+     * 卡号
+     */
+    @Schema(description = "卡号")
+    private String carNo;
+
+    /**
+     * 创建开始时间
+     */
+    @Schema(description = "创建开始时间")
+    private Date startTime;
+
+    /**
+     * 创建结束时间
+     */
+    @Schema(description = "创建结束时间")
+    private Date endTime;
+}
--- 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
@@ -0,0 +1,68 @@
+package top.wms.admin.weighManage.model.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import jakarta.validation.constraints.*;
+
+/**
+ * 创建或修改任务工单信息参数
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Data
+@Schema(description = "创建或修改任务工单信息参数")
+public class WorkOrderInfoReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工单主键id
+     */
+    @Schema(description = "工单主键id")
+    private Long workOrderId;
+
+    /**
+     * 物料主键id
+     */
+    @Schema(description = "物料主键id")
+    @NotNull(message = "物料主键id不能为空")
+    private Long materialId;
+
+    /**
+     * 称重次数
+     */
+    @Schema(description = "称重次数")
+    private Integer weightTime;
+
+    /**
+     * 物料数量
+     */
+    @Schema(description = "物料数量")
+    private Integer quantity;
+
+    /**
+     * 称重重量
+     */
+    @Schema(description = "称重重量")
+    private BigDecimal weight;
+
+    /**
+     * 计算重量
+     */
+    @Schema(description = "计算重量")
+    private BigDecimal calculatedWeight;
+
+    /**
+     * 抓拍的图片
+     */
+    @Schema(description = "抓拍的图片")
+    private String imgUrl;
+
+}
--- 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
@@ -0,0 +1,57 @@
+package top.wms.admin.weighManage.model.req;
+
+import jakarta.validation.constraints.*;
+
+import lombok.Data;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 创建或修改任务工单信息参数
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Data
+@Schema(description = "创建或修改任务工单信息参数")
+public class WorkOrderReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料主键id
+     */
+    @Schema(description = "物料主键id")
+    @NotNull(message = "物料主键id不能为空")
+    private Long materialId;
+
+    /**
+     * 物料名称
+     */
+    @Schema(description = "物料名称")
+    @NotBlank(message = "物料名称不能为空")
+    private String materialName;
+
+    /**
+     * 称重列表
+     */
+    @Schema(description = "称重列表")
+    @NotEmpty(message = "称重列表不能为空")
+    private List<WorkOrderInfoReq> workOrderInfos;
+
+    /**
+     * 手动填写的物料数量
+     */
+    private String inputQuantity;
+
+    /**
+     * 电子秤重量
+     */
+    private String ahDeviceWeight;
+
+}
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/MaterialResp.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/MaterialResp.java
@@ -1,15 +0,0 @@
-package top.wms.admin.weighManage.model.resp;
-
-
-import lombok.Data;
-
-@Data
-public class MaterialResp {
-    private Long id;
-    private String materialCode;
-    private String materialName;
-    private String materialSpec;
-    private String weight;
-    private String imageUrl;
-
-}
--- 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
@@ -0,0 +1,72 @@
+package top.wms.admin.weighManage.model.resp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 任务工单详情信息
+ *
+ * @author zc
+ * @since 2026/03/04 14:21
+ */
+@Data
+@Schema(description = "任务工单详情信息")
+public class WorkOrderInfoResp {
+
+    /**
+     * 主键id
+     */
+    @Schema(description = "主键id")
+    private Long id;
+
+    /**
+     * 工单主键id
+     */
+    @Schema(description = "工单主键id")
+    private Long workOrderId;
+
+    /**
+     * 物料主键id
+     */
+    @Schema(description = "物料主键id")
+    private Long materialId;
+
+    /**
+     * 物料主键id
+     */
+    @Schema(description = "物料主键id")
+    private String materialName;
+
+    /**
+     * 称重次数
+     */
+    @Schema(description = "称重次数")
+    private int weightTime;
+
+    /**
+     * 物料数量
+     */
+    @Schema(description = "物料数量")
+    private BigDecimal quantity;
+
+    /**
+     * 称重重量
+     */
+    @Schema(description = "称重重量")
+    private BigDecimal weight;
+
+    /**
+     * 计算重量
+     */
+    @Schema(description = "计算重量")
+    private BigDecimal calculatedWeight;
+
+    /**
+     * 抓拍的图片
+     */
+    @Schema(description = "抓拍的图片")
+    private String imgUrl;
+
+}
--- 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
@@ -0,0 +1,105 @@
+package top.wms.admin.weighManage.model.resp;
+
+import lombok.Data;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import top.wms.admin.common.model.resp.BaseDetailResp;
+
+import java.io.Serial;
+import java.time.*;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 任务工单信息信息
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Data
+@Schema(description = "任务工单信息信息")
+public class WorkOrderResp extends BaseDetailResp {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 卡号
+     */
+    @Schema(description = "卡号")
+    private String cardNo;
+
+    /**
+     * 工单编号
+     */
+    @Schema(description = "工单编号")
+    private String orderNo;
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+    /**
+     * 物料主键id
+     */
+    @Schema(description = "物料主键id")
+    private Long materialId;
+
+    /**
+     * 物料名称
+     */
+    @Schema(description = "物料名称")
+    private String materialName;
+
+    /**
+     * 物料编码
+     */
+    @Schema(description = "物料编码")
+    private String encoding;
+
+    /**
+     * 物料单位重量
+     */
+    @Schema(description = "物料单位重量")
+    private BigDecimal unitWeight;
+
+    /**
+     * 物料规格
+     */
+    @Schema(description = "物料规格")
+    private String materialSpec;
+
+    /**
+     * 物料图片
+     */
+    @Schema(description = "物料图片")
+    private String photoUrl;
+
+    /**
+     * 计算总重量（标重）
+     */
+    @Schema(description = "计算总重量（标重）")
+    private BigDecimal totalCalculatedWeight;
+
+    /**
+     * 实际总重量
+     */
+    @Schema(description = "实际总重量")
+    private BigDecimal totalWeight;
+
+    /**
+     * 总数量
+     */
+    @Schema(description = "总数量")
+    private int totalCount;
+
+    /**
+     * 任务工单详情信息列表
+     */
+    @Schema(description = "任务工单详情信息列表")
+    private List<WorkOrderInfoResp> workOrderInfos;
+
+}
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/WorkOrderService.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/WorkOrderService.java
@@ -0,0 +1,50 @@
+package top.wms.admin.weighManage.service;
+
+import top.continew.starter.extension.crud.service.BaseService;
+import top.wms.admin.weighManage.model.query.WorkOrderQuery;
+import top.wms.admin.weighManage.model.req.WorkOrderReq;
+import top.wms.admin.weighManage.model.resp.WorkOrderInfoResp;
+import top.wms.admin.weighManage.model.resp.WorkOrderResp;
+
+import java.util.List;
+
+/**
+ * 任务工单信息业务接口
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+public interface WorkOrderService extends BaseService<WorkOrderResp, WorkOrderResp, WorkOrderQuery, WorkOrderReq> {
+
+    /**
+     * 获取任务工单详情信息
+     *
+     * @param id 任务工单主键id
+     * @return 任务工单详情信息
+     */
+    WorkOrderResp getDetail(Long id);
+
+    /**
+     * 创建任务工单
+     *
+     * @param req 创建任务工单参数
+     * @return 任务工单信息
+     */
+    WorkOrderResp addWorKerOrder(WorkOrderReq req);
+
+    /**
+     * 获取任务工单详情信息
+     *
+     * @param id 任务工单主键id
+     * @return 任务工单详情信息
+     */
+    List<WorkOrderInfoResp> getWorkOrderInfos(Long id);
+
+    /**
+     * 校验物料数量和重量是否匹配
+     * 
+     * @param req
+     * @return
+     */
+    int validateWeighing(WorkOrderReq req);
+}
--- 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
@@ -0,0 +1,166 @@
+package top.wms.admin.weighManage.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import top.continew.starter.extension.crud.model.query.PageQuery;
+import top.continew.starter.extension.crud.model.resp.PageResp;
+import top.continew.starter.extension.crud.service.BaseServiceImpl;
+import top.wms.admin.common.context.UserContextHolder;
+import top.wms.admin.material.mapper.MaterialInfoMapper;
+import top.wms.admin.material.model.entity.MaterialInfoDO;
+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;
+import top.wms.admin.weighManage.model.entity.WorkOrderInfoDO;
+import top.wms.admin.weighManage.model.query.WorkOrderQuery;
+import top.wms.admin.weighManage.model.req.WorkOrderInfoReq;
+import top.wms.admin.weighManage.model.req.WorkOrderReq;
+import top.wms.admin.weighManage.model.resp.WorkOrderInfoResp;
+import top.wms.admin.weighManage.model.resp.WorkOrderResp;
+import top.wms.admin.weighManage.service.WorkOrderService;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务工单信息业务实现
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkOrderDO, WorkOrderResp, WorkOrderResp, WorkOrderQuery, WorkOrderReq> implements WorkOrderService {
+
+    private final WorkOrderInfoMapper workOrderInfoMapper;
+
+    private final MaterialInfoMapper materialInfoMapper;
+
+    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());
+        this.sort(queryWrapper, pageQuery);
+
+        IPage<WorkOrderResp> page = baseMapper.selectWorkOrderPage(new Page<>(pageQuery.getPage(), pageQuery
+            .getSize()), queryWrapper);
+
+        return PageResp.build(page);
+    }
+
+    @Override
+    public WorkOrderResp getDetail(Long id) {
+        WorkOrderDO workOrderDO = baseMapper.selectById(id);
+        WorkOrderResp workOrderResp = BeanUtil.copyProperties(workOrderDO, WorkOrderResp.class);
+        if (null != workOrderDO.getMaterialId()) {
+            MaterialInfoDO materialInfoDO = materialInfoMapper.selectById(workOrderDO.getMaterialId());
+            workOrderResp.setMaterialName(materialInfoDO.getMaterialName());
+            workOrderResp.setEncoding(materialInfoDO.getEncoding());
+        }
+
+        List<WorkOrderInfoDO> workOrderInfos = workOrderInfoMapper.selectList(new QueryWrapper<WorkOrderInfoDO>()
+            .eq("work_order_id", id));
+        if (CollUtil.isNotEmpty(workOrderInfos)) {
+            BigDecimal bigDecimal = new BigDecimal("0");
+            for (WorkOrderInfoDO workOrderInfoDO : workOrderInfos) {
+                bigDecimal = bigDecimal.add(workOrderInfoDO.getCalculatedWeight());
+            }
+            workOrderResp.setTotalCalculatedWeight(bigDecimal);
+        }
+
+        return workOrderResp;
+    }
+
+    @Override
+    public List<WorkOrderInfoResp> getWorkOrderInfos(Long id) {
+        return baseMapper.getDetail(id);
+    }
+
+    @Override
+    public void afterDelete(List<Long> ids) {
+        workOrderInfoMapper.delete(new QueryWrapper<WorkOrderInfoDO>().in("work_order_id", ids));
+    }
+
+    @Override
+    public WorkOrderResp addWorKerOrder(WorkOrderReq req) {
+        if (CollUtil.isEmpty(req.getWorkOrderInfos())) {
+            throw new IllegalArgumentException("称重列表不能为空");
+        }
+
+        BigDecimal totalWeight = new BigDecimal("0");
+        int totalCount = 0;
+        for (WorkOrderInfoReq workOrderInfoReq : req.getWorkOrderInfos()) {
+            totalWeight = workOrderInfoReq.getWeight().add(totalWeight);
+            totalCount += workOrderInfoReq.getQuantity();
+        }
+
+        WorkOrderDO workOrder = new WorkOrderDO();
+        // 生成纯数字订单号：年月日时分秒 + 6位随机数
+        String timestamp = DateUtil.format(new Date(), "yyyyMMddHHmmss");
+        String randomNum = String.format("%06d", (int)(Math.random() * 1000000));
+        workOrder.setOrderNo(timestamp + randomNum);
+        String title = DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN) + "-" + UserContextHolder
+            .getUsername() + "-" + req.getMaterialName();
+        workOrder.setTitle(title);
+        workOrder.setMaterialId(req.getMaterialId());
+        workOrder.setTotalWeight(totalWeight);
+        workOrder.setTotalCount(totalCount);
+        baseMapper.insert(workOrder);
+
+        //新增工单详情列表信息
+        List<WorkOrderInfoDO> workOrderInfoDOList = BeanUtil.copyToList(req.getWorkOrderInfos(), WorkOrderInfoDO.class);
+        workOrderInfoDOList.forEach(workOrderInfoDO -> workOrderInfoDO.setWorkOrderId(workOrder.getId()));
+        workOrderInfoMapper.insertBatch(workOrderInfoDOList);
+
+        return BeanUtil.copyProperties(workOrder, WorkOrderResp.class);
+    }
+
+    @Override
+    public int validateWeighing(WorkOrderReq req) {
+        log.info("validateWeighing req:{}", req);
+        String configValue = configService.getConfigValue("weight_float_ratio");
+        BigDecimal weightFloat = new BigDecimal("0.06");
+        if (StrUtil.isNotBlank(configValue)) {
+            weightFloat = new BigDecimal(configValue);
+        }
+
+        //计算标准重量
+        MaterialInfoDO materialInfoDO = materialInfoMapper.selectById(req.getMaterialId());
+        BigDecimal standardWeight = materialInfoDO.getUnitWeight().subtract(new BigDecimal(req.getInputQuantity()));
+        BigDecimal electronicWeight = new BigDecimal(req.getAhDeviceWeight());
+
+        // 检查 electronicWeight 是否大于 standardWeight
+        if (electronicWeight.compareTo(standardWeight) <= 0) {
+            log.error("电子秤重量必须大于标准重量");
+            return 500; // 电子秤重量必须大于标准重量
+        }
+
+        // 计算比值：(electronicWeight - standardWeight) / standardWeight
+        BigDecimal weightDifference = electronicWeight.subtract(standardWeight);
+        BigDecimal ratio = weightDifference.divide(standardWeight, 4, BigDecimal.ROUND_HALF_UP);
+
+        // 检查比值是否超过 6%
+        if (ratio.compareTo(weightFloat) > 0) {
+            log.error("比值超过 6%，当前比值: {}", ratio);
+            return 500; // 比值超过 6%
+        }
+
+        return 200; // 验证通过
+    }
+
+}
--- a/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
+++ b/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
@@ -1,4 +1,52 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="top.wms.admin.material.mapper.MaterialInfoMapper">
+
+    <!-- 按物料名称批量更新 -->
+    <update id="updateByName">
+        <foreach collection="list" item="item" separator=";">
+            UPDATE sys_material_info
+            SET
+            <if test="item.encoding != null and item.encoding != ''" >
+                encoding = #{item.encoding},
+            </if>
+            <if test="item.unitWeight != null">
+                unit_weight = #{item.unitWeight},
+            </if>
+            <if test="item.materialSpec != null and item.materialSpec != ''">
+                material_spec = #{item.materialSpec},
+            </if>
+            <if test="item.updateTime != null">
+                update_time = NOW(),
+            </if>
+            <if test="item.updateUser != null and item.updateUser != ''">
+                update_user = #{item.updateUser}
+            </if>
+            WHERE material_name = #{item.materialName}
+        </foreach>
+    </update>
+
+    <update id="updateByCode">
+        <foreach collection="list" item="item" separator=";">
+            UPDATE sys_material_info
+            SET
+            <if test="item.materialName != null and item.materialName != ''">
+                material_name = #{item.materialName},
+            </if>
+            <if test="item.unitWeight != null">
+                unit_weight = #{item.unitWeight},
+            </if>
+            <if test="item.materialSpec != null and item.materialSpec != ''">
+                material_spec = #{item.materialSpec},
+            </if>
+            <if test="item.updateTime != null">
+                update_time = NOW(),
+            </if>
+            <if test="item.updateUser != null and item.updateUser != ''">
+                update_user = #{item.updateUser}
+            </if>
+            WHERE encoding = #{item.encoding}
+        </foreach>
+    </update>
+
 </mapper>
--- a/wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml
+++ b/wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="top.wms.admin.system.mapper.RuleRelationMapper">
-
-
-    <delete id="deleteByRuleId" parameterType="top.wms.admin.system.model.entity.RuleRelationDO">
-        DELETE FROM equipment_rule_relation
-        WHERE 1=1
-        <!-- 判空规则：字段不为 null 且 不为空字符串（兼容字符串/数字类型） -->
-        <if test="ruleId != null and ruleId != ''">
-            AND rule_id = #{ruleId}
-        </if>
-        <if test="equipmentId != null and equipmentId != ''">
-            AND equipment_id = #{equipmentId}
-        </if>
-        <if test="equipmentRuleId != null and equipmentRuleId != ''">
-            AND equipment_rule_id = #{equipmentRuleId}
-        </if>
-    </delete>
-
-</mapper>
--- a/wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml
+++ b/wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="top.wms.admin.weighManage.mapper.WorkOrderMapper">
+
+    <select id="selectWorkOrderPage" resultType="top.wms.admin.weighManage.model.resp.WorkOrderResp">
+        select
+            w.*,
+            m.material_name,
+            m.encoding,
+            m.photo_url,
+            m.unit_weight,
+            u.card_no,
+            u.username createUserString
+        from sys_work_order w
+            left join sys_material_info m on w.material_id = m.id
+            left join sys_user u on w.create_user = u.id
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="getDetail" resultType="top.wms.admin.weighManage.model.resp.WorkOrderInfoResp">
+        select
+            wi.*,
+            m.material_name
+        from sys_work_order_info wi
+            left join sys_material_info m on wi.material_id = m.id
+        where wi.work_order_id = #{id}
+    </select>
+
+</mapper>
--- a/wms-webapi/.flattened-pom.xml
+++ b/wms-webapi/.flattened-pom.xml
@@ -53,6 +53,23 @@
      <artifactId>aws-java-sdk-s3</artifactId>
      <version>1.12.780</version>
    </dependency>
+    <dependency>
+      <groupId>com.fazecast</groupId>
+      <artifactId>jSerialComm</artifactId>
+      <version>2.9.2</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-api</artifactId>
+      <version>2.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.hikvision</groupId>
+      <artifactId>MvCameraControlWrapper</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/Library/MvCameraControlWrapper.jar</systemPath>
+    </dependency>
  </dependencies>
  <build>
    <finalName>${project.parent.name}</finalName>
--- a/wms-webapi/Library/JavaEnv.bat
+++ b/wms-webapi/Library/JavaEnv.bat
@@ -0,0 +1,50 @@
+:: 检查java安装环境
+
+@echo off
+
+:: 设置全局错误码
+set /A errorcode=0
+
+:: 开启扩展功能
+setlocal ENABLEEXTENSIONS
+setlocal ENABLEDELAYEDEXPANSION
+
+::通过向临时文件写内容，判断是否有文件读写权限
+echo > tmp
+if exist tmp (
+    del /F/Q tmp >nul 2>&1
+) else (
+    echo Please switch to an administrator account to run this batch!!!
+    set /A errorcode=1
+    goto:END
+)
+
+::判断JAVA_HOME是否被定义
+if "%JAVA_HOME%"=="" (
+    echo JAVA_HOME not set. Please make sure that java is correctly installed.
+    set /A errorcode=2
+    goto:END
+)
+
+:: 判断CLASSPATH是否被定义
+if "%CLASSPATH%"=="" (
+    echo CLASSPATH not set. Please make sure that java is correctly installed.
+    set /A errorcode=3
+    goto:END
+)
+
+:: 判断java版本是否比 1.7.0高，需先将版本信息重定向到文件中，再对文件内容进行分析
+java -version >nul 2> JavaVer.tmp
+for /F "tokens=1,2,3*" %%i in (JavaVer.tmp) do (
+    if "%%j" == "version" (
+        if %%k LSS "1.7.0" (
+            echo Java version is less than "1.7.0", warnings or errors may occur.
+        )
+    )
+)
+del /F/Q JavaVer.tmp >nul 2>&1
+
+:END
+
+::返回错误码
+exit /B %errorcode%
--- a/wms-webapi/Library/MvCameraControlWrapper.jar
+++ b/wms-webapi/Library/MvCameraControlWrapper.jar
--- a/wms-webapi/pom.xml
+++ b/wms-webapi/pom.xml
@@ -67,6 +67,28 @@
            <artifactId>aws-java-sdk-s3</artifactId>
            <version>1.12.780</version>
        </dependency>
+
+        <dependency>
+            <groupId>com.fazecast</groupId>
+            <artifactId>jSerialComm</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <!-- WebSocket API -->
+        <dependency>
+            <groupId>jakarta.websocket</groupId>
+            <artifactId>jakarta.websocket-api</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
+        <!-- 本地库：MvCameraControlWrapper -->
+        <dependency>
+            <groupId>com.hikvision</groupId>
+            <artifactId>MvCameraControlWrapper</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/Library/MvCameraControlWrapper.jar</systemPath>
+        </dependency>
    </dependencies>

    <build>
--- a/wms-webapi/src/main/java/top/wms/admin/WmsAdminApplication.java
+++ b/wms-webapi/src/main/java/top/wms/admin/WmsAdminApplication.java
@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.x.file.storage.spring.EnableFileStorage;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import top.continew.starter.core.autoconfigure.project.ProjectProperties;
@@ -29,6 +30,7 @@ import top.continew.starter.web.model.R;
@RestController
@SpringBootApplication
@RequiredArgsConstructor
+@EnableScheduling
 public class WmsAdminApplication {

    private final ProjectProperties projectProperties;
--- a/wms-webapi/src/main/java/top/wms/admin/config/webSocket/WebSocketConfig.java
+++ b/wms-webapi/src/main/java/top/wms/admin/config/webSocket/WebSocketConfig.java
@@ -0,0 +1,18 @@
+package top.wms.admin.config.webSocket;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+import top.wms.admin.controller.weighManage.ah.ScaleWebSocketHandler;
+
+@Configuration
+@EnableWebSocket
+public class WebSocketConfig implements WebSocketConfigurer {
+
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        // 注册WebSocket端点，允许所有跨域请求
+        registry.addHandler(new ScaleWebSocketHandler(), "/ws/scale").setAllowedOrigins("*");
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/WeighManage/WeighController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/WeighManage/WeighController.java
@@ -1,38 +0,0 @@
-package top.wms.admin.controller.WeighManage;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import top.wms.admin.weighManage.model.resp.MaterialResp;
-
-/**
- * 部门管理管理 API
- *
- * @author zc
- * @since 2025/03/19 17:46
- */
-@Tag(name = "部门管理管理 API")
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/weighManage/material")
-public class WeighController {
-
-
-    /**
-     * 获取材料详细信息
-     */
-    @SaCheckPermission("Weigh:material:detail")
-    @GetMapping(value = "/detail")
-    public MaterialResp getInfo() {
-        MaterialResp materialResp = new MaterialResp();
-        materialResp.setId(1L);
-        materialResp.setMaterialCode("123");
-        materialResp.setMaterialName("测试材料");
-        materialResp.setMaterialSpec("测试规格");
-        materialResp.setWeight("100");
-        materialResp.setImageUrl("http://example.com/image.jpg");
-        return materialResp;
-    }
-
-}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java
@@ -1,5 +1,14 @@
 package top.wms.admin.controller.meterial;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.multipart.MultipartFile;
+import top.continew.starter.core.validation.CheckUtils;
+import top.continew.starter.core.validation.ValidationUtils;
 import top.continew.starter.extension.crud.enums.Api;

 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -8,12 +17,19 @@ import org.springframework.web.bind.annotation.*;

 import lombok.RequiredArgsConstructor;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
+import top.continew.starter.web.model.R;
 import top.wms.admin.common.controller.BaseController;
+import top.wms.admin.material.model.entity.MaterialInfoDO;
 import top.wms.admin.material.model.query.MaterialInfoQuery;
+import top.wms.admin.material.model.req.MaterialInfoImportReq;
 import top.wms.admin.material.model.req.MaterialInfoReq;
+import top.wms.admin.material.model.resp.MaterialImportParseResp;
+import top.wms.admin.material.model.resp.MaterialInfoImportResp;
 import top.wms.admin.material.model.resp.MaterialInfoResp;
 import top.wms.admin.material.service.MaterialInfoService;

+import java.io.IOException;
+
 /**
 * 物料信息管理 API
 *
@@ -23,7 +39,54 @@ import top.wms.admin.material.service.MaterialInfoService;
@Tag(name = "物料信息管理 API")
@RestController
@RequiredArgsConstructor
-@CrudRequestMapping(value = "/admin/meterialInfo", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.UPDATE, Api.DELETE, Api.EXPORT})
+@CrudRequestMapping(value = "/admin/materialInfo", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.UPDATE, Api.DELETE,
+    Api.EXPORT})
 public class MaterialInfoController extends BaseController<MaterialInfoService, MaterialInfoResp, MaterialInfoResp, MaterialInfoQuery, MaterialInfoReq> {

+    @GetMapping("/code/{code}")
+    public MaterialInfoDO getMaterialInfoByCode(@PathVariable String code) {
+        MaterialInfoDO materialInfoDO = baseService.getMaterialInfoByCode(code);
+        CheckUtils.throwIfEmpty(materialInfoDO, "未查询到相关物料信息");
+        return materialInfoDO;
+    }
+
+    @Operation(summary = "下载导入模板", description = "下载导入模板")
+    @SaCheckPermission("admin:materialInfo:import")
+    @GetMapping(value = "/import/template", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    public void downloadImportTemplate(HttpServletResponse response) throws IOException {
+        baseService.downloadImportTemplate(response);
+    }
+
+    @Operation(summary = "解析导入数据", description = "解析导入数据")
+    @SaCheckPermission("admin:materialInfo:import")
+    @PostMapping("/import/parse")
+    public MaterialImportParseResp parseImport(@NotNull(message = "文件不能为空") MultipartFile file) {
+        ValidationUtils.throwIf(file::isEmpty, "文件不能为空");
+        return baseService.parseImport(file);
+    }
+
+    @Operation(summary = "导入数据", description = "导入数据")
+    @SaCheckPermission("admin:materialInfo:import")
+    @PostMapping(value = "/import")
+    public MaterialInfoImportResp importUser(@Validated @RequestBody MaterialInfoImportReq req) {
+        return baseService.importMaterial(req);
+    }
+
+    @Operation(summary = "照片批量导入", description = "照片批量导入")
+    @SaCheckPermission("admin:materialInfo:import")
+    @PostMapping("/import/uploadMaterialPhotos")
+    public R uploadMaterialPhotos(@RequestParam("zipFile") @NotNull(message = "文件不能为空") MultipartFile zipFile) {
+        ValidationUtils.throwIf(zipFile::isEmpty, "文件不能为空");
+        String originalFilename = zipFile.getOriginalFilename();
+        ValidationUtils.throwIf(() -> originalFilename == null || !originalFilename.endsWith(".zip"), "仅支持上传ZIP格式文件");
+        baseService.uploadMaterialPhotos(zipFile);
+        return R.ok();
+    }
+
+    @Operation(summary = "照片抓取", description = "照片抓取")
+    @PostMapping("/import/catch")
+    public String catchPhoto(@RequestParam("file") MultipartFile file) {
+        CheckUtils.throwIfEmpty(file, "照片抓取失败,请重新抓取");
+        return baseService.catchPhoto(file);
+    }
 }
--- a/wms-webapi/src/main/java/top/wms/admin/controller/system/UserController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/system/UserController.java
@@ -10,6 +10,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -91,7 +92,8 @@ public class UserController extends BaseController<UserService, UserResp, UserDe
        ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败");
        ValidationUtils.throwIf(!ReUtil
            .isMatch(RegexConstants.PASSWORD, rawNewPassword), "密码长度为 8-32 个字符，支持大小写字母、数字、特殊字符，至少包含字母和数字");
-        req.setNewPassword(rawNewPassword);
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        req.setNewPassword("{bcrypt}" + encoder.encode(rawNewPassword));
        baseService.resetPassword(req, id);
    }

--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/NettyTcpServer.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/NettyTcpServer.java
@@ -0,0 +1,95 @@
+package top.wms.admin.controller.tcp.config;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import top.wms.admin.controller.tcp.handler.TcpServerHandler;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.LineBasedFrameDecoder;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class NettyTcpServer {
+
+    @Value("${tcp.server.port:9005}")
+    private int port;
+
+    @Value("${tcp.server.boss-threads:1}")
+    private int bossThreads;
+
+    @Value("${tcp.server.worker-threads:4}")
+    private int workerThreads;
+
+    private EventLoopGroup bossGroup;
+    private EventLoopGroup workerGroup;
+    private Channel serverChannel;
+
+    @PostConstruct
+    public void start() throws InterruptedException {
+        log.info("正在启动TCP服务端，端口: {}", port);
+
+        bossGroup = new NioEventLoopGroup(bossThreads);
+        workerGroup = new NioEventLoopGroup(workerThreads);
+
+        ServerBootstrap bootstrap = new ServerBootstrap();
+        bootstrap.group(bossGroup, workerGroup)
+            .channel(NioServerSocketChannel.class)
+            .option(ChannelOption.SO_BACKLOG, 128)
+            .childOption(ChannelOption.SO_KEEPALIVE, true)
+            .childHandler(new ChannelInitializer<SocketChannel>() {
+                @Override
+                protected void initChannel(SocketChannel ch) {
+                    ChannelPipeline pipeline = ch.pipeline();
+
+                    // 解决TCP粘包问题
+                    pipeline.addLast(new LineBasedFrameDecoder(1024));
+
+                    // 字符串编解码
+                    pipeline.addLast(new StringDecoder(CharsetUtil.UTF_8));
+                    pipeline.addLast(new StringEncoder(CharsetUtil.UTF_8));
+
+                    // 关键修复：直接new，不要从Spring容器获取
+                    pipeline.addLast(new TcpServerHandler());
+
+                    log.debug("新连接接入，处理器已添加");
+                }
+            });
+
+        ChannelFuture future = bootstrap.bind(port).sync();
+        if (future.isSuccess()) {
+            serverChannel = future.channel();
+            log.info("TCP服务端启动成功，端口: {}", port);
+        } else {
+            log.error("TCP服务端启动失败", future.cause());
+        }
+    }
+
+    @PreDestroy
+    public void stop() {
+        log.info("正在关闭TCP服务端...");
+        try {
+            if (serverChannel != null) {
+                serverChannel.close().sync();
+            }
+        } catch (InterruptedException e) {
+            log.error("关闭服务端通道时发生错误", e);
+        } finally {
+            if (bossGroup != null) {
+                bossGroup.shutdownGracefully();
+            }
+            if (workerGroup != null) {
+                workerGroup.shutdownGracefully();
+            }
+        }
+        log.info("TCP服务端已关闭");
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/SimpleRequestMatcher.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/SimpleRequestMatcher.java
@@ -0,0 +1,69 @@
+package top.wms.admin.controller.tcp.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Component
+public class SimpleRequestMatcher {
+
+    // 用队列存储响应
+    private final BlockingQueue<String> responseQueue = new LinkedBlockingQueue<>(1);
+
+    // 当前等待的请求标识
+    private volatile boolean isWaiting = false;
+
+    /**
+     * 等待响应
+     */
+    public String waitForResponse(int timeoutSeconds) {
+        isWaiting = true;
+        try {
+            log.info("等待响应, 超时={}秒", timeoutSeconds);
+            // 从队列取响应，最多等待timeoutSeconds秒
+            String response = responseQueue.poll(timeoutSeconds, TimeUnit.SECONDS);
+            if (response != null) {
+                log.info("收到响应: {}", response);
+                return response;
+            } else {
+                log.error("等待响应超时");
+                return "TIMEOUT";
+            }
+        } catch (InterruptedException e) {
+            log.error("等待响应被中断: {}", e.getMessage());
+            return "ERROR";
+        } finally {
+            isWaiting = false;
+        }
+    }
+
+    /**
+     * 接收响应
+     */
+    public void handleResponse(String response) {
+        try {
+            // 如果有请求在等待，把响应放入队列
+            if (isWaiting) {
+                responseQueue.offer(response);
+                log.info("响应接收成功: {}", response);
+            } else {
+                log.warn("没有正在等待的请求, 响应被丢弃: {}", response);
+            }
+        } catch (Exception e) {
+            log.error("处理响应失败: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * 清空队列
+     */
+    public void clear() {
+        responseQueue.clear();
+        isWaiting = false;
+        log.info("请求匹配器已清空");
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/handler/TcpServerHandler.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/handler/TcpServerHandler.java
@@ -0,0 +1,67 @@
+package top.wms.admin.controller.tcp.handler;
+
+import top.wms.admin.controller.tcp.config.SimpleRequestMatcher;
+import top.wms.admin.controller.tcp.util.SpringContextUtil;
+import top.wms.admin.controller.tcp.manager.ChannelManager;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class TcpServerHandler extends SimpleChannelInboundHandler<String> {
+
+    private ChannelManager channelManager;
+    private SimpleRequestMatcher requestMatcher;
+
+    private ChannelManager getChannelManager() {
+        if (channelManager == null) {
+            channelManager = SpringContextUtil.getBean(ChannelManager.class);
+        }
+        return channelManager;
+    }
+
+    private SimpleRequestMatcher getRequestMatcher() {
+        if (requestMatcher == null) {
+            requestMatcher = SpringContextUtil.getBean(SimpleRequestMatcher.class);
+        }
+        return requestMatcher;
+    }
+
+    private String getClientId(ChannelHandlerContext ctx) {
+        return ctx.channel().remoteAddress().toString();
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) {
+        String clientId = getClientId(ctx);
+        getChannelManager().addChannel(clientId, ctx.channel());
+        log.info("✅ VM客户端连接成功: {}", clientId);
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) {
+        String clientId = getClientId(ctx);
+        getChannelManager().removeChannel(clientId);
+        log.info("❌ VM客户端断开连接: {}", clientId);
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, String msg) {
+        String clientId = getClientId(ctx);
+        log.info("📥 收到VM数据 [{}]: {}", clientId, msg);
+
+        try {
+            // 直接把收到的消息交给匹配器（不解析，不匹配）
+            String cleanMsg = msg.trim();
+            getRequestMatcher().handleResponse(cleanMsg);
+        } catch (Exception e) {
+            log.error("处理消息失败: {}", e.getMessage());
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        log.error("连接异常: {}", cause.getMessage());
+        ctx.close();
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/manager/ChannelManager.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/manager/ChannelManager.java
@@ -0,0 +1,47 @@
+package top.wms.admin.controller.tcp.manager;
+
+import io.netty.channel.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+@Slf4j
+@Component
+public class ChannelManager {
+
+    // 存储所有VM客户端的连接
+    private final ConcurrentHashMap<String, Channel> channels = new ConcurrentHashMap<>();
+
+    // 添加连接
+    public void addChannel(String clientId, Channel channel) {
+        channels.put(clientId, channel);
+        log.info("VM客户端 [{}] 已连接，当前在线客户端数: {}", clientId, channels.size());
+    }
+
+    // 移除连接
+    public void removeChannel(String clientId) {
+        channels.remove(clientId);
+        log.info("VM客户端 [{}] 已断开，当前在线客户端数: {}", clientId, channels.size());
+    }
+
+    // 获取第一个连接的VM（如果有多个VM，可以根据需要修改）
+    public Channel getFirstChannel() {
+        return channels.values().stream().findFirst().orElse(null);
+    }
+
+    // 根据ID获取连接
+    public Channel getChannel(String clientId) {
+        return channels.get(clientId);
+    }
+
+    // 检查是否有VM连接
+    public boolean hasConnection() {
+        return !channels.isEmpty();
+    }
+
+    // 获取所有连接
+    public ConcurrentHashMap<String, Channel> getAllChannels() {
+        return channels;
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/CommandRequest.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/CommandRequest.java
@@ -0,0 +1,21 @@
+package top.wms.admin.controller.tcp.model;
+
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+// 指令请求
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommandRequest {
+    private String processId;      // 要执行的流程ID，如 "PROCESS_1"
+    private String param;          // 参数，如 "10.5"
+    private Integer priority;       // 优先级（可选）
+
+    // 构建完整的指令字符串
+    public String buildCommand() {
+        // 格式：*PROCESS_1,10.5#
+        return String.format("*%s,%s#", processId, param);
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/VMResult.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/VMResult.java
@@ -0,0 +1,23 @@
+package top.wms.admin.controller.tcp.model;
+
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+// VM返回的结果
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class VMResult {
+    private String processId;      // 流程ID
+    private String status;          // OK 或 NG
+    private double value;           // 测量值
+    private long timestamp;         // 时间戳
+
+    public VMResult(String processId, String status, double value) {
+        this.processId = processId;
+        this.status = status;
+        this.value = value;
+        this.timestamp = System.currentTimeMillis();
+    }
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/service/CommandService.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/service/CommandService.java
@@ -0,0 +1,72 @@
+package top.wms.admin.controller.tcp.service;
+
+import io.netty.channel.Channel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import top.wms.admin.controller.tcp.manager.ChannelManager;
+import top.wms.admin.controller.tcp.model.VMResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Slf4j
+@Service
+public class CommandService {
+
+    // 统计
+    private final AtomicInteger successCount = new AtomicInteger(0);
+    private final AtomicInteger failCount = new AtomicInteger(0);
+
+    // 存储最近100条结果
+    private final ConcurrentLinkedQueue<VMResult> resultQueue = new ConcurrentLinkedQueue<>();
+
+    // 处理VM返回的结果
+    public void processResult(String processId, String status, double value) {
+        VMResult result = new VMResult(processId, status, value);
+
+        // 更新统计
+        if ("OK".equalsIgnoreCase(status)) {
+            successCount.incrementAndGet();
+        } else {
+            failCount.incrementAndGet();
+        }
+
+        // 存储结果
+        resultQueue.offer(result);
+        if (resultQueue.size() > 100) {
+            resultQueue.poll(); // 只保留最近100条
+        }
+
+        log.info("处理结果 - 流程: {}, 状态: {}, 数值: {}", processId, status, value);
+
+        // 这里可以添加你的业务逻辑，比如：
+        // 1. 存入数据库
+        // 2. 通过WebSocket推送给前端
+        // 3. 触发其他业务操作
+    }
+
+    // 获取统计信息
+    public String getStatistics() {
+        return String.format("成功: %d, 失败: %d, 总数: %d", successCount.get(), failCount.get(), successCount
+            .get() + failCount.get());
+    }
+
+    // 获取最新结果
+    public VMResult getLatestResult() {
+        return resultQueue.peek();
+    }
+
+    @Autowired
+    private ChannelManager channelManager;
+
+    @Scheduled(cron = "*/1 * * * * ?")
+    public void sendAndWait() {
+        // 1. 检查连接
+        log.info("查询时间========");
+        Channel channel = channelManager.getFirstChannel();
+        channel.writeAndFlush("001");
+    }
+
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/util/SpringContextUtil.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/util/SpringContextUtil.java
@@ -0,0 +1,21 @@
+package top.wms.admin.controller.tcp.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextUtil implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        SpringContextUtil.applicationContext = applicationContext;
+    }
+
+    public static <T> T getBean(Class<T> requiredType) {
+        return applicationContext.getBean(requiredType);
+    }
+}
--- 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
@@ -0,0 +1,165 @@
+package top.wms.admin.controller.vm;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import io.netty.channel.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.x.file.storage.core.FileInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import top.continew.starter.core.validation.CheckUtils;
+import top.wms.admin.controller.tcp.config.SimpleRequestMatcher;
+import top.wms.admin.controller.tcp.manager.ChannelManager;
+import top.wms.admin.system.service.FileService;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+@Slf4j
+@RestController
+@RequestMapping("/vm")
+public class VmCommandController {
+
+    @Autowired
+    private ChannelManager channelManager;
+
+    @Autowired
+    private SimpleRequestMatcher requestMatcher;
+
+    @Autowired
+    private  FileService fileService;
+
+    @GetMapping("/send")
+    public String sendAndWait(@RequestParam String msg) {
+        // 1. 检查连接
+        Channel channel = channelManager.getFirstChannel();
+        if (channel == null) {
+            return "ERROR: VM未连接";
+        }
+        String sendMsg = msg;
+        channel.writeAndFlush(sendMsg);
+        log.info("发送指令: {}", sendMsg);
+        // 3. 等待响应
+        String response = requestMatcher.waitForResponse(20);
+        CheckUtils.throwIf("TIMEOUT".equals(response), "响应超时,请重试");
+        if (StrUtil.equals(response, "success") || StrUtil.equals(response, "failed")) {
+            return response;
+        }
+        if (StrUtil.equals(response, msg)) {
+            response = "success";
+        } else {
+            response = "failed";
+        }
+        // 4. 返回结果
+        return response;  // 直接返回VM的响应
+    }
+
+    // 基础路径
+    private static final String BASE_PATH = "C:/Users/14725/Desktop/material";
+
+    // 固定照片名称
+    private static final String PHOTO_NAME = "001.bmp";
+
+    /**
+     * 获取最新的001.bmp照片
+     *
+     * @return 图片文件
+     */
+    /*@GetMapping("/latest-photo")
+    public ResponseEntity<byte[]> getLatestPhoto() {
+        try {
+            // 获取当前日期
+            LocalDate now = LocalDate.now();
+            String yearMonth = now.format(DateTimeFormatter.ofPattern("yyyyMM"));
+            String day = now.format(DateTimeFormatter.ofPattern("dd"));
+
+            // 构建完整的文件路径
+            // 格式: C:/Users/14725/Desktop/material/202603/20260312/001.bmp
+            String filePath = String.format("%s/%s/%s%s/%s", BASE_PATH, yearMonth, yearMonth, day, PHOTO_NAME);
+
+            // 读取图片文件
+            Path imagePath = Paths.get(filePath);
+
+            // 检查文件是否存在
+            if (!Files.exists(imagePath)) {
+                return ResponseEntity.notFound().build();
+            }
+
+            // 读取文件字节
+            byte[] imageBytes = Files.readAllBytes(imagePath);
+
+            // 设置响应头
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.valueOf("image/bmp"));
+            headers.setContentLength(imageBytes.length);
+
+            // 返回图片
+            return new ResponseEntity<>(imageBytes, headers, HttpStatus.OK);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }*/
+
+    @GetMapping("/latest-photo")
+    public String getLatestPhoto() {
+        try {
+            // 获取当前日期
+            LocalDate now = LocalDate.now();
+            String yearMonth = now.format(DateTimeFormatter.ofPattern("yyyyMM"));
+            String day = now.format(DateTimeFormatter.ofPattern("dd"));
+
+            // 构建完整的本地文件路径
+            // 格式: C:/Users/14725/Desktop/material/202603/20260312/001.bmp
+            String filePath = String.format("%s/%s/%s%s/%s", BASE_PATH, yearMonth, yearMonth, day, PHOTO_NAME);
+
+            // 读取图片文件
+            Path imagePath = Paths.get(filePath);
+
+            // 检查文件是否存在
+            if (!Files.exists(imagePath)) {
+                return null; // 或者抛出异常，根据业务需求决定
+            }
+
+            // 将文件转换为MultipartFile
+            File file = imagePath.toFile();
+            FileInputStream input = new FileInputStream(file);
+            MultipartFile multipartFile = new MockMultipartFile(
+                    file.getName(),           // 文件名
+                    file.getName(),           // 原始文件名
+                    "image/bmp",              // 内容类型
+                    input                     // 文件输入流
+            );
+
+            // 构建MinIO存储路径
+            String photoStoragePath = "catch" + DateUtil.today() + "/";
+
+            // 使用现有的fileService上传到MinIO
+            FileInfo fileInfo = fileService.upload(multipartFile, photoStoragePath, null, true, true);
+
+            // 检查上传结果
+            CheckUtils.throwIfNull(fileInfo, "照片上传失败");
+
+            // 关闭输入流
+            input.close();
+            return fileInfo.getUrl();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException("处理图片失败: " + e.getMessage());
+        }
+    }
+
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java
@@ -0,0 +1,76 @@
+package top.wms.admin.controller.weighManage;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.validation.annotation.Validated;
+import top.continew.starter.extension.crud.enums.Api;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import org.springframework.web.bind.annotation.*;
+
+import lombok.RequiredArgsConstructor;
+import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
+import top.continew.starter.log.annotation.Log;
+import top.continew.starter.web.model.R;
+import top.wms.admin.common.controller.BaseController;
+import top.wms.admin.weighManage.model.query.WorkOrderQuery;
+import top.wms.admin.weighManage.model.req.WorkOrderReq;
+import top.wms.admin.weighManage.model.resp.WorkOrderInfoResp;
+import top.wms.admin.weighManage.model.resp.WorkOrderResp;
+import top.wms.admin.weighManage.service.WorkOrderService;
+
+import java.util.List;
+
+/**
+ * 任务工单信息管理 API
+ *
+ * @author zc
+ * @since 2026/03/03 17:09
+ */
+@Tag(name = "任务工单信息管理 API")
+@RestController
+@RequiredArgsConstructor
+@CrudRequestMapping(value = "/weighManage/workOrder", api = {Api.PAGE, Api.DELETE, Api.EXPORT})
+public class WorkOrderController extends BaseController<WorkOrderService, WorkOrderResp, WorkOrderResp, WorkOrderQuery, WorkOrderReq> {
+
+    @Log(ignore = true)
+    @SaCheckPermission("workOrder:record:detail")
+    @GetMapping(value = "/info/{id}")
+    public List<WorkOrderInfoResp> getWorkOrderInfos(@PathVariable("id") Long id) {
+        return baseService.getWorkOrderInfos(id);
+    }
+
+    @Log(ignore = true)
+    @SaCheckPermission("workOrder:record:detail")
+    @GetMapping(value = "/{id}")
+    public WorkOrderResp getDetail(@PathVariable("id") Long id) {
+        return baseService.getDetail(id);
+    }
+
+    @SaCheckPermission("workOrder:record:add")
+    @PostMapping
+    public WorkOrderResp addWorKerOrder(@Validated @RequestBody WorkOrderReq req) {
+        return baseService.addWorKerOrder(req);
+    }
+
+    @PostMapping("/validateWeighing")
+    public R validateWeighing(@RequestBody WorkOrderReq req) {
+        if (null == req.getMaterialId()) {
+            return R.fail("400", "物料主键id不能为空");
+        }
+        if (StrUtil.isBlank(req.getInputQuantity())) {
+            return R.fail("400", "输入数量不能为空");
+        }
+        if (StrUtil.isBlank(req.getAhDeviceWeight())) {
+            return R.fail("400", "电子称重量不能为空");
+        }
+
+        int validateResult = baseService.validateWeighing(req);
+        if (validateResult != 200) {
+            return R.fail("500", "重量不匹配！");
+        }
+        return R.ok();
+    }
+
+}
--- 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
@@ -0,0 +1,326 @@
+package top.wms.admin.controller.weighManage.ah;
+
+import com.fazecast.jSerialComm.SerialPort;
+import com.fazecast.jSerialComm.SerialPortDataListener;
+import com.fazecast.jSerialComm.SerialPortEvent;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import java.nio.charset.Charset;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 安衡电子秤连接类
+ */
+@Component
+@Slf4j
+public class AHDZCConnect {
+
+    private static final String PORT_NAME = "COM12";
+    private static final int BAUD_RATE = 9600;
+    private static final int DATA_BITS = 8;
+    private static final int STOP_BITS = 1;
+    private static final int TIMEOUT = 2000;
+    private static final Charset SCALE_CHARSET = Charset.forName("GBK");
+
+    private static final long HEALTH_CHECK_INTERVAL = 5000;
+    private static final long DATA_TIMEOUT = 10000;
+    private static final int MAX_RECONNECT_DELAY = 30000;
+    private static final int INITIAL_RECONNECT_DELAY = 1000;
+    private static final int BUFFER_SIZE = 256;
+
+    private volatile SerialPort serialPort;
+    private final AtomicBoolean isConnecting = new AtomicBoolean(false);
+    private final AtomicBoolean isRunning = new AtomicBoolean(true);
+    private final AtomicLong lastDataTime = new AtomicLong(System.currentTimeMillis());
+    private final AtomicInteger reconnectAttempts = new AtomicInteger(0);
+    private final AtomicInteger currentReconnectDelay = new AtomicInteger(INITIAL_RECONNECT_DELAY);
+
+    private final byte[] readBuffer = new byte[BUFFER_SIZE];
+
+    private ScheduledExecutorService executorService;
+
+    @PostConstruct
+    public void init() {
+        // 项目启动时初始化并启动服务
+        ScaleService();
+        start();
+
+    }
+
+    @PreDestroy
+    public void destroy() {
+        // 项目关闭时停止服务
+        stop();
+    }
+
+    public void ScaleService() {
+        executorService = Executors.newScheduledThreadPool(2, r -> {
+            Thread t = new Thread(r, "ScaleService-Worker");
+            t.setDaemon(true);
+            return t;
+        });
+
+        Runtime.getRuntime().addShutdownHook(new Thread(this::stop, "Shutdown-Hook"));
+    }
+
+    public void start() {
+        log.info("========================================");
+        log.info("启动电子秤连接线程，串口: " + PORT_NAME + " | 波特率: " + BAUD_RATE);
+        log.info("========================================");
+
+        startHealthCheck();
+        startConnectionMonitor();
+        if (connect()) {
+            log.info("电子秤连接成功！");
+        } else {
+            log.info("电子秤连接失败，将自动尝试重连...");
+        }
+    }
+
+    private boolean connect() {
+        if (!isRunning.get()) {
+            return false;
+        }
+
+        if (!isConnecting.compareAndSet(false, true)) {
+            log.error("[连接] 已有连接任务正在执行，跳过");
+            return false;
+        }
+
+        try {
+            closeSerialPort();
+
+            SerialPort newPort = SerialPort.getCommPort(PORT_NAME);
+            newPort.setBaudRate(BAUD_RATE);
+            newPort.setNumDataBits(DATA_BITS);
+            newPort.setNumStopBits(STOP_BITS);
+            newPort.setParity(SerialPort.NO_PARITY);
+            newPort.setComPortTimeouts(TIMEOUT, TIMEOUT, TIMEOUT);
+
+            if (!newPort.openPort()) {
+                int attempts = reconnectAttempts.incrementAndGet();
+                int delay = calculateReconnectDelay();
+                log.info("[连接失败] 无法打开串口 {} (第{}次尝试，下次重试间隔: {}ms)", PORT_NAME, attempts, delay);
+                return false;
+            }
+
+            serialPort = newPort;
+            reconnectAttempts.set(0);
+            currentReconnectDelay.set(INITIAL_RECONNECT_DELAY);
+            lastDataTime.set(System.currentTimeMillis());
+
+            log.info("[连接成功] 串口 {} 已打开", PORT_NAME);
+
+            startDataListener();
+
+            return true;
+        } catch (Exception e) {
+            log.error("[连接异常] {}", e.getMessage());
+            return false;
+        } finally {
+            isConnecting.set(false);
+        }
+    }
+
+    private int calculateReconnectDelay() {
+        int delay = currentReconnectDelay.get();
+        int newDelay = Math.min(delay * 2, MAX_RECONNECT_DELAY);
+        currentReconnectDelay.set(newDelay);
+        return newDelay;
+    }
+
+    private void closeSerialPort() {
+        SerialPort oldPort = serialPort;
+        serialPort = null;
+
+        if (oldPort != null) {
+            try {
+                if (oldPort.isOpen()) {
+                    oldPort.closePort();
+                }
+            } catch (Exception e) {
+                log.error("[关闭串口] 异常: {}", e.getMessage());
+            }
+        }
+    }
+
+    private void startDataListener() {
+        SerialPort port = serialPort;
+        if (port == null || !port.isOpen()) {
+            return;
+        }
+
+        port.addDataListener(new SerialPortDataListener() {
+            @Override
+            public int getListeningEvents() {
+                return SerialPort.LISTENING_EVENT_DATA_AVAILABLE;
+            }
+
+            @Override
+            public void serialEvent(SerialPortEvent event) {
+                if (event.getEventType() != SerialPort.LISTENING_EVENT_DATA_AVAILABLE) {
+                    return;
+                }
+
+                try {
+                    SerialPort currentPort = serialPort;
+                    if (currentPort == null) {
+                        return;
+                    }
+
+                    int bytesAvailable = currentPort.bytesAvailable();
+                    if (bytesAvailable <= 0) {
+                        return;
+                    }
+
+                    int bytesToRead = Math.min(bytesAvailable, BUFFER_SIZE);
+                    int numRead = currentPort.readBytes(readBuffer, bytesToRead);
+
+                    if (numRead > 0) {
+                        lastDataTime.set(System.currentTimeMillis());
+                        String data = new String(readBuffer, 0, numRead, SCALE_CHARSET);
+
+                        // 解析数据，提取数字和重量单位
+                        String weightStr = data.trim();
+                        // 使用正则表达式提取数字（包括小数点）
+                        Pattern pattern = java.util.regex.Pattern.compile("[-+]?\\d*\\.?\\d+");
+                        Matcher matcher = pattern.matcher(weightStr);
+
+                        if (matcher.find()) {
+                            try {
+                                String weightWithUnit = matcher.group().trim();
+                                log.info("[解析后] 重量: {}", weightWithUnit);
+                                // 发送提取的数字和重量单位给前端
+                                ScaleWebSocketHandler.sendMessage(weightWithUnit);
+                            } catch (NumberFormatException e) {
+                                log.error("[解析异常] 无法解析重量数据: {}", e.getMessage());
+                                // 发送原始数据作为备选
+                                ScaleWebSocketHandler.sendMessage("电子秤异常: " + weightStr);
+                            }
+                        } else {
+                            log.warn("[解析警告] 未找到重量数据: {}", weightStr);
+                            // 发送原始数据作为备选
+                            ScaleWebSocketHandler.sendMessage("电子秤异常: " + weightStr);
+                        }
+                    }
+                } catch (Exception e) {
+                    log.error("[读取异常] {}", e.getMessage());
+                    triggerReconnect();
+                }
+            }
+        });
+    }
+
+    private void startHealthCheck() {
+        log.info("[健康检查] 启动，间隔 {} 秒", HEALTH_CHECK_INTERVAL / 1000);
+
+        executorService.scheduleAtFixedRate(() -> {
+            if (!isRunning.get()) {
+                return;
+            }
+
+            try {
+                SerialPort port = serialPort;
+
+                if (port == null) {
+                    log.error("[健康检查] 串口对象为空");
+                    if (reconnectAttempts.get() < 10) {
+                        connect();
+                    }
+                    return;
+                }
+
+                boolean isOpen = port.isOpen();
+                //                log.error("[健康检查] 串口状态: {}", isOpen ? "已打开" : "已关闭");
+
+                if (!isOpen) {
+                    log.info("[健康检查] 检测到串口关闭，尝试重连...");
+                    connect();
+                }
+            } catch (Exception e) {
+                log.error("[健康检查异常] {}", e.getMessage());
+            }
+        }, HEALTH_CHECK_INTERVAL, HEALTH_CHECK_INTERVAL, TimeUnit.MILLISECONDS);
+    }
+
+    private void startConnectionMonitor() {
+        log.info("[连接监控] 启动，间隔 3 秒");
+
+        executorService.scheduleAtFixedRate(() -> {
+            if (!isRunning.get()) {
+                return;
+            }
+
+            try {
+                long currentTime = System.currentTimeMillis();
+                long timeSinceLastData = currentTime - lastDataTime.get();
+
+                if (timeSinceLastData > DATA_TIMEOUT) {
+                    SerialPort port = serialPort;
+
+                    if (port != null && port.isOpen()) {
+                        try {
+                            int bytesAvailable = port.bytesAvailable();
+
+                            if (bytesAvailable < 0) {
+                                log.info("[连接监控] 检测到连接已断开，尝试重连...");
+                                triggerReconnect();
+                            }
+                        } catch (Exception e) {
+                            log.error("[连接监控] 检测到连接异常: {}", e.getMessage());
+                            triggerReconnect();
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                log.error("[连接监控异常] {}", e.getMessage());
+            }
+        }, 3000, 3000, TimeUnit.MILLISECONDS);
+    }
+
+    private void triggerReconnect() {
+        if (isConnecting.compareAndSet(false, true)) {
+            isConnecting.set(false);
+            connect();
+        }
+    }
+
+    public void stop() {
+        if (!isRunning.compareAndSet(true, false)) {
+            return;
+        }
+
+        log.info("========================================");
+        log.info("停止电子秤线程...");
+        log.info("========================================");
+
+        try {
+            if (executorService != null && !executorService.isShutdown()) {
+                executorService.shutdown();
+                if (!executorService.awaitTermination(3, TimeUnit.SECONDS)) {
+                    executorService.shutdownNow();
+                }
+            }
+        } catch (InterruptedException e) {
+            if (executorService != null) {
+                executorService.shutdownNow();
+            }
+            Thread.currentThread().interrupt();
+        }
+
+        closeSerialPort();
+
+        log.info("线程已完全停止");
+    }
+
+}
--- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/ScaleWebSocketHandler.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/ScaleWebSocketHandler.java
@@ -0,0 +1,43 @@
+package top.wms.admin.controller.weighManage.ah;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import java.io.IOException;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+@Slf4j
+public class ScaleWebSocketHandler extends TextWebSocketHandler {
+    // 线程安全的连接集合
+    private static final CopyOnWriteArraySet<WebSocketSession> sessions = new CopyOnWriteArraySet<>();
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        sessions.add(session);
+        log.info("客户端连接成功，当前连接数: {}", sessions.size());
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session,
+                                      org.springframework.web.socket.CloseStatus status) throws Exception {
+        sessions.remove(session);
+        log.info("客户端断开连接，当前连接数: {}", sessions.size());
+    }
+
+    /**
+     * 发送数据给所有连接的客户端
+     */
+    public static void sendMessage(String message) {
+        for (WebSocketSession session : sessions) {
+            if (session.isOpen()) {
+                try {
+                    session.sendMessage(new TextMessage(message));
+                } catch (IOException e) {
+                    log.error("发送消息失败", e);
+                }
+            }
+        }
+    }
+}
--- a/wms-webapi/src/main/resources/config/application-dev.yml
+++ b/wms-webapi/src/main/resources/config/application-dev.yml
@@ -14,7 +14,7 @@ spring.datasource:
  # 请务必提前创建好名为 wms_admin 的数据库，如果使用其他数据库名请注意同步修改 DB_NAME 配置
  url: jdbc:p6spy:mysql://127.0.0.1:3306/wms?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
  username: root
-  password: root
+  password: test123$
  # PostgreSQL 配置
 #  url: jdbc:p6spy:mysql://192.168.2.30:${DB_PORT:3306}/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
 #  username: ${DB_USER:root}
@@ -48,12 +48,12 @@ spring.data:
  ## Redis 配置（单机模式）
  redis:
    # 地址
-    host: ${REDIS_HOST:192.168.2.30}
-#    host: ${REDIS_HOST:127.0.0.1}
+#    host: ${REDIS_HOST:192.168.2.30}
+    host: ${REDIS_HOST:127.0.0.1}
    # 端口（默认 6379）
    port: ${REDIS_PORT:6379}
    # 密码（未设置密码时请注释掉）
-    password: ${REDIS_PWD:redis2025}
+#    password: ${REDIS_PWD:redis2025}
    # 数据库索引
    database: ${REDIS_DB:1}
    # 连接超时时间
--- a/wms-webapi/src/main/resources/config/application.yml
+++ b/wms-webapi/src/main/resources/config/application.yml
@@ -225,6 +225,7 @@ auth:
      - /auth/user/info
      - /auth/logout
      - /system/user/password
+      - /ws/scale

 --- ### 服务器配置
 server:
--- a/wms-webapi/src/main/resources/templates/import/consumePeopleDeposit.xlsx
+++ b/wms-webapi/src/main/resources/templates/import/consumePeopleDeposit.xlsx
--- a/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx
+++ b/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx
--- a/wms-webapi/src/main/resources/templates/import/people.xlsx
+++ b/wms-webapi/src/main/resources/templates/import/people.xlsx
Author	SHA1	Message	Date
liuzhu	cd1ba55b26	优化	2026-03-13 10:30:55 +08:00
zc	687be5840e	Merge branch 'refs/heads/master_lz'	2026-03-12 20:20:46 +08:00
zc	d9f808ecc1	tcp服务启动	2026-03-12 19:45:07 +08:00
liuzhu	c1d84aaf81	优化	2026-03-12 16:54:55 +08:00
zc	dec15eb913	tcp服务启动	2026-03-11 17:53:58 +08:00
liuzhu	18e014d9cb	Merge branch 'master' into master_lz	2026-03-11 17:44:57 +08:00
liuzhu	2cb03b146a	tcp服务	2026-03-11 17:44:06 +08:00
zc	7d48c78c9b	海康工业相机优化关闭socket视频重连异常	2026-03-11 17:39:05 +08:00
zc	c80dce6419	海康工业相机对接彩色视频流	2026-03-11 15:05:14 +08:00
zc	4802e11f7c	海康工业相机对接优化视频流	2026-03-11 11:09:56 +08:00
zc	fde2f18ff5	海康工业相机对接黑白画面	2026-03-11 10:55:59 +08:00
zc	41e0b0b5b4	添加海康工业相机demo代码	2026-03-10 16:54:45 +08:00
zc	fb05360c5e	代码优化	2026-03-09 20:33:47 +08:00
liuzhu	df9479f870	抓取失败返回优化	2026-03-09 16:25:41 +08:00
liuzhu	e4d6de61ae	Merge branch 'refs/heads/master' into master_lz	2026-03-06 17:59:47 +08:00
liuzhu	73c1bc9d01	称重抓取	2026-03-06 17:58:55 +08:00
zc	ae9a607da1	代码优化	2026-03-06 15:55:06 +08:00
liuzhu	32f88b1443	物料查询返回错误提示	2026-03-06 15:41:12 +08:00
zc	c59df81b38	电子秤设备&优化	2026-03-05 18:13:39 +08:00
zc	66449b0482	电子秤设备	2026-03-05 16:02:36 +08:00
liuzhu	5726239eda	优化用户重置密码加密+物料照片批量导入	2026-03-05 14:39:20 +08:00
liuzhu	656267e6b7	Merge branch 'refs/heads/master' into master_lz # Conflicts: # wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java # wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java	2026-03-05 14:27:48 +08:00
zc	381c1638e3	优化追溯	2026-03-04 18:05:00 +08:00
liuzhu	d95f527938	Merge branch 'master' into master_lz	2026-03-04 18:02:30 +08:00
liuzhu	97df87eb06	优化	2026-03-04 18:01:13 +08:00
zc	b98a0f06ba	优化称重	2026-03-03 17:58:57 +08:00
zc	15af775af4	Merge remote-tracking branch 'refs/remotes/origin/master_lz' # Conflicts: # wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java	2026-03-03 15:26:12 +08:00
zc	85e9e5d110	优化登录	2026-03-03 15:24:48 +08:00
liuzhu	b37300ef8c	优化	2026-03-03 15:03:31 +08:00
liuzhu	b54e1e314a	Merge branch 'refs/heads/master' into master_lz # Conflicts: # wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java # wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java	2026-03-03 14:21:14 +08:00
liuzhu	3082c24e13	优化	2026-03-03 14:19:20 +08:00