steop

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

@@ -76,7 +76,8 @@ public class MesAssemblySaveNosortStepService extends BaseStepService {
 
     }
 
-    private void saveProductionAssemblyData(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProdRuleContext prodRuleContext, Map<Integer, MesProductionPsOutContext> ppMap, MesCellEquipContext cellEquipContext) {
+    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;
 

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

@@ -0,0 +1,132 @@
+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.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("mesProductionReocrdGenerateStepService")
+public class MesProductionReocrdGenerateStepService 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(), "上下文中不存在产出零件条码信息,请重置工序解决!");
+
+        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 -> saveProductionReocrdData(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/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;
 

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/MesProductionAssemblyContext.java

@@ -55,4 +55,31 @@ public class MesProductionAssemblyContext implements Serializable {
     @ApiParam(value = "装备序号")
     public Integer routeSeq;
 
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("区域代码")
+    public String areaCode;
+
+    @ApiParam("生产线代码")
+    public String workCenterCode;
+
+    @ApiParam("工位代码")
+    public String workCellCode;
+
+    @ApiParam("设备代码")
+    public String equipmentCode;
+
+    @ApiParam("工序代码")
+    public String processCode;
+
+    @ApiParam("工序名称")
+    public String processName;
+
+    @ApiParam("工艺代码")
+    public String craftCode;
+
+    @ApiParam("工艺名称")
+    public String craftName;
+
 }