From 06c600f67d3d783aba92843f55e3691f9ced419e Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Wed, 18 Mar 2026 11:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top/wms/admin/weighManage/model/req/WorkOrderReq.java    | 5 +++++
 .../admin/weighManage/service/impl/WorkOrderServiceImpl.java | 3 +--
 .../src/main/resources/mapper/MaterialProcessMapper.xml      | 4 ++++
 .../src/main/resources/mapper/MaterialTypeMapper.xml         | 4 ++++
 .../admin/controller/weighManage/WorkOrderController.java    | 4 ++--
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml
 create mode 100644 wms-module-system/src/main/resources/mapper/MaterialTypeMapper.xml

diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
index dd24ae2..92f7c01 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
@@ -47,4 +47,9 @@ public class WorkOrderReq implements Serializable {
      */
     private String ahDeviceWeight;
 
+    /**
+     * 计算重量
+     */
+    private String calculatedWeight;
+
 }
\ No newline at end of file
diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
index 774d125..77ba71b 100644
--- a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
@@ -133,8 +133,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
 
         //计算标准重量
-        MaterialInfoDO materialInfoDO = materialInfoMapper.selectById(req.getMaterialId());
-        BigDecimal standardWeight = materialInfoDO.getUnitWeight().subtract(new BigDecimal(req.getInputQuantity()));
+        BigDecimal standardWeight = new BigDecimal(req.getCalculatedWeight());
         BigDecimal electronicWeight = new BigDecimal(req.getAhDeviceWeight());
 
         // 检查 electronicWeight 是否大于 standardWeight
diff --git a/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml b/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml
new file mode 100644
index 0000000..c7649d7
--- /dev/null
+++ b/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml
@@ -0,0 +1,4 @@
+<?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.materialProcess.mapper.MaterialProcessMapper">
+</mapper>
\ No newline at end of file
diff --git a/wms-module-system/src/main/resources/mapper/MaterialTypeMapper.xml b/wms-module-system/src/main/resources/mapper/MaterialTypeMapper.xml
new file mode 100644
index 0000000..bd858be
--- /dev/null
+++ b/wms-module-system/src/main/resources/mapper/MaterialTypeMapper.xml
@@ -0,0 +1,4 @@
+<?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.materialType.mapper.MaterialTypeMapper">
+</mapper>
\ No newline at end of file
diff --git 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
index 2866110..7b5e083 100644
--- 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
@@ -62,8 +62,8 @@ public class WorkOrderController extends BaseController<WorkOrderService, WorkOr
 
     @PostMapping("/validateWeighing")
     public R validateWeighing(@RequestBody WorkOrderReq req) {
-        if (null == req.getMaterialId()) {
-            return R.fail("400", "物料主键id不能为空");
+        if (StrUtil.isBlank(req.getCalculatedWeight())) {
+            return R.fail("400", "计算重量不能为空");
         }
         if (StrUtil.isBlank(req.getInputQuantity())) {
             return R.fail("400", "输入数量不能为空");