合并冲突

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

@@ -546,16 +546,6 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 oldMesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
         }
-        LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty());
-        ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName);
-        oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
-        workOrderExtService.update(oldMesWorkOrder);
-
-        //查询工作中心
-        DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getNumEqualPack(oldMesWorkOrder.getId(), "id", orderPackBean);
-        workOrderRepository.updateByProperties(new String[]{"systemSyncStatus"},
-                new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()}, orderPackBean);
 
         //保存数据
         List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
@@ -578,6 +568,17 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             return;
         }
 
+        LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty());
+        ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName);
+        oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
+        workOrderExtService.update(oldMesWorkOrder);
+
+        //查询工作中心
+        DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(oldMesWorkOrder.getId(), "id", orderPackBean);
+        workOrderRepository.updateByProperties(new String[]{"systemSyncStatus"},
+                new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()}, orderPackBean);
+
         if(!CollectionUtils.isEmpty(mesProductOffLineList)){
             mesProductOffLineRDao.saveAll(mesProductOffLineList);
         }
@@ -648,6 +649,9 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setWorkCenterCode(oldMesWorkOrder.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(oldMesWorkOrder.getWorkCellCode());
         newMesProductOffLine.setReportType(oldMesWorkOrder.getReportType());
+        if (Objects.equals(MesExtEnumUtil.ORDER_TYPE.BTO.getValue(), oldMesWorkOrder.getWorkOrderType())){
+            newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
+        }
         newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
         newMesProductOffLine.setOrganizeCode(oldMesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(productionRecord.getCompleteDateTime());