优化

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;
+
 }

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 = new BigDecimal(req.getCalculatedWeight());
-        BigDecimal standardWeight = materialInfoDO.getUnitWeight().subtract(new BigDecimal(req.getInputQuantity()));
         BigDecimal electronicWeight = new BigDecimal(req.getAhDeviceWeight());
 
         // 检查 electronicWeight 是否大于 standardWeight

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>

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>

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()) {
+        if (StrUtil.isBlank(req.getCalculatedWeight())) {
-            return R.fail("400", "物料主键id不能为空");
+            return R.fail("400", "计算重量不能为空");
         }
         if (StrUtil.isBlank(req.getInputQuantity())) {
             return R.fail("400", "输入数量不能为空");