Effort Task #1940 Cost:16h Left:8h

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

@@ -1812,8 +1812,8 @@ public class MesPcnEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单"),
+        REPAIR(70, "返修插单"),
-        EMERGENCY_ORDER(80,"紧急插单");
+        EMERGENCY_ORDER(80, "紧急插单");
 
         private int value;
         private String description;
@@ -2354,16 +2354,14 @@ public class MesPcnEnumUtil {
         }
     }
 
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCE_SN_STATUS {
-
         CREATE(10, "创建"),
         PROCESS(20, "加工"),
         OFFLINE(30, "下线"),
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
-        SHIPING(50, "发运"),
+        SHIPPING(50, "发运"),
         CLOSE(90, "关闭");
 
         private int value;
@@ -3313,6 +3311,41 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 散件IT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SP_SHIPPING_STATUS {
+        CREATE(10, "创建"),
+        SHIPPED(20, "已发运");
+
+        private int value;
+        private String description;
+
+        SP_SHIPPING_STATUS(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)
     public enum FSM_EVENT {
         TRIGGER(10, "trigger", "触发"),

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

@@ -27,7 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "if_queue_shipping")
+@Table(name = "IF_QUEUE_SHIPPING")
 @Api("JIT发运数据同步")
 public class IfQueueShipping extends BaseBean implements Serializable {
 	private static final long serialVersionUID = -3385698810529084423L;
@@ -105,4 +105,20 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("接口代码")
 	private String ifCode;
 
+	@Column(name = "ITEM_PART_NO")
+	@ApiParam("原材料物料号")
+	private String itemPartNo;
+
+	@Column(name = "ITEM_PART_NAME")
+	@ApiParam("原材料物料名称")
+	private String itemPartName;
+
+	@Column(name = "ITEM_QTY")
+	@ApiParam("原材料物料用量")
+	private Double itemQty;
+
+	@Column(name = "ITEM_UNIT")
+	@ApiParam("原材料物料用量")
+	private String itemUnit;
+
 }

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

@@ -70,4 +70,12 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable {
     @Column(name = "qty")
     @ApiParam("数量")
     private Double qty;
+
+    @Column(name = "SEQ")
+    @ApiParam("队列明细序号")
+    private Double seq;
+
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private Double produceColor;
 }

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

@@ -1,12 +1,20 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ButtonBean implements Serializable {
+    private static final long serialVersionUID = -4012120630477190414L;
+
     @ApiParam(value = "按钮代码")
     private String buttonCode;
 

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/26 18:59
+ * @desc
+ */
+@Data
+@Api("散件队列发运model")
+public class SpQueueShippingModel {
+
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @ApiParam("vin")
+    private String vin;
+
+    @ApiParam("车号")
+    private String carNo;
+
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @ApiParam("产品颜色")
+    private Double produceColor;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -53,6 +53,15 @@ public class SysLogSystem extends BaseBean {
         return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
     }
 
+    @Indexed
+    @Column(name="LOG_MODULE_ID")
+    @ApiParam(value ="系统模块（枚举）", example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
+    private Integer logModuleId;
+    public String getLogModuleId() {
+        return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId);
+    }
+
     @Column(name="REMOTE_IP")
     @ApiParam(value ="请求IP" , access ="请求IP")
     private String remoteIp;