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

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -49,6 +49,9 @@ public class WmsStockFifoModel {
     @ApiParam("FIFO查询获取方式")
     private Integer fifoSnByLood;
 
+    @ApiParam("过滤FIFO锁定条码")
+    private Integer filterFifoLockSn;
+
     @ApiParam("物料条码信息")
     Map<String, List<WmsStockSn>> snMap = new HashMap<>();
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "预计到货时间 结束时间")
     private String expectedTimeEnd;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -78,7 +78,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
 
     @Column(name = "SNP_QTY")
     @ColumnDefault("0")
-    @ApiParam(value = "默认包装规格", example = "0")
+    @ApiParam(value = "包装数量", example = "0")
     private Double snpQty;
 
     @Column(name = "PRINT_QTY")

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

@@ -250,6 +250,9 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long sumDelayCount;
 
+    @ApiParam(value = "延迟到货百分比")
+    private String delayPercent;
+
     @ApiParam("计划交货时间")
     private String planPlanDateTime;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java

@@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil {
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
         WMS2MES(40, "WMS2MES", "WMS --> MES"),
         SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"),
+        SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"),
         WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"),
         SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB");
 
@@ -61,6 +62,7 @@ public class WmsInterfaceEnumUtil {
 
         /**
          * -1 不在范围内
+         *
          * @param desc
          * @return
          */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java

@@ -36,7 +36,7 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     private Long sumDelayCount;
 
     @ApiParam(value = "延迟到货百分比")
-    private Double delayPercent;
+    private String delayPercent;
 
     @ApiParam(value = "查询开始时间")
     private String startDateTime;
@@ -85,4 +85,5 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     public WmsVendorDelayMasterModel() {
 
     }
+
 }