Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 零件消耗数量模型
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/7/1 14:40
+ * @Modify:
+ **/
+@Data
+public class PartConsumeCountModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("消耗数量")
+    private Integer consumeQty;
+
+    @ApiParam("需求数量")
+    private Integer demandQty;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.platform;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
@@ -39,12 +41,13 @@ public class AccountExportModel implements Serializable {
     @ApiModelProperty(value ="部门名称" , access ="部门名称")
     private String departmentNameRdd;
 
-    @ApiParam(value = "登录次数", example = "0")
+    @ApiModelProperty(value = "登录次数", example = "0")
     private Integer userLoginNum;
 
-    @ApiParam(value = "账号最后登录时间")
+    @ApiModelProperty(value = "账号最后登录时间")
     private String userLoginLastDateTime;
 
-    @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1")
+    @ApiModelProperty(value ="账号状态" , example ="-1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class)
     private Integer userStatus;
 }

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

@@ -517,6 +517,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("完成时间")
     public String complateDateTime;
 
+    @Transient
+    @ApiParam("供应商名称")
+    public String vendorName;
+
+    @Transient
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
 
 
 

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

@@ -37,7 +37,7 @@ public class WmsECartOrderNoBuild extends BaseBean {
     @Column(name = "CREATE_DATE")
     @ApiParam(value = "创建日期")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String creatDate;
+    private String createDate;
 
     @Column(name = "SERIAL_NO")
     @ApiParam(value = "序列号")
@@ -47,26 +47,16 @@ public class WmsECartOrderNoBuild extends BaseBean {
     @Column(name = "DEST_LOCATE_NO")
     @ApiParam(value = "目标库位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private Integer destLocateNo;
+    private String destLocateNo;
 
     @Column(name = "SRC_ZONE_NO")
     @ApiParam(value = "源存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private Integer srcZoneNo;
+    private String srcZoneNo;
 
-    public Integer getUnitPrecisionValue(){
+    public WmsECartOrderNoBuild(String partNo, String createDate, Integer serialNo, String destLocateNo, String srcZoneNo) {
-        return this.serialNo == null?0:this.serialNo.intValue();
-    }
-
-    public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo) {
-        this.partNo = partNo;
-        this.creatDate = creatDate;
-        this.serialNo = serialNo;
-    }
-
-    public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo, Integer destLocateNo, Integer srcZoneNo) {
         this.partNo = partNo;
-        this.creatDate = creatDate;
+        this.createDate = createDate;
         this.serialNo = serialNo;
         this.destLocateNo = destLocateNo;
         this.srcZoneNo = srcZoneNo;