rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(qm): 修正质检数据字段映射和数量计算逻辑 

- 修复了不合格数量字段映射，将rejectQty改为unqualifiedQty
- 修正了合格数量和不合格数量的数据源映射关系
- 调整了入库数量计算逻辑，正确累加接收数量和不合格数量
- 更新了任务项目数量统计的计算方式，确保数据准确性
This commit is contained in:
曹鹏飞 2026-06-25 18:46:37 +08:00
parent 4ab47ed044
commit f103888ea0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
View File

@ -340,7 +340,7 @@ public class NormalQMController extends BaseController {
.setMatnr(code.getItemCode()) .setMatnr(code.getItemCode())
.setEbeln(code.getPoNum()) .setEbeln(code.getPoNum())
.setEbelp(Integer.valueOf(code.getPoLineNumber())) .setEbelp(Integer.valueOf(code.getPoLineNumber()))
.setMenge(code.getRejectQty()) .setMenge(code.getUnqualifiedQty())
.setMatDoc(code.getReceiveNum()) .setMatDoc(code.getReceiveNum())
.setDocYear(DateTimeUtil.format(LocalDate.now(), "yyyy")) .setDocYear(DateTimeUtil.format(LocalDate.now(), "yyyy"))
); );

12
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java
View File

@ -73,17 +73,19 @@ public class NormalQMControllerService {
.setMaterialBatch(code.getMaterialBatch()) .setMaterialBatch(code.getMaterialBatch())
.setSerialNum(code.getSerialNum()) .setSerialNum(code.getSerialNum())
.setInspectionResult(code.getInspectionResult()) .setInspectionResult(code.getInspectionResult())
.setQualifiedQty(code.getReceiveQty()) .setQualifiedQty(code.getQualifiedQty())
.setUnqualifiedQty(code.getRejectQty()) .setUnqualifiedQty(code.getUnqualifiedQty())
); );
taskItemVO.setUnqualifiedQty( taskItemVO.setUnqualifiedQty(
ObjectUtil.defaultIfNull(taskItemVO.getUnqualifiedQty(), BigDecimal.ZERO) ObjectUtil.defaultIfNull(taskItemVO.getUnqualifiedQty(), BigDecimal.ZERO)
.add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))); .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO)));
taskItemVO.setQualifiedQty( taskItemVO.setQualifiedQty(
ObjectUtil.defaultIfNull(taskItemVO.getQualifiedQty(), BigDecimal.ZERO) ObjectUtil.defaultIfNull(taskItemVO.getQualifiedQty(), BigDecimal.ZERO)
.add(ObjectUtil.defaultIfNull(code.getReceiveQty(), BigDecimal.ZERO))); .add(ObjectUtil.defaultIfNull(code.getQualifiedQty(), BigDecimal.ZERO)));
taskItemVO.setInQty(ObjectUtil.defaultIfNull(code.getQualifiedQty(), BigDecimal.ZERO) taskItemVO.setInQty(ObjectUtil.defaultIfNull(taskItemVO.getInQty(), BigDecimal.ZERO)
.add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))); .add(ObjectUtil.defaultIfNull(code.getReceiveQty(), BigDecimal.ZERO))
.add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))
);
}); });
} }
} }