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

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

@@ -145,8 +145,8 @@ public class SwebEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_TYPE {
-        CREATE(10, "标准包装"),
-        RECEIPT(20, "非标包装");
+        STANDARD(10, "标准包装"),
+        NON_STANDARD(20, "非标包装");
 
         private int value;
         private String description;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java

@@ -17,6 +17,9 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class SwebLoginUserModel implements Serializable {
 
+    @ApiParam(value = "用户ID")
+    private Long id;
+
     @ApiParam(value = "用户名")
     private String userName;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.util.List;
+import javax.persistence.Transient;
 import java.util.Map;
 
 /**
@@ -46,10 +46,14 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
     @Column(name = "ITEM_STATUS")
     private Integer itemStatus;
 
-    @ApiParam(value = "订单类型", example = "1")
+    @ApiParam(value = "订单类型", example = "10")
     @Column(name = "ORDER_TYPE")
     public Integer orderType;
 
     @ApiParam(value = "时间数量列表", example = "1")
-    public List<Map<String,Double>> timeList;
+    public Map<String, Double> timeObject;
+
+    @Transient
+    @ApiParam(value = "是否可编辑（前端使用）")
+    public boolean isSet = false;
 }

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

@@ -127,7 +127,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "打印时间")
     private String printDate;
 
-    public Integer getIsSn() {
-        return isSn == null ? 0 : this.getIsSn();
-    }
+//    public Integer getIsSn() {
+////        return isSn == null ? 0 : this.getIsSn();
+////    }
 }

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

@@ -77,4 +77,7 @@ public class WmsTaskInfo extends BaseBean {
     @Transient
     public List<WmsTaskDetails> taskDetailsList;
 
+    @Column(name = "IS_CHECK_SN")
+    @ApiParam("是否校验条码")
+    public Integer isCheckSn;
 }