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

Merge remote-tracking branch '惠信/dev_zhangke' into develop

This commit is contained in:
曹鹏飞 2026-03-24 17:20:46 +08:00
parent bf8e9baea9 770a325c9e
commit 6d62ee3f20
1 changed files with 1 additions and 1 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

@ -442,7 +442,7 @@ public class NormalQMController extends BaseController {
zwm3A18DTO.getItem1().add(item1DTO); zwm3A18DTO.getItem1().add(item1DTO);
} else { } else {
item1DTO.setErfmg1(item1DTO.getErfmg1().add(code.getQualifiedQty())); item1DTO.setErfmg1(item1DTO.getErfmg1().add(code.getQualifiedQty()));
item1DTO.setErfmg2(item1DTO.getErfmg2().add(code.getUnqualifiedQty())); item1DTO.setErfmg2(BigDecimal.ZERO);
} }
if (StrUtil.isNotBlank(code.getSerialNum())) { if (StrUtil.isNotBlank(code.getSerialNum())) {
String flag = code.getInspectionResult().equals("合格") ? "X" : ""; String flag = code.getInspectionResult().equals("合格") ? "X" : "";