WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zc
2026-03-18 11:24:49 +08:00
parent 50a1c03776
commit 06c600f67d
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java
View File

@@ -47,4 +47,9 @@ public class WorkOrderReq implements Serializable {
*/
private String ahDeviceWeight;
/**
* 计算重量
*/
private String calculatedWeight;
}

3
wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java
View File

@@ -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

4
wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml Normal file
View File

@@ -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>

4
wms-module-system/src/main/resources/mapper/MaterialTypeMapper.xml Normal file
View File

@@ -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>

4
wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java
View File

@@ -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", "输入数量不能为空");