Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;

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;
     }
 }