From a452a71924a905dfa5904dac0ca43b6a8cf2d85d Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Fri, 10 Jul 2020 18:31:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=209461=20=E5=8C=97=E4=BA=AC=E6=B5=B7?=
 =?UTF-8?q?=E7=BA=B3=E5=B7=9D-=E7=BA=BF=E8=BE=B9=E5=BA=93=E6=8B=89?=
 =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4-0711?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java
index fbc0fe3..001ffe6 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java
@@ -39,10 +39,18 @@ public class IfPickData extends BaseBean implements Serializable {
     @ApiParam("区段编号")
     private String sectionNo;
 
+    @Column(name = "SECTION_TASK_NO")
+    @ApiParam("区段任务编号")
+    private String sectionTaskNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
     private String partNo;
 
+    @Column(name = "BIN位代码")
+    @ApiParam("物料编号")
+    private String binNo;
+
     @Column(name = "QTY")
     @ApiParam("拣货数量")
     private Integer qty;

From c4f8497dda807460fae4908f635a690b356964f7 Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Sat, 11 Jul 2020 14:11:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=20JSON=20=E4=B8=AD=E5=A2=9E=E5=8A=A0=20seq=20=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=8C=E5=8F=91=E5=87=BA=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E6=96=87=E4=BC=9A=E6=8C=89=E7=85=A7=E6=AD=A4=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=94=9F=E5=BA=8F=20=E5=A6=82=E6=9E=9C=E6=9C=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=AD=A4=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=88=99?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=200=EF=BC=8C=E5=8D=B3=E6=97=A0?=
 =?UTF-8?q?=E5=BA=8F=20=E5=A2=9E=E5=8A=A0=E6=AD=A4=E6=AE=B5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java
index c945e71..8a5f846 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java
@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class MappingItem {
+public class MappingItem implements Comparable<MappingItem> {
     /**
      * 来源字段名称
      */
@@ -38,6 +38,11 @@ public class MappingItem {
      */
     public Object defaultValue;
 
+    /**
+     * 字段的顺序号
+     */
+    public int seq;
+
     @Override
     public String toString() {
         return "srcName:"
@@ -45,6 +50,12 @@ public class MappingItem {
                 + this.destBeanName + ", destName"
                 + this.destName + ", defaultValue:"
                 + this.defaultValue + ", destPk:"
-                + this.destPk;
+                + this.destPk + ", seq:"
+                + this.seq;
+    }
+
+    @Override
+    public int compareTo(MappingItem o) {
+        return this.seq - o.seq;
     }
 }