aps-检验订单产品增加合并订单的判断

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -324,7 +324,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             apsProductDetailService.saveOrUpdateBatch(productDetailDoList);
 
             //保存合并订单子表
-            if (ObjectUtil.isNotEmpty(apsProductionMergeOrderDoList)) {
+            if (ObjectUtil.isNotEmpty(apsProductionMergeOrderDoList) && apsProductionMergeOrderDoList.size() > 0) {
                 for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDoList) {
                     apsProductionMergeOrderDo.setTenantid(tenantId);
                 }
@@ -671,10 +671,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                             apsProcessOperationHistoryDo.setId(SecurityUtil.getUUID());
                             apsProcessOperationHistoryService.save(apsProcessOperationHistoryDo);
 
-                            NewSysMindMappingDo newSysMindMappingDo = newSysMindMappingDao.getDataInfo(apsBlankOrderHistoryDo.getId(),apsProcessOperationHistoryDo.getCraftstepid(),apsProcessOperationHistoryDo.getLevel());
+                            NewSysMindMappingDo newSysMindMappingDo = newSysMindMappingDao.getDataInfo(apsBlankOrderHistoryDo.getId(), apsProcessOperationHistoryDo.getCraftstepid(), apsProcessOperationHistoryDo.getLevel());
                             if (newSysMindMappingDo != null) {
                                 //更改newSysMindMappingDo 中的 id 为apsProcessOperationHistoryDo.getId()
-                                newSysMindMappingDao.updateDataInfo(newSysMindMappingDo.getId(),apsProcessOperationHistoryDo.getId());
+                                newSysMindMappingDao.updateDataInfo(newSysMindMappingDo.getId(), apsProcessOperationHistoryDo.getId());
                             }
                             //根据工序作业 id 获取 输出物料 aps_process_operation_out_mater
                             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = apsProcessOperationOutMaterDao.getProcessOperationOutMaterByMainId(apsProcessOperationDo.getId());