|
|
|
@ -279,10 +279,12 @@ public class ZyjhController {
|
|
|
|
|
String mpDhsjDhh = zyjhService.getMpDhsjDhh();
|
|
|
|
|
for (int j = 0; j < ljList.size(); j++) {
|
|
|
|
|
DmYdjhLj item2 = ljList.get(j);
|
|
|
|
|
MpDhsj mpDhsj = MpDhsj.of(item2, date, item.getSllph());
|
|
|
|
|
String xh = StrUtil.padPre(j + 1 + "", 3, "0");
|
|
|
|
|
mpDhsj.setDhh(mpDhsjDhh+"-"+xh);
|
|
|
|
|
collect.add(mpDhsj);
|
|
|
|
|
if (StrUtil.isNotEmpty(item.getSllph())){//兼容没有炉批号的老数据用
|
|
|
|
|
MpDhsj mpDhsj = MpDhsj.of(item2, date, item.getSllph());
|
|
|
|
|
String xh = StrUtil.padPre(j + 1 + "", 3, "0");
|
|
|
|
|
mpDhsj.setDhh(mpDhsjDhh+"-"+xh);
|
|
|
|
|
collect.add(mpDhsj);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
mpDhsjServcie.saveBatch(collect);
|
|
|
|
|
}
|
|
|
|
|