Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -181,7 +181,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             MesPcnException.throwFlowException("还有位置未返工完成,请检查");
         }
         mesReworkTask.setStatus(MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue());
-        mesReworkTaskRepository.update(mesReworkTask);
+        mesReworkTaskRepository.save(mesReworkTask);
     }
 
     @Override
@@ -208,6 +208,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             // 需要新增一条替换条码的记录
             MesProductionAssembly mesProductionRepeatAssembly = new MesProductionAssembly();
             BeanUtils.copyProperties(mesProductionAssembly, mesProductionRepeatAssembly);
+            mesProductionRepeatAssembly.setAssemblySn(requestModel.getSn());
             mesProductionRepeatAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
             mesProductionRepeatAssembly.setId(null);
 

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

@@ -60,6 +60,8 @@ public class MesMouldRecordGenerateStepService extends BaseStepService {
 
         MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue());
         List<MesProduceSn> mesProduceSns = mesProductionDispatchContextStepService.getOutProduceSnDataContext(reqBean);
+        MesEquipVariableCollectContext mesFirstMouldNoCollectContext = mesProductionDispatchContextStepService.getFirstMouldNoContext(reqBean);
+        MesEquipVariableCollectContext mesMouldNoCollectContext = mesProductionDispatchContextStepService.getMouldNoContext(reqBean);
 
         List<MesProdMouldRecord> mesProdMouldRecords = new ArrayList<>();
         for (MesProduceSn mesProduceSn : mesProduceSns) {
@@ -68,8 +70,6 @@ public class MesMouldRecordGenerateStepService extends BaseStepService {
             String equipmentCode = mesCellEquipContext.getEquipmentCode();
 
             String mouldNo = "";
-            MesEquipVariableCollectContext mesFirstMouldNoCollectContext = mesProductionDispatchContextStepService.getFirstMouldNoContext(reqBean);
-            MesEquipVariableCollectContext mesMouldNoCollectContext = mesProductionDispatchContextStepService.getMouldNoContext(reqBean);
 
             if (mesFirstMouldNoCollectContext != null) {
                 mouldNo = mesFirstMouldNoCollectContext.getEquipVariableValue();