Merge branch 'dev' into test

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

@@ -1370,8 +1370,14 @@ public class MesEnumUtil {
         MES_QC_CHECK_STANDARD(250, "质量检测标准"),
         MES_FAULT_CAUSE(260,"设备故障原因"),
         MES_FAULT_METHOD(270,"设备故障处理措施"),
-        MES_FAULT_PHENOMENON(280,"设备故障现象");
-
+        MES_FAULT_PHENOMENON(280,"设备故障现象"),
+        MES_DEFECT(290,"缺陷"),
+        MES_DEFECT_CAUSE(300,"缺陷原因"),
+        MES_SCRAP(310,"报废原因"),
+        MES_REPAIR(320,"质量数据处理措施"),
+        MES_EQU_TASK_PLAN(330,"设备作业周期计划"),
+        MES_PART_OJBECT(340,"物料对象"),
+        MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元");
 
         private int value;
         private String description;

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

@@ -1015,6 +1015,62 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 业务表：库存条码状态
+     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CARRIAGE_STATUS {
+        CREATE(10, "创建"),
+        PUBLISH(20, "发布"),
+        RECEIVE(30, "承运商接收"),
+        ARRIVE(40, "车辆到达"),
+        INSTALL(50, "装车完成"),
+        CARRIAGE_IN(60, "运输中"),
+        CLOSE(70, "已关单");
+
+        private int value;
+        private String description;
+
+        CARRIAGE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * 单据是否生成任务状态
      */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -179,6 +179,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     public String title;
 
+    @Column(name = "TAG")
+    @ApiParam(value = "标签")
+    private String tag;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 车辆信息
@@ -71,7 +72,7 @@ public class WmsTmsShippingExt extends BaseBean {
 
     @Column(name="ORDER_STATUS")
     @ApiParam(value ="单据状态")
-    private String orderStatus;
+    private Integer orderStatus;
 
     @Column(name="CUST_NAME")
     @ApiParam(value ="客户名称RDD")
@@ -97,4 +98,9 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam(value =" 申请部门")
     private String depart;
 
+
+    @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :公共父类入参
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-07 16:06
+ * @Modify:
+ **/
+@Data
+public class BaseDto {
+
+
+}
+

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java

@@ -8,44 +8,29 @@ import javax.persistence.Transient;
 import java.io.Serializable;
 
 @Data
-public class WmsCarDto implements Serializable {
+public class WmsCarDto extends BaseDto implements Serializable {
 
     @Column(name="CAR_NO")
     @ApiParam(value ="车牌号")
     private String carNo;
 
-    @Column(name="CAR_DESC")
-    @ApiParam(value ="车辆描述")
-    private String carDesc;
-
-    @Column(name="MAX_CAPACITY")
-    @ApiParam(value ="载重量(KG)")
-    private String maxCapacity;
 
     @Column(name="DRIVER_NO")
     @ApiParam(value ="默认驾驶员")
     private String driverNo;
 
-    @Column(name="PHONE")
-    @ApiParam(value ="车主电话")
-    private String phone;
 
     @Column(name="VENDOR_NO")
     @ApiParam(value ="所属供应商")
     private String vendorNo;
+    @ApiParam("是否删除，默认否")
 
-    @Transient
-    @ApiParam("司机名称")
-    private String driverNameRdd;
+    protected Integer isDeleted = 2;
 
-    @Transient
-    @ApiParam(value = "供应商名称")
-    private String vendorNameRdd;
+    @ApiParam("是否有效，默认是")
+    protected Integer isValid = 1;
 
-    @ApiParam(value = "是否删除，默认否")
-    private Integer isDeleted = 2;
+    protected String organizeCode;
 
-    @ApiParam("是否有效，默认是")
-    private Integer isValid = 1;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java

@@ -6,8 +6,15 @@ import lombok.Data;
 import javax.persistence.Column;
 import java.io.Serializable;
 
+/**
+ * @Description :驾驶员入参
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-07 16:06
+ * @Modify:
+ **/
 @Data
-public class WmsTmsDriverDto implements Serializable {
+public class WmsTmsDriverDto extends BaseDto implements Serializable {
 
     @Column(name="DRIVER_NO")
     @ApiParam(value ="驾驶员编号")
@@ -17,33 +24,15 @@ public class WmsTmsDriverDto implements Serializable {
     @ApiParam(value ="驾驶员姓名")
     private String driverName;
 
-    @Column(name="SEX")
-    @ApiParam(value ="驾驶员性别")
-    private Integer sex;
-
-    @Column(name="AGE")
-    @ApiParam(value ="驾驶员年龄")
-    private String age;
-
-    @Column(name="ID_NO")
-    @ApiParam(value ="驾驶员身份证号")
-    private String idNo;
-
-    @Column(name="ADRESS")
-    @ApiParam(value ="驾驶员籍贯")
-    private String adress;
-
-    @Column(name="PHONE")
-    @ApiParam(value ="车牌号")
-    private String phone;
-
     @Column(name="LOGIN_NO")
     @ApiParam(value =" 登录账号")
     private String loginNo;
 
     @ApiParam("是否删除，默认否")
-    private Integer isDeleted = 2;
+    protected Integer isDeleted = 2;
 
     @ApiParam("是否有效，默认是")
-    private Integer isValid = 1;
+    protected Integer isValid = 1;
+
+    protected String organizeCode;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :装车单入参
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-07 16:06
+ * @Modify:
+ **/
+@Api("装车单入参")
+@Data
+public class WmsTmsShipDto extends BaseDto implements Serializable {
+
+    @ApiParam("物料号")
+    private String partNo;
+    @ApiParam("运输状态")
+    private String carriageStatus;
+    @ApiParam("单据号")
+    private String orderNo;
+
+    @ApiParam("是否删除，默认否")
+    protected Integer isDeleted = 2;
+
+    @ApiParam("是否有效，默认是")
+    protected Integer isValid = 1;
+
+    @ApiParam("工厂代码")
+    protected String organizeCode;
+}