Merge remote-tracking branch '惠信/dev_zhangke' into develop
This commit is contained in:
commit
6d62ee3f20
|
|
@ -442,7 +442,7 @@ public class NormalQMController extends BaseController {
|
|||
zwm3A18DTO.getItem1().add(item1DTO);
|
||||
} else {
|
||||
item1DTO.setErfmg1(item1DTO.getErfmg1().add(code.getQualifiedQty()));
|
||||
item1DTO.setErfmg2(item1DTO.getErfmg2().add(code.getUnqualifiedQty()));
|
||||
item1DTO.setErfmg2(BigDecimal.ZERO);
|
||||
}
|
||||
if (StrUtil.isNotBlank(code.getSerialNum())) {
|
||||
String flag = code.getInspectionResult().equals("合格") ? "X" : "";
|
||||
|
|
|
|||
Loading…
Reference in New Issue