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

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.sweb.bean.*;
 import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -66,6 +67,32 @@ public class SwebHqlPack {
         return buildHql(purchaseOrder, result);
     }
 
+    public static DdlPackBean getPurchaseOrderForSnPrintWhereHql(SwebPurchaseOrder purchaseOrder, List<String> vendorNos) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
+        if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
+            DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
+        } else {
+            DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+        }
+        if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
+            DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
+                    purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
+        }
+
+        List<Integer> poStatus = new ArrayList<>();
+        poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue());
+        poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue());
+        poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue());
+        //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue());
+        DdlPreparedPack.getInPackList(poStatus, "poStatus", result);
+
+        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(purchaseOrder, result);
+    }
+
     public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);

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

@@ -70,4 +70,9 @@ public class BasCustomer extends BaseBean {
     @ApiParam(value = "传真")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custFax;
+
+    @Column(name = "SAFETY_STOCK")
+    @ApiParam(value = "安全库存")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    private Double safetyStock;
 }

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

@@ -197,6 +197,20 @@ public class WmsDocFgDetail extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description")
     private Integer productStatus;
 
+    @Column(name = "CURRENT_SEQ")
+    @ApiParam(value = "当前序号")
+    private Integer currentSeq;
+
+    @Column(name = "MAX_SEQ")
+    @ApiParam(value = "最大序号")
+    private Integer maxSeq;
+
+    @Column(name = "RC_TIME")
+    @ApiParam(value = "接收时间")
+    private String rcTime;
+
+
+
 
     public WmsDocFgDetail(String jisNo) {
         this.jisNo = jisNo;
@@ -205,6 +219,18 @@ public class WmsDocFgDetail extends BaseBean {
     public WmsDocFgDetail() {
     }
 
+    public WmsDocFgDetail(String jisNo, String queueGroupNo, String processTime, Integer temp) {
+        this.jisNo = jisNo;
+        this.queueGroupNo = queueGroupNo;
+        this.processTime = processTime;
+    }
+
+    public WmsDocFgDetail(String jisNo, String sn) {
+        this.jisNo = jisNo;
+        this.sn = sn;
+    }
+
+
     public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) {
         this.sn = sn;
         this.mfgLocNo = mfgLocNo;

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

@@ -177,6 +177,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String refSrc;
 
+    @Column(name = "REF_SN")
+    @ApiParam("关联条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refSn;
+
     @Column(name = "GROUP_NO")
     @ApiParam("分组号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -10,7 +10,12 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -187,8 +192,13 @@ public class WmsMoveMaster extends BaseBean {
 
     @Transient
     @ApiParam("交易类型集合")
+    private List<String> filterTransTypeCodeList;
+
+    @Transient
+    @ApiParam("交易类型集合")
     private List<String> transTypeCodeList;
 
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -268,6 +268,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("委外收货时间")
     public String rcDatetime;
 
+    @Transient
+    @ApiParam("条码数量")
+    public Integer snCount;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
@@ -409,4 +413,9 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeName = transTypeName;
         this.itemStatus = itemStatus;
     }
+
+    public WmsMoveSn(Integer snCount, String createDatetime) {
+        this.snCount = snCount;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -198,6 +198,10 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("结束时间")
     private String planEndDate;
 
+    @Transient
+    @ApiParam("erp单号")
+    private String erpSrcNo;
+
 
     /**
      * 状态:1=新建,10=收货中,20=收货完成,
@@ -274,9 +278,10 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsPOMasterDetails(String orderNo, String partNo, Double qty,
+    public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
                               Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;
+        this.erpSrcNo = erpSrcNo;
         this.partNo = partNo;
         this.qty = qty;
         this.rcQty = rcQty;