Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -2,19 +2,16 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -159,7 +156,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @Lob
     @Column(name = "EXTEND")
     @ApiParam("扩展数据")
-    private String extend;
+    public String extend;
 
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
@@ -273,10 +270,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     public String comButtonCode;
 
     @Transient
-    @ApiParam(value = "扩展数据MAP")
-    public Map<String, Object> extendMap;
-
-    @Transient
     @ApiParam("工单源序号")
     private Double srcSeq;
 
@@ -320,15 +313,4 @@ public class MesWorkOrder extends BaseBean implements Serializable {
         return this.approvalStatus == null ? 0 : this.approvalStatus;
     }
 
-    public Map<String, Object> getExtendMap() {
-        try {
-            if (!StringUtils.isEmpty(this.extend)) {
-                return JSONObject.parseObject(this.extend, Map.class);
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            return null;
-        }
-    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java

@@ -55,4 +55,7 @@ public class ButtonComponentReqModel {
     @ApiParam("用户信息")
     private String userInfo;
 
+    @ApiParam("json数据")
+    private String data;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("注塑生产控制MODEL")
+public class InjectionProductionControlModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("当前合格数量")
+    private String standardQtyCur;
+
+    @ApiParam("当前合格数量")
+    private String completeQty;
+
+    @ApiParam("总不合格数量")
+    private String scrapQty;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("数量")
+    private String qty;
+
+    @ApiParam("包装时间")
+    private String createDatetime;
+
+    @ApiParam("箱条码状态")
+    private String printStatusName;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.Transient;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description : 生产工单扩展
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-03-30 13:42
+ * @Modify:
+ **/
+@Data
+@Api(value="生产工单扩展",description = "生产工单扩展")
+public class MesWorkOrderExtendModel extends MesWorkOrder {
+
+    @Transient
+    @ApiParam(value = "扩展数据MAP")
+    public Map<String, Object> extendMap;
+
+    public Map<String, Object> getExtendMap() {
+        try {
+            if (!StringUtils.isEmpty(super.extend)) {
+                return JSONObject.parseObject(super.extend, Map.class);
+            } else {
+                return new HashMap<>();
+            }
+        } catch (Exception e) {
+            return new HashMap<>();
+        }
+    }
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -58,4 +59,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("特殊展示数据")
     private Object specialDisplayData;
+
+    @ApiParam("工位参数")
+    private Map<String, String> wcpcMap = new HashMap<>();
 }