上下文 物料

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

@@ -90,8 +90,11 @@ public interface IMesProductionDispatchContextStepService {
     @ApiOperation(value = "获取上下文零件数据信息")
     Map<String, MesPart> getPartDataContext(StationRequestBean reqBean);
 
+    @ApiOperation(value = "获取上下文零件数据信息")
+    Map<String, MesPartContext> getPartDataExtContext(StationRequestBean reqBean);
+
     @ApiOperation(value = "保存上下文零件数据信息", notes = "[JSON]Map<String, MesPart>")
-    Boolean dispatchPartDataContext(StationRequestBean reqBean, Map<String, MesPart> partDataMap);
+    Boolean dispatchPartDataContext(StationRequestBean reqBean, Map<String, ? extends MesPart> partDataMap);
 
     @ApiOperation(value = "删除上下文零件数据信息")
     void removePartDataContext(StationRequestBean reqBean);

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

@@ -194,9 +194,16 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
         return !StringUtils.isEmpty(partDataJson) ? JSONObject.parseObject(partDataJson, new TypeReference<Map<String, MesPart>>() {}) : null;
     }
 
+    //获取上下文零件数据信息
+    @Override
+    public Map<String, MesPartContext> getPartDataExtContext(StationRequestBean reqBean) {
+        String partDataJson = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.PART_DATA_CONTEXT);
+        return !StringUtils.isEmpty(partDataJson) ? JSONObject.parseObject(partDataJson, new TypeReference<Map<String, MesPartContext>>() {}) : null;
+    }
+
     //保存上下文零件数据信息  [JSON]Map<String, MesPart>
     @Override
-    public Boolean dispatchPartDataContext(StationRequestBean reqBean, Map<String, MesPart> partDataMap) {
+    public Boolean dispatchPartDataContext(StationRequestBean reqBean, Map<String, ? extends MesPart> partDataMap) {
         if (CollectionUtils.isEmpty(partDataMap)) return false;
         return dispatchFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.PART_DATA_CONTEXT, JSONObject.toJSONString(partDataMap));
     }

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.ext.mes.pcn.pojo.context;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.io.Serializable;
+
+/**
+ * 生产过程上下文对象-零件条码(非排序产出零件条码)
+ */
+@Data
+public class MesPartContext extends MesPart implements Serializable {
+
+    private static final long serialVersionUID = -1221271846639577097L;
+
+
+    public MesPartContext(MesPart part) {
+        BeanUtils.copyProperties(part, this);
+    }
+
+
+}