【Bug清单】------------------------------

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

@@ -1347,6 +1347,45 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+    /**
+     * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMSSHIPPING_ORDER_STATUS {
+        CREATE(10, "新建"),
+        PENDING(20, "已处理"),
+        ERROR(30, "处理出错");
+
+        private int value;
+        private String description;
+
+        WMSSHIPPING_ORDER_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);
+        }
+    }
 
     /**
      * 库存移动单明细状态

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

@@ -30,7 +30,7 @@ import javax.persistence.*;
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "PART_NO")
 })
-@Api("库存移动单主表信息")
+@Api("库存移动单处理成功后的记录")
 public class WmsMoveToERP extends BaseBean {
 
     private static final long serialVersionUID = -6223527594941733060L;

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+@Data
+public class WmsCarDto 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;
+
+    @Transient
+    @ApiParam("司机名称")
+    private String driverNameRdd;
+
+    @Transient
+    @ApiParam(value = "供应商名称")
+    private String vendorNameRdd;
+
+    @ApiParam(value = "是否删除，默认否")
+    private Integer isDeleted = 2;
+
+    @ApiParam("是否有效，默认是")
+    private Integer isValid = 1;
+
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+@Data
+public class WmsTmsDriverDto implements Serializable {
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="驾驶员编号")
+    private String driverNo;
+
+    @Column(name="DRIVER_NAME")
+    @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;
+
+    @ApiParam("是否有效，默认是")
+    private Integer isValid = 1;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -44,14 +44,14 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-        // 封装有效状态、删除状态、创建人和创建时间
-        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
-        DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
         if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
+        // 封装有效状态、删除状态、创建人和创建时间
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         return hqlStr;
     }