From 8244e9f80977bc3f7121caeebac3644c9d5a5c2a Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Tue, 31 May 2022 17:26:56 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/wms/ReconciliaDetailResultModel.java     | 57 +++++++++++++++
 .../wms/ReconciliaDetailSummaryResultModel.java    | 47 ++++++++++++
 .../pojo/model/wms/ReconciliaQueryModel.java       | 83 ++++++++++++++++++++++
 .../pojo/model/wms/ReconciliaResultModel.java      | 15 ++++
 .../model/wms/ReconciliaSummayResultModel.java     | 48 +++++++++++++
 5 files changed, 250 insertions(+)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
new file mode 100644
index 0000000..c6ef73e
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2022/5/31 0031 下午 16:52
+ */
+@Data
+@ApiModel("对账单明细model")
+public class ReconciliaDetailResultModel  implements Serializable {
+    @ApiModelProperty(name = "物料编号")
+    private String partNo;
+
+
+    @ApiModelProperty(name = "库存地编号")
+    private String zoneNo;
+
+    @ApiModelProperty(name = "仓库存储区编号")
+    private String whNo;
+
+    @ApiModelProperty(name = "业务类型")
+    private Integer busiTypeCode;
+
+    @ApiModelProperty(name = "IQ状态 正常异常")
+    private Integer iQStatus;
+
+    @ApiModelProperty(name = "单号")
+    private String orderNo;
+
+    @ApiModelProperty(name = "单据状态")
+    public Integer orderStatus;
+
+    @ApiModelProperty(name = "库存移动单号")
+    private String moveNo;
+
+    @ApiModelProperty(name = "处理数量")
+    private Double handleQty;
+
+    @ApiModelProperty(name = "移动单状态")
+    private Integer moveItemStatus;
+
+    @ApiModelProperty(name = "movetoerp状态")
+    private Integer moveToERPStatus;
+
+
+    @ApiModelProperty(name = "中间表状态")
+    private Integer middleTableStatus;
+    @ApiModelProperty(name = "oQ状态 正常异常")
+    private Integer oQStatus;
+
+
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java
new file mode 100644
index 0000000..5bbf1f7
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java
@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2022/5/31 0031 下午 16:52
+ */
+@Data
+@ApiModel("对账单查询model")
+public class ReconciliaDetailSummaryResultModel implements Serializable {
+    @ApiModelProperty(name = "物料编号")
+    private String partNo;
+
+
+    @ApiModelProperty(name = "库存地编号")
+    private String zoneNo;
+
+    @ApiModelProperty(name = "来源存储区")
+    private String srcZoneNo;
+
+    @ApiModelProperty(name = "目标存储区")
+    private String destZoneNo;
+
+    @ApiModelProperty(name = "业务类型")
+    private Integer busiTypeCode;
+
+
+    @ApiModelProperty(name = "单据状态")
+    public Integer orderStatus;
+
+    @ApiModelProperty(name = "需求数量")
+    private Double demandQty;
+
+    @ApiModelProperty(name = "处理数量")
+    private Double handleQty;
+
+    @ApiModelProperty(name = "操作时间")
+    private String actionDateTime;
+
+    @ApiModelProperty(name = "创建时间")
+    private String createDateTime;
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
new file mode 100644
index 0000000..d082315
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2022/5/31 0031 下午 16:21
+ */
+@Data
+@ApiModel("对账单查询model")
+public class ReconciliaQueryModel implements Serializable {
+
+    @ApiModelProperty(name = "物料编号")
+    private String partNo;
+
+    @ApiModelProperty(name = "仓库编号")
+    private String whNo;
+
+    @ApiModelProperty(name = "库存地编号")
+    private String zoneNo;
+
+    @ApiModelProperty(name = "wms快照时间")
+    private String wmsSnapshotTime;
+
+    @ApiModelProperty(name = "sap快照时间")
+    private String sapSnapshotTime;
+
+    @ApiModelProperty(name = "业务类型")
+    private Integer busiTypeCode;
+
+    @ApiModelProperty(name = "单号")
+    private String orderNo;
+
+    @ApiModelProperty(name = "单据状态")
+    public Integer orderStatus;
+
+    @ApiModelProperty(name = "来源存储区")
+    private String srcZoneNo;
+
+    @ApiModelProperty(name = "目标存储区")
+    private String destZoneNo;
+
+    @ApiModelProperty(name = "操作开始时间")
+    private String actionStartDateTime;
+
+    @ApiModelProperty(name = "操作结束时间")
+    private String actionEndDateTime;
+
+    @ApiModelProperty(name = "创建开始时间")
+    private String createStartDateTime;
+
+    @ApiModelProperty(name = "创建结束时间")
+    private String createEndDateTime;
+
+    @ApiModelProperty(name = "库存移动单号")
+    private String moveNo;
+
+    @ApiModelProperty(name = "移动单状态")
+    private Integer moveItemStatus;
+
+    @ApiModelProperty(name = "movetoerp状态")
+    private Integer moveToERPStatus;
+
+    @ApiModelProperty(name = "中间表")
+    private String middleTable;
+
+    @ApiModelProperty(name = "中间表状态")
+    private Integer middleTableStatus;
+
+    @ApiModelProperty(name = "是否启用IQ")
+    private Integer iQEnabled;
+
+    @ApiModelProperty(name = "是否启用OQ")
+    private Integer oQEnabled;
+
+    @ApiModelProperty(name = "是否启用软适配")
+    private Integer softswitchEnabled;
+
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java
new file mode 100644
index 0000000..7c790b9
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2022/5/31 0031 下午 16:21
+ */
+@Data
+@ApiModel("对账单结果model")
+public class ReconciliaResultModel implements Serializable {
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java
new file mode 100644
index 0000000..f2ea22f
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2022/5/31 0031 下午 16:52
+ */
+@Data
+@ApiModel("对账单汇总结果model")
+public class ReconciliaSummayResultModel implements Serializable {
+
+    @ApiModelProperty(name = "物料编号")
+    private String partNo;
+
+    @ApiModelProperty(name = "仓库编号")
+    private String whNo;
+
+    @ApiModelProperty(name = "库存地编号")
+    private String zoneNo;
+
+    @ApiModelProperty(name = "wms初始库存")
+    private Double wmsInitialQty;
+
+    @ApiModelProperty(name = "sap初始库存")
+    private Double sapInitialQty;
+
+
+    @ApiModelProperty(name = "wms可用数量")
+    private Double wmsQty;
+
+    @ApiModelProperty(name = "wmsCOGI")
+    private Double wmsCOGI;
+
+    @ApiModelProperty(name = "sap可用数量")
+    private Double sapQty;
+
+
+    @ApiModelProperty(name = "sapCOGI")
+    private Double sapCOGI;
+
+    @ApiModelProperty(name = "差异")
+    private Double stockDifference;
+}

From 10967abd1b33701beb58ec1ba8f3ae4d93be2bfb Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Mon, 6 Jun 2022 09:25:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/wms/ReconciliaDetailResultModel.java     | 27 ++++++-------
 .../pojo/model/wms/ReconciliaQueryModel.java       | 44 +++++++++++-----------
 .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java |  6 +++
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
index c6ef73e..61780ec 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
@@ -13,44 +13,45 @@ import java.io.Serializable;
 @Data
 @ApiModel("对账单明细model")
 public class ReconciliaDetailResultModel  implements Serializable {
-    @ApiModelProperty(name = "物料编号")
+    @ApiModelProperty(notes = "物料编号")
     private String partNo;
 
 
-    @ApiModelProperty(name = "库存地编号")
+    @ApiModelProperty(notes = "库存地编号")
     private String zoneNo;
 
-    @ApiModelProperty(name = "仓库存储区编号")
+    @ApiModelProperty(notes = "仓库存储区编号")
     private String whNo;
 
-    @ApiModelProperty(name = "业务类型")
+    @ApiModelProperty(notes = "业务类型")
     private Integer busiTypeCode;
 
-    @ApiModelProperty(name = "IQ状态 正常异常")
+    @ApiModelProperty(notes = "IQ状态 正常异常")
     private Integer iQStatus;
 
-    @ApiModelProperty(name = "单号")
+    @ApiModelProperty(notes = "单号")
     private String orderNo;
 
-    @ApiModelProperty(name = "单据状态")
+    @ApiModelProperty(notes = "单据状态")
     public Integer orderStatus;
 
-    @ApiModelProperty(name = "库存移动单号")
+    @ApiModelProperty(notes = "库存移动单号")
     private String moveNo;
 
-    @ApiModelProperty(name = "处理数量")
+    @ApiModelProperty(notes = "处理数量")
     private Double handleQty;
 
-    @ApiModelProperty(name = "移动单状态")
+    @ApiModelProperty(notes = "移动单状态")
     private Integer moveItemStatus;
 
-    @ApiModelProperty(name = "movetoerp状态")
+    @ApiModelProperty(notes = "movetoerp状态")
     private Integer moveToERPStatus;
 
 
-    @ApiModelProperty(name = "中间表状态")
+    @ApiModelProperty(notes = "中间表状态")
     private Integer middleTableStatus;
-    @ApiModelProperty(name = "oQ状态 正常异常")
+
+    @ApiModelProperty(notes = "oQ状态 正常异常")
     private Integer oQStatus;
 
 
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
index d082315..3e692ec 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
@@ -14,70 +14,70 @@ import java.io.Serializable;
 @ApiModel("对账单查询model")
 public class ReconciliaQueryModel implements Serializable {
 
-    @ApiModelProperty(name = "物料编号")
+    @ApiModelProperty(notes = "物料编号")
     private String partNo;
 
-    @ApiModelProperty(name = "仓库编号")
+    @ApiModelProperty(notes = "仓库编号")
     private String whNo;
 
-    @ApiModelProperty(name = "库存地编号")
+    @ApiModelProperty(notes = "库存地编号")
     private String zoneNo;
 
-    @ApiModelProperty(name = "wms快照时间")
+    @ApiModelProperty(notes = "wms快照时间")
     private String wmsSnapshotTime;
 
-    @ApiModelProperty(name = "sap快照时间")
+    @ApiModelProperty(notes = "sap快照时间")
     private String sapSnapshotTime;
 
-    @ApiModelProperty(name = "业务类型")
+    @ApiModelProperty(notes = "业务类型")
     private Integer busiTypeCode;
 
-    @ApiModelProperty(name = "单号")
+    @ApiModelProperty(notes = "单号")
     private String orderNo;
 
-    @ApiModelProperty(name = "单据状态")
+    @ApiModelProperty(notes = "单据状态")
     public Integer orderStatus;
 
-    @ApiModelProperty(name = "来源存储区")
+    @ApiModelProperty(notes = "来源存储区")
     private String srcZoneNo;
 
-    @ApiModelProperty(name = "目标存储区")
+    @ApiModelProperty(notes = "目标存储区")
     private String destZoneNo;
 
-    @ApiModelProperty(name = "操作开始时间")
+    @ApiModelProperty(notes = "操作开始时间")
     private String actionStartDateTime;
 
-    @ApiModelProperty(name = "操作结束时间")
+    @ApiModelProperty(notes = "操作结束时间")
     private String actionEndDateTime;
 
-    @ApiModelProperty(name = "创建开始时间")
+    @ApiModelProperty(notes = "创建开始时间")
     private String createStartDateTime;
 
-    @ApiModelProperty(name = "创建结束时间")
+    @ApiModelProperty(notes = "创建结束时间")
     private String createEndDateTime;
 
-    @ApiModelProperty(name = "库存移动单号")
+    @ApiModelProperty(notes = "库存移动单号")
     private String moveNo;
 
-    @ApiModelProperty(name = "移动单状态")
+    @ApiModelProperty(notes = "移动单状态")
     private Integer moveItemStatus;
 
-    @ApiModelProperty(name = "movetoerp状态")
+    @ApiModelProperty(notes = "movetoerp状态")
     private Integer moveToERPStatus;
 
-    @ApiModelProperty(name = "中间表")
+    @ApiModelProperty(notes = "中间表")
     private String middleTable;
 
-    @ApiModelProperty(name = "中间表状态")
+    @ApiModelProperty(notes = "中间表状态")
     private Integer middleTableStatus;
 
-    @ApiModelProperty(name = "是否启用IQ")
+    @ApiModelProperty(notes = "是否启用IQ")
     private Integer iQEnabled;
 
-    @ApiModelProperty(name = "是否启用OQ")
+    @ApiModelProperty(notes = "是否启用OQ")
     private Integer oQEnabled;
 
-    @ApiModelProperty(name = "是否启用软适配")
+    @ApiModelProperty(notes = "是否启用软适配")
     private Integer softswitchEnabled;
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java
index b00ddde..1627caf 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java
@@ -269,4 +269,10 @@ public class WmsStockSnSnapshot extends SnapshotBean {
         this.sumPartQty = sumPartQty;
         this.locateNo = locateNo;
     }
+
+    public WmsStockSnSnapshot(String partNo, String whNo, String zoneNo) {
+        this.partNo = partNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+    }
 }

From 7fd4c36e8836f59c52cd67e73a0d3c5dc3537148 Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Wed, 15 Jun 2022 09:43:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 251 +++++++++++++++++++++
 .../model/wms/ReconciliaDetailResultModel.java     |  32 ++-
 .../wms/ReconciliaDetailSummaryResultModel.java    |  60 ++++-
 .../pojo/model/wms/ReconciliaQueryModel.java       |   6 +-
 .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java  |   8 +
 .../pojo/wms/bean/WmsDocMovementDetails.java       |  10 +
 .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java   |   8 +
 .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java   |   8 +
 8 files changed, 371 insertions(+), 12 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 72f81e1..5b371b0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -9834,6 +9834,257 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 单据在 move To erp 中的状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVE_TO_ERP_STATUS {
+        NOT_CRETED(10, "NOT_CRETED", "未创建"),
+        CREATED(20, "CREATED", "已创建"),
+        SYNCED(30, "IS_SYNC", "已回传"),
+        ;
+
+        private int value;
+        private String code;
+        private String description;
+
+       MOVE_TO_ERP_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static WmsEnumUtil.MOVE_TO_ERP_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 单据在 oq 中的状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OQ_STATUS {
+        NORMAL(10, "NORMAL", "正常"),
+        ABNORMAL(20, "ABNORMAL", "异常"),
+        ;
+
+        private int value;
+        private String code;
+        private String description;
+
+        OQ_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static WmsEnumUtil.OQ_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 单据在 iq 中的状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IQ_STATUS {
+        NORMAL(10, "NORMAL", "正常"),
+        ABNORMAL(20, "ABNORMAL", "异常"),
+        ;
+
+        private int value;
+        private String code;
+        private String description;
+
+        IQ_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static WmsEnumUtil.IQ_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
 
 
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
index 61780ec..1f8f863 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java
@@ -17,11 +17,11 @@ public class ReconciliaDetailResultModel  implements Serializable {
     private String partNo;
 
 
-    @ApiModelProperty(notes = "库存地编号")
-    private String zoneNo;
+    @ApiModelProperty(name = "库存地编号")
+    private String areaNo;
 
-    @ApiModelProperty(notes = "仓库存储区编号")
-    private String whNo;
+    @ApiModelProperty(notes = "存储区编号")
+    private String zoneNo;
 
     @ApiModelProperty(notes = "业务类型")
     private Integer busiTypeCode;
@@ -29,20 +29,20 @@ public class ReconciliaDetailResultModel  implements Serializable {
     @ApiModelProperty(notes = "IQ状态 正常异常")
     private Integer iQStatus;
 
-    @ApiModelProperty(notes = "单号")
-    private String orderNo;
+    @ApiModelProperty(notes = "关联单号")
+    private String refSrcOrderNo;
 
-    @ApiModelProperty(notes = "单据状态")
-    public Integer orderStatus;
+    @ApiModelProperty(notes = "关联单据状态")
+    public Integer refSrcOrderStatus;
 
     @ApiModelProperty(notes = "库存移动单号")
-    private String moveNo;
+    private String moveOrderNo;
 
     @ApiModelProperty(notes = "处理数量")
     private Double handleQty;
 
     @ApiModelProperty(notes = "移动单状态")
-    private Integer moveItemStatus;
+    private Integer moveOrderStatus;
 
     @ApiModelProperty(notes = "movetoerp状态")
     private Integer moveToERPStatus;
@@ -55,4 +55,16 @@ public class ReconciliaDetailResultModel  implements Serializable {
     private Integer oQStatus;
 
 
+    public ReconciliaDetailResultModel(String partNo,String areaNo,String zoneNo,Integer busiTypeCode,String refSrcOrderNo,Integer refSrcOrderStatus,String moveOrderNo,Double handleQty,Integer moveOrderStatus ){
+         this.partNo = partNo;
+         this.areaNo = areaNo;
+         this.zoneNo = zoneNo;
+         this.busiTypeCode = busiTypeCode;
+         this.refSrcOrderNo = refSrcOrderNo;
+         this.refSrcOrderStatus = refSrcOrderStatus;
+         this.moveOrderNo = moveOrderNo;
+         this.handleQty = handleQty;
+         this.moveOrderStatus = moveOrderStatus;
+    }
+
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java
index 5bbf1f7..d742422 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -11,6 +12,7 @@ import java.io.Serializable;
  * @create 2022/5/31 0031 下午 16:52
  */
 @Data
+@NoArgsConstructor
 @ApiModel("对账单查询model")
 public class ReconciliaDetailSummaryResultModel implements Serializable {
     @ApiModelProperty(name = "物料编号")
@@ -18,7 +20,7 @@ public class ReconciliaDetailSummaryResultModel implements Serializable {
 
 
     @ApiModelProperty(name = "库存地编号")
-    private String zoneNo;
+    private String areaNo;
 
     @ApiModelProperty(name = "来源存储区")
     private String srcZoneNo;
@@ -44,4 +46,60 @@ public class ReconciliaDetailSummaryResultModel implements Serializable {
 
     @ApiModelProperty(name = "创建时间")
     private String createDateTime;
+
+    @ApiModelProperty(name = "关联单号")
+    public String refSrc;
+
+
+    @ApiModelProperty(name = "订单号")
+    public String orderNo;
+
+
+    public ReconciliaDetailSummaryResultModel(String partNo,String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,String refSrc,String orderNo){
+        this.partNo = partNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.busiTypeCode = busiTypeCode;
+        this.orderStatus = orderStatus;
+        this.refSrc = refSrc;
+        this.orderNo = orderNo;
+    }
+
+    public ReconciliaDetailSummaryResultModel(Double demandQty){
+        this.demandQty = demandQty;
+    }
+
+    public ReconciliaDetailSummaryResultModel(String partNo,String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,String orderNo,Double handleQty){
+        this.partNo = partNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.busiTypeCode = busiTypeCode;
+        this.orderStatus = orderStatus;
+        this.orderNo = orderNo;
+        this.handleQty = handleQty;
+    }
+    public ReconciliaDetailSummaryResultModel(String partNo,String areaNo, String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,Double demandQty, Double handleQty){
+        this.partNo = partNo;
+        this.areaNo = areaNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.busiTypeCode = busiTypeCode;
+        this.orderStatus = orderStatus;
+        this.demandQty = demandQty;
+        this.handleQty = handleQty;
+    }
+
+    public ReconciliaDetailSummaryResultModel(String partNo, String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,Double demandQty, Double handleQty){
+        this.partNo = partNo;
+        this.areaNo = areaNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.busiTypeCode = busiTypeCode;
+        this.orderStatus = orderStatus;
+        this.demandQty = demandQty;
+        this.handleQty = handleQty;
+    }
+
+
+
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
index 3e692ec..a9bc7fb 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java
@@ -20,8 +20,12 @@ public class ReconciliaQueryModel implements Serializable {
     @ApiModelProperty(notes = "仓库编号")
     private String whNo;
 
+    /**
+     * 库存地
+     * 前端输入，sap中的字段
+     */
     @ApiModelProperty(notes = "库存地编号")
-    private String zoneNo;
+    private String areaNo;
 
     @ApiModelProperty(notes = "wms快照时间")
     private String wmsSnapshotTime;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
index 9cf635d..12dc4b1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
@@ -159,4 +159,12 @@ public class WmsASNMasterDetails extends BaseBean {
         this.planDate = planDate;
         this.planTime = planTime;
     }
+
+    public WmsASNMasterDetails(Double recQty,Double qty,String partNo,String orderNo ,String erpAreaNo){
+        this.recQty = recQty;
+        this.qty = qty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.erpAreaNo = erpAreaNo;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index a381d13..28da699 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -838,4 +838,14 @@ public class WmsDocMovementDetails extends BaseBean {
         this.partNo = partNo;
         this.outQty = outQty;
     }
+
+    public WmsDocMovementDetails(Double recQty,Double qty,String partNo,String orderNo,String srcZoneNo, String destZoneNo ,String areaNo){
+        this.recQty = recQty;
+        this.qty = qty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.srcAreaNo = areaNo;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index 59aa838..6ffa005 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
@@ -296,4 +296,12 @@ public class WmsMoveToERP extends BaseBean {
         this.destAreaNo = destAreaNo;
         this.transQtySum = transQtySum;
     }
+
+    public WmsMoveToERP( Long id, String orderNo, String refSrc, Long sid, Integer isSync) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.refSrc = refSrc;
+        this.shippingId = sid;
+        this.isSync = isSync;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index 006abbd..40f6819 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -370,4 +370,12 @@ public class WmsPOMasterDetails extends BaseBean {
         this.sumRcQty = sumRcQty;
     }
 
+    public WmsPOMasterDetails(Double rcQty,Double qty,String partNo,String orderNo,String erpAreaNo){
+        this.erpAreaNo = erpAreaNo;
+        this.rcQty = rcQty;
+        this.qty = qty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+    }
+
 }

From 7eeadf733b65e63b588c266dfc410ad51d50ceaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com>
Date: Mon, 20 Jun 2022 13:46:46 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?,=E9=97=A8=E6=A8=A1=E4=BD=8D=E7=BD=AE=E5=88=97=EF=BC=88MesPartF?=
 =?UTF-8?q?ormula=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
index efbd139..7fe522e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
@@ -57,4 +57,12 @@ public class MesPartFormula extends BaseBean implements Serializable {
     @ApiParam("参照数量")
     private Integer referQty;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("门模位置")
+    private String produceCtgyCode;
+
 }

From 885bc0fa05fb3512ce68928ab9987a459342265f Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Mon, 20 Jun 2022 15:01:50 +0800
Subject: [PATCH 5/5] =?UTF-8?q?core=20UserModel=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
index 571f83b..c747c11 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
@@ -36,9 +36,18 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value ="登陆名称" , access ="登陆名称")
     private String userLoginName;
 
+    /**
+     * 新增用户和账号时前端输入的 【密码】
+     */
+    @ApiParam(value ="密码")
+    private String password;
+    /**
+     * 新增用户和账号时前端输入的 【确认密码】
+     */
     @ApiParam(value ="登陆密码")
     private String userLoginPassword;
 
+
     @ApiParam(value ="邮箱" , access ="邮箱")
     private String userEmail;