上下文key 变更

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionCustomContextStepService.java

@@ -42,15 +42,6 @@ public interface IMesProductionCustomContextStepService {
     @ApiOperation(value = "发送工步内容")
     void sendStepContextMessage(StationRequestBean reqBean, List<StationKvBean> resultList);
 
-    @ApiOperation(value = "获取手动选择的腔数及工单信息上下文")
-    List<StationKvBean> getFunctionChooseCavityOrderContext(StationRequestBean reqBean);
-
-    @ApiOperation(value = "保存选择/扫描/读取的腔数及工单信息上下文", notes = "[StationKvBean(key=cavity, name=腔数, value=3, seq=0), StationKvBean(key=cellMessageSource, name=工位信息来源, value=10, seq=1), StationKvBean(key=workOrderNo, name=加工单, value=工单1;工单2;工单3, seq=2)]")
-    Boolean saveFunctionChooseCavityOrderContext(StationRequestBean reqBean, List<StationKvBean> resultList);
-
-    @ApiOperation(value = "删除手动选择的腔数及工单信息上下文")
-    void deleteFunctionChooseCavityOrderContext(StationRequestBean reqBean);
-
     @ApiOperation(value = "验证上下文班次班组信息是否存在")
     Boolean checkProdShiftDataIsExistContext(String orgainzeCode, String workCenterCode);
 

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java

@@ -180,7 +180,6 @@ public interface IMesProductionDispatchContextStepService {
     @ApiOperation(value = "删除上下文产品加工规则信息集合")
     void deleteProdRuleDataContext(StationRequestBean reqBean);
 
-
     @ApiOperation(value = "获取料桶原材料数据集合")
     List<MesRawPartCharging> getMesRawPartChargingDataContext(StationRequestBean reqBean);
 

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
 import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
+import cn.estsh.i3plus.pojo.mes.model.StationKvBean;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import io.swagger.annotations.ApiOperation;
@@ -101,5 +102,14 @@ public interface IMesProductionProcessContextStepService {
     @ApiOperation(value = "存储设备的装配件清单")
     Boolean saveAssemblyNosortCfgContext(StationRequestBean reqBean, List<MesProductionAssemblyNosortContext> assemblyNosortCfgList);
 
+    @ApiOperation(value = "获取手动选择的腔数及工单信息上下文")
+    List<StationKvBean> getFunctionChooseCavityOrderContext(StationRequestBean reqBean);
+
+    @ApiOperation(value = "保存选择/扫描/读取的腔数及工单信息上下文", notes = "[StationKvBean(key=cavity, name=腔数, value=3, seq=0), StationKvBean(key=cellMessageSource, name=工位信息来源, value=10, seq=1), StationKvBean(key=workOrderNo, name=加工单, value=工单1;工单2;工单3, seq=2)]")
+    Boolean saveFunctionChooseCavityOrderContext(StationRequestBean reqBean, List<StationKvBean> resultList);
+
+    @ApiOperation(value = "删除手动选择的腔数及工单信息上下文")
+    void deleteFunctionChooseCavityOrderContext(StationRequestBean reqBean);
+
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionChooseCavityOrderService.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function;
 
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService;
 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.util.MesPcnExtConstWords;
@@ -37,9 +36,6 @@ public class MesFunctionChooseCavityOrderService extends BaseSwsService implemen
     private IMesProductionProcessContextStepService productionProcessContextStepService;
 
     @Autowired
-    private IMesProductionCustomContextStepService productionCustomContextStepService;
-
-    @Autowired
     private IShippingDispatchService shippingDispatchService;
 
     @Override
@@ -66,7 +62,7 @@ public class MesFunctionChooseCavityOrderService extends BaseSwsService implemen
         }
 
         //保存手动选择的腔数及工单信息上下文
-        productionCustomContextStepService.saveFunctionChooseCavityOrderContext(reqBean, resultList);
+        productionProcessContextStepService.saveFunctionChooseCavityOrderContext(reqBean, resultList);
 
         this.sendMessage(reqBean, resultBean.writeDbLog(), String.format("生产线[%s]工位[%s]%s成功,请等待验证! 提交信息[%s]",
                 reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), buttonDynamicModel.getButtonName(), buttonDynamicModel.getFunctionValue()), MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);

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

@@ -1,6 +1,5 @@
 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.api.busi.IMesWorkOrderExtService;
@@ -42,9 +41,6 @@ public class MesWorkOrderCheckNosortStepService extends MesWorkOrderCheckStepSer
     private IMesProductionDispatchContextStepService productionDispatchContextStepService;
 
     @Autowired
-    private IMesProductionCustomContextStepService productionCustomContextStepService;
-
-    @Autowired
     private IMesWorkOrderExtService workOrderExtService;
 
     @Autowired
@@ -113,7 +109,7 @@ public class MesWorkOrderCheckNosortStepService extends MesWorkOrderCheckStepSer
             return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前上下文中的加工单信息全部为空腔,已清除当前的空腔数据!");
 
         //保存选择/扫描/读取的腔数及工单信息上下文
-        productionCustomContextStepService.saveFunctionChooseCavityOrderContext(reqBean, StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
+        productionProcessContextStepService.saveFunctionChooseCavityOrderContext(reqBean, StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
                 new StationKvBean(MesPcnExtConstWords.CAVITY, "腔数", String.valueOf(productionPartContextList.size())),
                 new StationKvBean(MesPcnExtConstWords.CELL_MESSAGE_SOURCE, "工位信息来源", MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValueStr()),
                 new StationKvBean(MesPcnExtConstWords.WORK_ORDER_NO, "加工单", equipVariableCollectContextList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.joining(MesPcnExtConstWords.SEMICOLON)))));

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

@@ -105,10 +105,10 @@ public class MesWorkOrderScanStepService extends BaseStepService {
     private List<MesEquipVariableCollectContext> doHandleScanWorkOrderNoContext(StationRequestBean reqBean, StepResult stepResult) {
 
         //获取手动选择的腔数及工单信息上下文, 扫描的加工单也会存入其中
-        List<StationKvBean> chooseCavityOrder = productionCustomContextStepService.getFunctionChooseCavityOrderContext(reqBean);
+        List<StationKvBean> chooseCavityOrder = productionProcessContextStepService.getFunctionChooseCavityOrderContext(reqBean);
 
         //删除手动选择的腔数及工单信息上下文
-        if (!CollectionUtils.isEmpty(chooseCavityOrder)) productionCustomContextStepService.deleteFunctionChooseCavityOrderContext(reqBean);
+        if (!CollectionUtils.isEmpty(chooseCavityOrder)) productionProcessContextStepService.deleteFunctionChooseCavityOrderContext(reqBean);
 
         if (CollectionUtils.isEmpty(chooseCavityOrder)) return null;
 

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

@@ -108,36 +108,6 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
         this.sendMessage(reqBean, resultBean);
     }
 
-
-    //手选腔数及工单信息KEY
-    private String getChooseCavityOrderContextKey(StationRequestBean reqBean) { return getFsmBusikey(reqBean, new StringJoiner(MesPcnExtConstWords.COLON).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.FUNCTION_CHOOSE_CAVITY_ORDER).toString()); }
-
-    //获取手动选择的腔数及工单信息上下文
-    @Override
-    public List<StationKvBean> getFunctionChooseCavityOrderContext(StationRequestBean reqBean) {
-        String chooseCavityOrderJson = getFsmBusiData(reqBean.getOrganizeCode(), getChooseCavityOrderContextKey(reqBean));
-        return !StringUtils.isEmpty(chooseCavityOrderJson) ? JSONObject.parseArray(chooseCavityOrderJson, StationKvBean.class) : null;
-    }
-
-    //保存选择/扫描/读取的腔数及工单信息上下文   腔数=工单个数  数据格式: [StationKvBean(key=cavity, name=腔数, value=3, seq=0), StationKvBean(key=cellMessageSource, name=工位信息来源, value=10, seq=1), StationKvBean(key=workOrderNo, name=加工单, value=工单1;工单2;工单3, seq=2)]
-    @Override
-    public Boolean saveFunctionChooseCavityOrderContext(StationRequestBean reqBean, List<StationKvBean> resultList) {
-        if (CollectionUtils.isEmpty(resultList)) return false;
-        return saveFsmBusiData(reqBean.getOrganizeCode(), getChooseCavityOrderContextKey(reqBean), JSONObject.toJSONString(resultList));
-    }
-
-    //删除手动选择的腔数及工单信息上下文
-    @Override
-    public void deleteFunctionChooseCavityOrderContext(StationRequestBean reqBean) {
-        deleteFsmBusiData(reqBean.getOrganizeCode(), getChooseCavityOrderContextKey(reqBean));
-    }
-
-    //开班信息KEY 【PS:生产线级别】
-    private String getProdShiftContextKey(String orgainzeCode, String workCenterCode) { return new StringJoiner(MesPcnExtConstWords.COLON).add(orgainzeCode).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.PROD_SHIFT_DATA_CONTEXT).add(workCenterCode).toString(); }
-
-
-
-
     //获取生产线的当前班组班次信息
     @Override
     public MesProdShiftContext getMesProdShiftKvBean(String orgainzeCode, String workCenterCode) {
@@ -155,21 +125,20 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
         return  mesProdShiftContext;
     }
 
-    //加工次数key
+    //开班信息KEY 【PS:生产线级别】
-    private String getProductionStatisticsContextKey(StationRequestBean reqBean) { return getFsmBusikey(reqBean, new StringJoiner(MesPcnExtConstWords.COLON).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.PRODUCTION_COUNT_CONTEXT).toString()); }
+    private String getProdShiftContextKey(String orgainzeCode, String workCenterCode) { return new StringJoiner(MesPcnExtConstWords.COLON).add(orgainzeCode).add(MesPcnExtConstWords.PROD_SHIFT_DATA_CONTEXT).add(workCenterCode).toString(); }
-
 
     //获取上下文班次班组信息
     @Override
     public List<StationKvBean> getProdShiftDataContext(String orgainzeCode, String workCenterCode) {
-        String prodShiftJson = getFsmBusiData(orgainzeCode, getProdShiftContextKey(orgainzeCode, MesPcnExtConstWords.PROD_SHIFT_DATA_CONTEXT), workCenterCode);
+        String prodShiftJson = getFsmBusiData(orgainzeCode, getProdShiftContextKey(orgainzeCode, workCenterCode));
         return !StringUtils.isEmpty(prodShiftJson) ? JSONObject.parseArray(prodShiftJson, StationKvBean.class) : null;
     }
 
     //验证上下文班次班组信息是否存在
     @Override
     public Boolean checkProdShiftDataIsExistContext(String orgainzeCode, String workCenterCode) {
-        String prodShiftJson = getFsmBusiData(orgainzeCode, getProdShiftContextKey(orgainzeCode, MesPcnExtConstWords.PROD_SHIFT_DATA_CONTEXT), workCenterCode);
+        String prodShiftJson = getFsmBusiData(orgainzeCode, getProdShiftContextKey(orgainzeCode, workCenterCode));
         return !StringUtils.isEmpty(prodShiftJson) ? true : false;
     }
 
@@ -177,19 +146,22 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
     @Override
     public Boolean saveProdShiftDataContext(String organizeCode, String workCenterCode, List<StationKvBean> prodShiftDataList) {
         if (CollectionUtils.isEmpty(prodShiftDataList)) return false;
-        return saveFsmBusiData(organizeCode, getProdShiftContextKey(organizeCode, MesPcnExtConstWords.PROD_SHIFT_DATA_CONTEXT), workCenterCode, JSONObject.toJSONString(prodShiftDataList));
+        return saveFsmBusiData(organizeCode, getProdShiftContextKey(organizeCode, workCenterCode), JSONObject.toJSONString(prodShiftDataList));
     }
 
     //删除上下文班次班组信息
     @Override
     public void deleteProdShiftDataContext(String orgainzeCode, String workCenterCode) {
-        deleteFsmBusiData(orgainzeCode, getProdShiftContextKey(orgainzeCode, MesPcnExtConstWords.PROD_SHIFT_DATA_CONTEXT), workCenterCode);
+        deleteFsmBusiData(orgainzeCode, getProdShiftContextKey(orgainzeCode, workCenterCode));
     }
 
+    //加工次数key
+    private String getProductionStatisticsContextKey(StationRequestBean reqBean) { return getFsmBusikey(reqBean, new StringJoiner(MesPcnExtConstWords.COLON).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.PRODUCTION_STATISTICS_CONTEXT).toString()); }
+
     //获取上下文工位加工数统计信息
     @Override
     public List<StationKvBean> getProductionStatisticsContext(StationRequestBean reqBean) {
-        String productionStatisticsJson = getFsmBusiData(reqBean.getOrganizeCode(), getProductionStatisticsContextKey(reqBean), MesPcnExtConstWords.PRODUCTION_STATISTICS_CONTEXT);
+        String productionStatisticsJson = getFsmBusiData(reqBean.getOrganizeCode(), getProductionStatisticsContextKey(reqBean));
         return !StringUtils.isEmpty(productionStatisticsJson) ? JSONObject.parseArray(productionStatisticsJson, StationKvBean.class) : null;
     }
 
@@ -197,7 +169,13 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
     @Override
     public Boolean saveProductionStatisticsContext(StationRequestBean reqBean, List<StationKvBean> productionStatisticsList) {
         if (CollectionUtils.isEmpty(productionStatisticsList)) return false;
-        return saveFsmBusiData(reqBean.getOrganizeCode(), getProductionStatisticsContextKey(reqBean), MesPcnExtConstWords.PRODUCTION_STATISTICS_CONTEXT, JSONObject.toJSONString(productionStatisticsList));
+        return saveFsmBusiData(reqBean.getOrganizeCode(), getProductionStatisticsContextKey(reqBean), JSONObject.toJSONString(productionStatisticsList));
+    }
+
+    //删除上下文工位加工数统计信息
+    @Override
+    public void deleteProductionStatisticsContext(StationRequestBean reqBean) {
+        deleteFsmBusiData(reqBean.getOrganizeCode(), getProductionStatisticsContextKey(reqBean));
     }
 
     @Override
@@ -224,16 +202,9 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
         return  true;
     }
 
-    //删除上下文工位加工数统计信息
+    //可复用条码KEY
-    @Override
-    public void deleteProductionStatisticsContext(StationRequestBean reqBean) {
-        deleteFsmBusiData(reqBean.getOrganizeCode(), getProductionStatisticsContextKey(reqBean), MesPcnExtConstWords.PRODUCTION_STATISTICS_CONTEXT);
-    }
-
-
-    //工位加工锁KEY
     private String getRepeatAssemblySnContextKey(String organizeCode, String workCenterCode, String workCellCode) {
-        return new StringJoiner(MesPcnExtConstWords.COLON).add(organizeCode).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.REPEAT_ASSEMBLY_SN_CONTEXT).add(workCenterCode).add(workCellCode).toString();
+        return new StringJoiner(":").add(organizeCode).add(workCenterCode).add(workCellCode).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.REPEAT_ASSEMBLY_SN_CONTEXT).toString();
     }
 
     //根据装配件规则ID获取可复用条码

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

@@ -30,8 +30,6 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
 
     private String getContextKey(StationRequestBean reqBean) { return getFsmBusikey(reqBean, new StringJoiner(MesPcnExtConstWords.COLON).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.BUSI_DATA_CONTEXT).toString()); }
 
-    private String getContextKey(String organizeCode, String busiCode) { return new StringJoiner(":").add(organizeCode).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(busiCode).toString(); }
-
     //清除上下文中的所有业务数据
     @Override
     public void doFlushProductionDispatchContext(StationRequestBean reqBean) {
@@ -397,21 +395,25 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
     public void deleteProdRuleDataContext(StationRequestBean reqBean) {
         deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.PROD_RULE_DATA_CONTEXT);
     }
+
+    //获取料桶原材料数据集合
     @Override
     public List<MesRawPartCharging> getMesRawPartChargingDataContext(StationRequestBean reqBean) {
-        String mesRawPartChargingDataJson = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), "RAW_PART_CHARGING_DATA_CONTEXT");
+        String mesRawPartChargingDataJson = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.RAW_PART_CHARGING_DATA_CONTEXT);
         return !StringUtils.isEmpty(mesRawPartChargingDataJson) ? JSONObject.parseArray(mesRawPartChargingDataJson, MesRawPartCharging.class) : null;
     }
 
+    //保存料桶原材料数据集合
     @Override
     public Boolean saveMesRawPartChargingDataContext(StationRequestBean reqBean, List<MesRawPartCharging> mesRawPartChargingList) {
         if (CollectionUtils.isEmpty(mesRawPartChargingList)) return false;
-        return saveFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), "RAW_PART_CHARGING_DATA_CONTEXT", JSONObject.toJSONString(mesRawPartChargingList));
+        return saveFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.RAW_PART_CHARGING_DATA_CONTEXT, JSONObject.toJSONString(mesRawPartChargingList));
     }
 
+    //删除料桶原材料数据集合
     @Override
     public void deleteMesRawPartChargingDataContext(StationRequestBean reqBean) {
-        deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), "RAW_PART_CHARGING_DATA_CONTEXT");
+        deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.RAW_PART_CHARGING_DATA_CONTEXT);
     }
 
 }

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

@@ -11,6 +11,7 @@ import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.IFsmRouteDataService;
 import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
 import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.model.StationKvBean;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -342,4 +343,24 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
         return saveFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.ASSEMBLY_NOSORT_CFG_CONTEXT, JSONObject.toJSONString(assemblyNosortCfgList));
     }
 
+    //获取手动选择的腔数及工单信息上下文
+    @Override
+    public List<StationKvBean> getFunctionChooseCavityOrderContext(StationRequestBean reqBean) {
+        String chooseCavityOrderJson = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FUNCTION_CHOOSE_CAVITY_ORDER);
+        return !StringUtils.isEmpty(chooseCavityOrderJson) ? JSONObject.parseArray(chooseCavityOrderJson, StationKvBean.class) : null;
+    }
+
+    //保存选择/扫描/读取的腔数及工单信息上下文   腔数=工单个数  数据格式: [StationKvBean(key=cavity, name=腔数, value=3, seq=0), StationKvBean(key=cellMessageSource, name=工位信息来源, value=10, seq=1), StationKvBean(key=workOrderNo, name=加工单, value=工单1;工单2;工单3, seq=2)]
+    @Override
+    public Boolean saveFunctionChooseCavityOrderContext(StationRequestBean reqBean, List<StationKvBean> resultList) {
+        if (CollectionUtils.isEmpty(resultList)) return false;
+        return saveFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FUNCTION_CHOOSE_CAVITY_ORDER, JSONObject.toJSONString(resultList));
+    }
+
+    //删除手动选择的腔数及工单信息上下文
+    @Override
+    public void deleteFunctionChooseCavityOrderContext(StationRequestBean reqBean) {
+        deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FUNCTION_CHOOSE_CAVITY_ORDER);
+    }
+
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -265,8 +265,6 @@ public class MesPcnExtConstWords {
     public static final String ASSEMBLY_NOSORT_CFG_CONTEXT = "ASSEMBLY_NOSORT_CFG_CONTEXT";
     // 生产过程控制工位加工锁
     public static final String PRODUCTION_LOCK_CONTEXT = "PRODUCTION_LOCK_CONTEXT";
-    // 生产过程控制工位加工锁
-    public static final String PRODUCTION_COUNT_CONTEXT = "PRODUCTION_COUNT_CONTEXT";
     // 历史扫描信息
     public static final String LAST_SCAN_INFO_CONTEXT = "LAST_SCAN_INFO_CONTEXT";
     // 上下文: 班次班组信息
@@ -304,6 +302,8 @@ public class MesPcnExtConstWords {
     public static final String PRODUCTION_PS_IN_CONTEXT = "PRODUCTION_PS_IN_CONTEXT";
     // 上下文: 产出条码数据信息
     public static final String PRODUCTION_PS_OUT_CONTEXT = "PRODUCTION_PS_OUT_CONTEXT";
+    // 上下文: 料桶原材料数据
+    public static final String RAW_PART_CHARGING_DATA_CONTEXT = "RAW_PART_CHARGING_DATA_CONTEXT";
 
 
     //OPC_API_PARAM