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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -11,6 +11,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+    /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TYPE {
+        MONITOR_MODULE(10, "监听组件"),
+        REVEAL_MODULE(10, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * 排序方式

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -13,6 +13,42 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TYPE {
+        MONITOR_MODULE(10, "监听组件"),
+        REVEAL_MODULE(10, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 监听任务明细-采集数据方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2023,7 +2059,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * MesPartCategory实体对应的categoryType值  条码表条码质量状态
+     * MesPartCategory实体对应的categoryType值
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_CATEGORY_TYPE {
@@ -2323,8 +2359,7 @@ public class MesPcnEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
-        CLOSE(90, "关闭"),
+        CLOSE(90, "关闭");
-        ;
 
         private int value;
         private String description;

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

@@ -8,12 +8,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description :JIT发运数据同步
@@ -60,17 +58,34 @@ public class IfQueueShipping extends BaseBean implements Serializable {
     private Double qty;
 
     @Column(name = "SUPPLIER_CODE")
-    @ApiParam("操作人")
+    @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
     @Column(name = "ACTION_DATE_TIME")
     @ApiParam("操作时间")
-    private Date actionDateTime;
+    private String actionDateTime;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线")
     private String workCenterCode;
 
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
     @Column(name = "SYNC_STATUS")
     @ApiParam("同步状态")
     private Integer syncStatus;

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_RAW_PART_DATA")
+@Api("原料上线数据")
+public class IfRawPartData  extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895596L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("原料类型")
+    private String partType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("原料条码")
+    private String serialNumber;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "SRC_LOT_NO")
+    @ApiParam("收货批次")
+    private String srcLotNo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "ORGANIZATION_CODE")
+    @ApiParam("工厂代码")
+    private String organizationCode;
+}

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

@@ -43,6 +43,10 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("vin")
     private String vinCode;
 
+    @Column(name = "CAR_NO")
+    @ApiParam("车号")
+    private String carNo;
+
     @Column(name = "CUST_FLAG_NO")
     @ApiParam("客户标识号")
     private String custFlagNo;
@@ -63,4 +67,12 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户产线代码")
     private String custPlantCode;
 
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -88,4 +89,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @Transient
     @ApiParam("前端显示颜色")
     private String color;
+
+    @Transient
+    @ApiParam("状态执行情况")
+    private StepResult stepResult;
 }

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\10\24 22:04
+ * @Modify:
+ **/
+@Data
+public class PartDismantleModel {
+
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @ApiParam("子物料名称")
+    private String itemPartName;
+
+    @ApiParam("拆解数")
+    private BigDecimal dismantleQty;
+
+    @ApiParam("合格数")
+    private BigDecimal okQty;
+
+    @ApiParam("缺失数")
+    private BigDecimal missQty;
+
+    @ApiParam("报废数")
+    private BigDecimal scrapQty;
+
+}

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

@@ -18,12 +18,20 @@ public class StepResult<T> {
 
     private String msg;
 
+    private boolean needStop;
+
     private StationRequestBean stationRequestBean;
 
     public static StepResult getNonComplete() {
         return new StepResult(false, "");
     }
 
+    public static StepResult getNonCompleteStop() {
+        StepResult result = new StepResult(false, "");
+        result.setNeedStop(true);
+        return result;
+    }
+
     public static StepResult getNonComplete(StationRequestBean requestBean) {
         return new StepResult(false, "");
     }
@@ -36,6 +44,12 @@ public class StepResult<T> {
         return new StepResult(false, reqBean);
     }
 
+    public static <T> StepResult getNonCompleteReqBeanStop(StationRequestBean reqBean) {
+        StepResult stepResult = new StepResult(false, reqBean);
+        stepResult.setNeedStop(true);
+        return stepResult;
+    }
+
     public static <T> StepResult getNonCompleteData(T data) {
         return new StepResult(false, data, "");
     }
@@ -44,6 +58,12 @@ public class StepResult<T> {
         return new StepResult(false, msg);
     }
 
+    public static StepResult getNonCompleteStop(String msg) {
+        StepResult stepResult = new StepResult(false, msg);
+        stepResult.setNeedStop(true);
+        return stepResult;
+    }
+
     public static StepResult getSuccessComplete(String msg) {
         return new StepResult(true, msg);
     }