报工增加bom总行数字段

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -286,6 +286,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                     newMesProductOffLine.setSapWorkCenter(oldMesWorkOrder.getErpWorkCenter());
                     newMesProductOffLine.setOrganizeCode(oldMesWorkOrder.getOrganizeCode());
                     newMesProductOffLine.setDescription(nowTime);
+                    newMesProductOffLine.setBomTotalSize(mesBoms.size());
                     ConvertBean.serviceModelInitialize(newMesProductOffLine, userName);
                     mesProductOffLineList.add(newMesProductOffLine);
                 }
@@ -356,6 +357,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 newMesProductOffLine.setOrganizeCode(organizeCode);
                 newMesProductOffLine.setDescription(mesProductionRecord.getCompleteDateTime());
                 newMesProductOffLine.setBomCode(mesBom.getBomCode());
+                newMesProductOffLine.setBomTotalSize(mesBoms.size());
                 ConvertBean.serviceModelInitialize(newMesProductOffLine, userName);
                 mesProductOffLineList.add(newMesProductOffLine);
             }
@@ -692,6 +694,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
             newMesProductOffLine.setOrganizeCode(oldMesWorkOrder.getOrganizeCode());
             newMesProductOffLine.setDescription(productionRecord.getCompleteDateTime());
+            newMesProductOffLine.setBomTotalSize(map.entrySet().size());
             ConvertBean.serviceModelInitialize(newMesProductOffLine, userName);
             mesProductOffLineList.add(newMesProductOffLine);
         }
@@ -1042,7 +1045,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
             String nowTime = TimeTool.getNowTime(true);
             for (MesBom mesBom : mesBoms) {
-                mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, nowTime));
+                mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, nowTime,mesBoms.size()));
             }
             mesProductOffLineRDao.saveAll(mesProductOffLineList);
         }
@@ -1069,7 +1072,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
             String nowTime = TimeTool.getNowTime(true);
             for (MesBom mesBom : mesBomList) {
-                mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, nowTime));
+                mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, nowTime, mesBomList.size()));
             }
             mesProductOffLineRDao.saveAll(mesProductOffLineList);
         }
@@ -1303,7 +1306,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
     }
 
     private MesProductOffLine creatMesProductOffLine(MesWorkOrder mesWorkOrder, MesProductVersion mesProductVersion,
-                                                     String sn, MesBom mesBom, String nowTime) {
+                                                     String sn, MesBom mesBom, String nowTime,Integer bomTotalSize) {
         MesProductOffLine newMesProductOffLine;
         newMesProductOffLine = new MesProductOffLine();
         newMesProductOffLine.setReportPartNo(mesWorkOrder.getPartNo());
@@ -1327,6 +1330,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setSapWorkCenter(mesWorkOrder.getErpWorkCenter());
         newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(nowTime);
+        newMesProductOffLine.setBomTotalSize(bomTotalSize);
         ConvertBean.serviceModelInitialize(newMesProductOffLine, mesWorkOrder.getCreateUser());
         return newMesProductOffLine;
     }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportNoSortStepService.java

@@ -184,6 +184,7 @@ public class MesReportNoSortStepService extends BaseStepService {
                     newMesProductOffLine.setReportType(oldMesWorkOrder.getReportType());
                     newMesProductOffLine.setSapWorkCenter(oldMesWorkOrder.getErpWorkCenter());
                     newMesProductOffLine.setOrganizeCode(oldMesWorkOrder.getOrganizeCode());
+                    newMesProductOffLine.setBomTotalSize(mesBoms.size());
 
                     ConvertBean.serviceModelInitialize(newMesProductOffLine, userName);
                     mesProductOffLineList.add(newMesProductOffLine);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportSortStepService.java

@@ -209,7 +209,10 @@ public class MesReportSortStepService extends BaseStepService {
             }
 
             //保存报工记录
+            if(CollectionUtils.isNotEmpty(mesProductOffLineList)){
+                mesProductOffLineList.forEach(t->t.setBomTotalSize(mesProductOffLineList.size()));
                 mesProductOffLineRDao.saveAll(mesProductOffLineList);
+            }
             //保存移库记录
             mesMoveRDao.saveAll(mesMoveList);
         }