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

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

@@ -71,7 +71,6 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
         //从上下文中取出生产线对象
         MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
 
-
         //获取上下文产出零件数据信息集合
         List<MesProductionPartContext> productionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
 

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

@@ -0,0 +1,133 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
+import cn.estsh.i3plus.pojo.mes.repository.MesProductionAssemblyRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description : 保存装配记录工步 【非排序】
+ * @Author : wangjie
+ **/
+@Slf4j
+@Service("mesAssemblySaveNosortStepService")
+public class MesAssemblySaveNosortStepService extends BaseStepService {
+
+    @Autowired
+    private IMesProductionProcessContextStepService productionProcessContextStepService;
+
+    @Autowired
+    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
+
+    @Autowired
+    private MesProductionAssemblyRepository productionAssemblyRepository;
+
+    @Override
+    public StepResult execute(StationRequestBean reqBean) {
+
+        StationResultBean resultBean = new StationResultBean();
+
+        StepResult stepResult = StepResult.getSuccessComplete();
+
+        //获取上下文信息
+        MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
+
+        //配置错误 抛出异常
+        if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
+
+        //存储生产过程上下文对象
+        productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
+
+        //获取上下文产品加工规则数据信息集合
+        List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
+
+        if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前上下文中不存在非排序加工规则数据,请重置工序!");
+
+        //获取上下文产出条码数据信息集合
+        List<MesProductionPsOutContext> productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean);
+
+        if (CollectionUtils.isEmpty(productionPsOutContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "上下文中不存在产出零件条码信息,请重置工序解决!");
+
+        MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
+
+        Map<Integer, MesProductionPsOutContext> ppMap = CollectionUtils.isEmpty(productionPsOutContextList) ? null : productionPsOutContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProductionPsOutContext::getForeignKey, o -> o));
+
+        prodRuleContextList.stream().filter(o -> null != o).forEach(o -> saveProductionAssemblyData(reqBean, resultBean, stepResult, productionProcessContext, o, ppMap, cellEquipContext));
+
+        return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "保存装配记录成功!");
+
+    }
+
+    private void saveProductionAssemblyData(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult,
+                                            MesProductionProcessContext productionProcessContext, MesProdRuleContext prodRuleContext, Map<Integer, MesProductionPsOutContext> ppMap, MesCellEquipContext cellEquipContext) {
+
+        if (StringUtils.isEmpty(prodRuleContext.getAssemblyDataJson())) return;
+
+        List<MesProductionAssemblyNosortContext> productionAssemblyNosortContextList = prodRuleContext.getNosortAssemblyDataContext();
+
+        MesProductionPsOutContext productionPsOutContext = CollectionUtils.isEmpty(ppMap) ? null : ppMap.get(prodRuleContext.getForeignKey());
+
+        for (MesProductionAssemblyNosortContext productionAssemblyNosortContext : productionAssemblyNosortContextList) {
+
+            if (null == productionAssemblyNosortContext) continue;
+
+            MesProductionAssembly productionAssembly = new MesProductionAssembly();
+            BeanUtils.copyProperties(productionAssemblyNosortContext, productionAssembly);
+
+            productionAssembly.setDataSource(MesExtEnumUtil.PRODUCTION_ASSEMBLY_DATA_SOURCE.NOSORT.getValue());
+            productionAssembly.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+
+            productionAssembly.setAreaCode(reqBean.getWorkCenterCode());
+            productionAssembly.setWorkCenterCode(reqBean.getWorkCenterCode());
+            productionAssembly.setWorkCellCode(reqBean.getWorkCellCode());
+            productionAssembly.setProcessCode(reqBean.getProcessCode());
+
+            productionAssembly.setProcessName(productionProcessContext.getProcessName());
+            productionAssembly.setCraftCode(productionProcessContext.getCraftCode());
+            productionAssembly.setCraftName(productionProcessContext.getCraftName());
+
+            productionAssembly.setEquipmentCode(cellEquipContext.getEquipmentCode());
+
+            productionAssembly.setProductionRecordId(prodRuleContext.getProductionRecordId());
+            productionAssembly.setMouldNo(prodRuleContext.getMouldNo());
+
+            if (null != productionPsOutContext) {
+                productionAssembly.setPartNo(productionPsOutContext.getPartNo());
+                productionAssembly.setPartName(productionPsOutContext.getPartName());
+                productionAssembly.setSerialNumber(productionPsOutContext.getSerialNumber());
+                productionAssembly.setProductSn(productionPsOutContext.getProductSn());
+                productionAssembly.setCustSn(productionPsOutContext.getCustSn());
+            }
+
+            //TODO 赋开模记录ID
+            //productionAssembly.setMouldRecordId();
+
+            productionAssembly.setOrganizeCode(reqBean.getOrganizeCode());
+            ConvertBean.serviceModelInitialize(productionAssembly, reqBean.getUserInfo());
+
+            productionAssemblyRepository.insert(productionAssembly);
+
+        }
+
+    }
+
+
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 保存装配记录工步
+ * @Author : wangjie
+ **/
+@Slf4j
+@Service("mesAssemblySaveStepService")
+public class MesAssemblySaveStepService extends BaseStepService {
+
+    @Autowired
+    private IMesProductionProcessContextStepService productionProcessContextStepService;
+
+    @Override
+    public StepResult execute(StationRequestBean reqBean) {
+
+        StationResultBean resultBean = new StationResultBean();
+
+        StepResult stepResult = StepResult.getSuccessComplete();
+
+        //获取上下文信息
+        MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
+
+        //配置错误 抛出异常
+        if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
+
+        //存储生产过程上下文对象
+        productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
+
+        //从上下文中取出生产线对象
+        MesWorkCenter workCenter = productionProcessContext.getWorkCenter();
+
+        //排序线 保存装配记录工步
+        if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == workCenter.getCenterType()) return ((IStepService) SpringContextsUtil.getBean("mesAssemblySaveSortStepService")).execute(reqBean);
+
+        //非排序线 保存装配记录工步
+        return ((IStepService) SpringContextsUtil.getBean("mesAssemblySaveNosortStepService")).execute(reqBean);
+
+    }
+
+}

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

@@ -98,6 +98,7 @@ public class MesMouldRecordGenerateStepService extends BaseStepService {
 
 
             MesProdMouldRecord mesProductionRecord = getMesProdMouldRecord(mesCellEquipContext, mouldNo, mesMouldMappingCfg);
+
             ConvertBean.serviceModelInitialize(mesProductionRecord, reqBean.getUserInfo());
             mesProdMouldRecords.add(mesProductionRecord);
         }

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

@@ -73,7 +73,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
         // 获取加工结果
         String result = mesProductionDispatchContextStepService.getProductResultContext(reqBean);
         // 如果是报废或者可疑，需要编辑条码状态为不合格、并且nc判定需要新增一条记录
-        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getValue(), result)) {
+        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getCode(), result)) {
             return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "加工结果合格,无需记录异常");
         }
         // 获取条码列表
@@ -111,7 +111,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
             partInspection.setPartNo(mesProduceSn.getPartNo());
             partInspection.setPartName(mesProduceSn.getPartName());
             partInspection.setDefectTypeCode(mesDefectType.getDefectTypeCode());
-            partInspection.setInspectionDate(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_FORMATTER));
+            partInspection.setInspectionDate(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MS_PATTERN));
             partInspection.setLotNo(mesProduceSn.getLotNo());
             if (!Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_SCRAP.getValue(), result)) {
                 partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());

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

@@ -31,7 +31,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * @Description : 生成零件条码
+ * @Description : 生成零件条码工步
  * @Author : wangjie
  **/
 @Slf4j

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

@@ -0,0 +1,118 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
+import cn.estsh.i3plus.pojo.mes.repository.MesProductionRecordRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description : 生成加工记录工步
+ * @Author : wangjie
+ **/
+@Slf4j
+@Service("mesProductionRecordGenerateStepService")
+public class MesProductionRecordGenerateStepService extends BaseStepService {
+
+    @Autowired
+    private IMesProductionProcessContextStepService productionProcessContextStepService;
+
+    @Autowired
+    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
+
+    @Autowired
+    private MesProductionRecordRepository productionRecordRepository;
+
+    @Override
+    public StepResult execute(StationRequestBean reqBean) {
+
+        StationResultBean resultBean = new StationResultBean();
+
+        StepResult stepResult = StepResult.getSuccessComplete();
+
+        //获取上下文信息
+        MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
+
+        //配置错误 抛出异常
+        if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
+
+        //存储生产过程上下文对象
+        productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
+
+        //获取上下文产品加工规则数据信息集合
+        List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
+
+        if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前上下文中不存在非排序加工规则数据,请重置工序!");
+
+        //获取上下文产出条码数据信息集合
+        List<MesProductionPsOutContext> productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean);
+
+        if (CollectionUtils.isEmpty(productionPsOutContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "上下文中不存在产出零件条码信息,请重置工序解决!");
+
+        MesEquipVariableCollectContext equipVariableCollectContext = productionDispatchContextStepService.getFirstMouldNoContext(reqBean);
+        if (null == equipVariableCollectContext) equipVariableCollectContext = productionDispatchContextStepService.getMouldNoContext(reqBean);
+
+        MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
+
+        Map<Integer, MesProdRuleContext> prMap = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o));
+
+        String mouldNo = null != equipVariableCollectContext ? equipVariableCollectContext.getEquipVariableValue() : null;
+        productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> saveProductionRecordData(reqBean, resultBean, stepResult, mouldNo, productionProcessContext, o, prMap, cellEquipContext));
+
+        return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "保存装配记录成功!");
+
+
+    }
+
+    private void saveProductionRecordData(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, String mouldNo,
+                                          MesProductionProcessContext productionProcessContext, MesProductionPsOutContext productionPsOutContext, Map<Integer, MesProdRuleContext> prMap, MesCellEquipContext cellEquipContext) {
+
+        MesProdRuleContext prodRuleContext = CollectionUtils.isEmpty(prMap) ? null : prMap.get(productionPsOutContext.getForeignKey());
+
+        MesProductionRecord productionRecord = new MesProductionRecord();
+        BeanUtils.copyProperties(productionPsOutContext, productionRecord);
+
+        productionRecord.setMouldNo(mouldNo);
+        productionRecord.setEquipmentCode(cellEquipContext.getEquipmentCode());
+        productionRecord.setEquipmentName(cellEquipContext.getEquipmentName());
+
+        productionRecord.setReportType(!StringUtils.isEmpty(prodRuleContext.getReportType()) ? prodRuleContext.getReportType() : MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue());
+        if (MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue() != productionRecord.getReportType()) productionRecord.setReportPartNo(productionPsOutContext.getPartNo());
+        productionRecord.setReportStatus(MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue() != productionRecord.getReportType() ? MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue() : MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());
+
+        productionRecord.setModuleStatisticsStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+
+        //TODO 赋开模记录ID
+        //productionRecord.setMouldRecordId();
+        //TODO 工序开始时间
+        //productionRecord.setStartDateTime();
+
+        productionRecord.setIsComplete(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+
+        productionRecord.setOrganizeCode(reqBean.getOrganizeCode());
+        ConvertBean.serviceModelInitialize(productionRecord, reqBean.getUserInfo());
+        productionRecord.setCompleteDateTime(productionRecord.getModifyDatetime());
+
+        productionRecordRepository.insert(productionRecord);
+
+    }
+
+
+}

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

@@ -3,22 +3,20 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext;
-import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdShiftContext;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
-import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
 import cn.estsh.i3plus.pojo.mes.model.StepResult;
-import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesProduceSnRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesProductionRecordRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
@@ -38,7 +36,7 @@ import java.util.List;
  **/
 @Slf4j
 @Service
-public class MesProductionReocrdGenerateStepService extends BaseStepService {
+public class MesProductionReocrdGenerateStepServiceBak extends BaseStepService {
     @Autowired
     private SnowflakeIdMaker snowflakeIdMaker;
 
@@ -126,11 +124,10 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService {
         mesProductionRecord.setProcessCode(mesProduceSn.getProcessCode());
         mesProductionRecord.setReportPartNo(mesProduceSn.getPartNo());
         mesProductionRecord.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue());
-        mesProductionRecord.setShiftCode(mesProduceSn.getShiftCode());
-        mesProductionRecord.setShiftGroup(mesProduceSn.getShiftGroup());
         mesProductionRecord.setWorkOrderNo(mesProduceSn.getWorkOrderNo());
         mesProductionRecord.setWorkCellCode(mesProduceSn.getWorkCellCode());
         mesProductionRecord.setWorkCenterCode(mesProduceSn.getWorkCenterCode());
+
         return mesProductionRecord;
     }
 

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

@@ -1,105 +0,0 @@
-/*
-package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
-
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
-import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
-import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
-import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
-import cn.estsh.i3plus.pojo.mes.model.StepResult;
-import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
-import com.google.common.base.Objects;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-*/
-/**
- * @Description : 保存装配件
- * @Author : zxw
- **//*
-
-@Slf4j
-@Service
-public class MesSaveAssemblyStepService extends BaseStepService {
-    @Autowired
-    private SnowflakeIdMaker snowflakeIdMaker;
-
-    @Autowired
-    private ActorSystem actorSystem;
-
-    @Autowired
-    private IMesProductionProcessContextStepService productionProcessContextStepService;
-
-    @Autowired
-    private MesVariableWhenFinishedReadStepService mesVariableWhenFinishedReadStepService;
-
-    @Autowired
-    private MesMouldRecordGenerateStepService mesMouldRecordGenerateStepService;
-
-    @Autowired
-    private MesProductSnSaveStepService MesProductSnSaveStepService;
-
-    @Autowired
-    private MesProductionReocrdGenerateStepService mesProductionReocrdGenerateStepService;
-
-    @Autowired
-    private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
-
-    @Autowired
-    private MesProductResultErrorHandleStepService mesProductResultErrorHandleStepService;
-
-    @Autowired
-    private MesReportGenerateStepService mesReportGenerateStepService;
-
-    public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT";
-
-    private static final Map<String, ActorRef> refMap = new ConcurrentHashMap<>(200);
-
-    @Override
-    public StepResult execute(StationRequestBean reqBean) {
-        StationResultBean resultBean = new StationResultBean();
-
-        StepResult stepResult = StepResult.getSuccessComplete();
-        */
-/**
-         * 获取上下文
-         *//*
-
-        MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue());
-        MesWorkCell mesWorkCell = productionProcessContext.getWorkCell();
-
-        List<MesProductionPsOutContext> mesProduceSnContexts = mesProductionDispatchContextStepService.getProductionPsOutContext(reqBean);
-
-        List<MesProductionRecord> mesProductionRecords = new ArrayList<>();
-        mesProduceSnContexts.forEach(mesProductionPsOutContext -> {
-
-            MesProductionRecord mesProductionRecord = getMesProductionRecord(productionProcessContext, mesProductionPsOutContext, reqBean);
-            ConvertBean.serviceModelInitialize(mesProductionRecord, reqBean.getUserInfo());
-            mesProductionRecords.add(mesProductionRecord);
-        });
-
-        mesProductionRecordRepository.saveAll(mesProductionRecords);
-        if (Objects.equal(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),mesWorkCell.getIsCountFinish())) {
-            // 保存班次加工数量上下文
-            productionCustomContextStepService.addProductionStatisticsContext(reqBean,mesProduceSnContexts.size());
-        }
-
-        return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "生成加工记录成功");
-  }
-}
-*/

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

@@ -4,24 +4,15 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.model.ActorMessage;
-import cn.estsh.i3plus.mes.pcn.config.SpringExtProvider;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
 import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
 import cn.estsh.i3plus.pojo.mes.model.StepResult;
-import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -51,7 +42,7 @@ public class MesSaveProcessResultStepService extends BaseStepService {
     private MesProductSnSaveStepService MesProductSnSaveStepService;
 
     @Autowired
-    private MesProductionReocrdGenerateStepService mesProductionReocrdGenerateStepService;
+    private MesProductionRecordGenerateStepService mesProductionRecordGenerateStepService;
 
     @Autowired
     private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
@@ -82,7 +73,7 @@ public class MesSaveProcessResultStepService extends BaseStepService {
         /**
          * 生成加工记录工步
          */
-        mesProductionReocrdGenerateStepService.execute(reqBean);
+        mesProductionRecordGenerateStepService.execute(reqBean);
         /**
          * 加工异常处理工步
          */

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesAssemblyShowContext.java

@@ -49,7 +49,6 @@ public class MesAssemblyShowContext implements Serializable {
     @ApiParam("序号")
     private Integer index;
 
-
     public MesAssemblyShowContext index(Integer index){
         this.index = index;
         return this;

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProdRuleContext.java

@@ -30,6 +30,12 @@ public class MesProdRuleContext implements Serializable {
     @ApiParam(name = "数据关联键")
     private Integer foreignKey;
 
+    @ApiParam("加工记录ID")
+    private Long productionRecordId;
+
+    @ApiParam("模具号")
+    private String mouldNo;
+
     @ApiParam(name = "工单号,不一定有值")
     private String workOrderNo;
 
@@ -139,6 +145,11 @@ public class MesProdRuleContext implements Serializable {
         return this;
     }
 
+    public MesProdRuleContext productionRecordId(Long productionRecordId) {
+        this.productionRecordId = productionRecordId;
+        return this;
+    }
+
     public MesProdRuleContext inPartIsEmpty() {
         this.inPartIsEmpty = true;
         return this;

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.ext.mes.pcn.pojo.context;
 
-import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -14,9 +13,6 @@ public class MesProductionAssemblyContext implements Serializable {
 
     private static final long serialVersionUID = 2382117884422723639L;
 
-    @ApiParam("加工记录ID")
-    public Long productionRecordId;
-
     @ApiParam("装配件零件编码")
     public String assemblyPartNo;
 
@@ -26,45 +22,24 @@ public class MesProductionAssemblyContext implements Serializable {
     @ApiParam("装配件条码")
     public String assemblySn;
 
-    @ApiParam("过程条码")
-    public String serialNumber;
-
-    @ApiParam("零件条码")
-    public String productSn;
-
-    @ApiParam("客户条码")
-    public String custSn;
-
     @ApiParam("生产工单零件号")
     public String partNo;
 
     @ApiParam("生产工单零件名称")
     public String partName;
 
-    @ApiParam("装配零件类型")
-    public Integer assemblyPartType;
-
     @ApiParam("装配零件状态")
     public Integer assemblyStatus;
 
     @ApiParam("是否跳过")
     public Integer isSkip;
 
-    @ApiParam("开模记录ID")
-    public String mouldRecordId;
-
-    @ApiParam("模具号")
-    public String mouldNo;
-
     @ApiParam("装配件条码确认方式")
     public Integer matchType;
 
     @ApiParam("扫描规则")
     public String matchRule;
 
-    @ApiParam("数据来源")
-    public Integer dataSource;
-
     @ApiParam("来源ID")
     public Long sourceId;
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java

@@ -33,8 +33,9 @@ public class MesProductionAssemblyNosortContext extends MesProductionAssemblyCon
     public MesProductionAssemblyNosortContext() {}
 
     public MesProductionAssemblyNosortContext copy(MesAssemblyNosortCfg assemblyNosortCfg, MesProdRuleContext prodRuleContext) {
-        if (null != assemblyNosortCfg) BeanUtils.copyProperties(assemblyNosortCfg, this);
+        BeanUtils.copyProperties(assemblyNosortCfg, this);
-        if (null != prodRuleContext) BeanUtils.copyProperties(prodRuleContext, this);
+        BeanUtils.copyProperties(prodRuleContext, this);
+        this.sourceId = assemblyNosortCfg.getId();
         this.partNo = prodRuleContext.getOutPartNo();
         if (StringUtils.isEmpty(this.routeSeq)) this.routeSeq = MesPcnExtConstWords.ZERO;
         this.assemblyStatus = MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue();