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

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

@@ -53,7 +53,7 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Column(name="QTY")
+    @Transient
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
@@ -61,6 +61,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "处理数量", example = "0")
     public Double transQty;
 
+    @Column(name="REJECT_QTY")
+    @ApiParam(value = "不合格处理数量", example = "0")
+    public Double rejectQty;
+
     @Column(name="UNIT")
     @ApiParam("单位")
     public String unit;

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

@@ -100,6 +100,22 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
+    @Column(name="SRC_QC_STATUS")
+    @ApiParam(value = "源质量状态", example = "1")
+    public Integer srcQcStatus;
+
+    @Column(name="SRC_SN_STATUS")
+    @ApiParam(value = "源条码状态", example = "1")
+    public Integer srcSnStatus;
+
+    @Column(name="DEST_QC_STATUS")
+    @ApiParam(value = "目的质量状态", example = "1")
+    public Integer descQcStatus;
+
+    @Column(name="DEST_SN_STATUS")
+    @ApiParam(value = "目的条码状态", example = "1")
+    public Integer destSnStatus;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){

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

@@ -67,9 +67,13 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam(value = "交易数量", example = "0")
     public Double qty;
 
+    @Column(name = "REJECT_QTY")
+    @ApiParam(value = "不合格交易数量", example = "0")
+    public Double rejectQty;
+
     @Column(name = "TRANS_NO")
-    @ApiParam(value = "事务编号", example = "1")
-    public Long transNo;
+    @ApiParam(value = "事务编号")
+    public String transNo;
 
     /**
      * ASN,PO,SO

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

@@ -68,9 +68,13 @@ public class WmsTransSn extends BaseBean {
     @ApiParam(value = "交易数量", example = "0")
     public Double qty;
 
+    @Column(name="REJECT_QTY")
+    @ApiParam(value = "不合格交易数量", example = "0")
+    public Double rejectQty;
+
     @Column(name="TRANS_NO")
     @ApiParam("事务编号")
-    public Long transNo;
+    public String transNo;
 
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "0")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java

@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.pojo.wms.rules;
+
+/**
+ * @Description : 纯POJO，WMS 获取条码下一步的状态
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2019-03-07 16:40
+ * @Modify:
+ **/
+public class WmsSNNextStatusRule {
+
+    // 交易类型代码
+    private int transTypeCode;
+    // 业务类型代码
+    private int busiTypeCode;
+    // 一步法操作
+    private boolean oneStep;
+    // 免检
+    private boolean skipQC;
+    // 自动入库
+    private boolean defaultInStock;
+    // 原条码状态
+    private int srcSNStatusCode;
+    // 目的条码状态
+    private int destSNStatusCode;
+
+    public int getTransTypeCode() {
+        return transTypeCode;
+    }
+
+    public void setTransTypeCode(int transTypeCode) {
+        this.transTypeCode = transTypeCode;
+    }
+
+    public int getBusiTypeCode() {
+        return busiTypeCode;
+    }
+
+    public void setBusiTypeCode(int busiTypeCode) {
+        this.busiTypeCode = busiTypeCode;
+    }
+
+    public int getDestSNStatusCode() {
+        return destSNStatusCode;
+    }
+
+    public void setDestSNStatusCode(int destSNStatusCode) {
+        this.destSNStatusCode = destSNStatusCode;
+    }
+
+    public int getSrcSNStatusCode() {
+        return srcSNStatusCode;
+    }
+
+    public void setSrcSNStatusCode(int srcSNStatusCode) {
+        this.srcSNStatusCode = srcSNStatusCode;
+    }
+
+    public boolean isOneStep() {
+        return oneStep;
+    }
+
+    public void setOneStep(boolean oneStep) {
+        this.oneStep = oneStep;
+    }
+
+    public boolean isSkipQC() {
+        return skipQC;
+    }
+
+    public void setSkipQC(boolean skipQC) {
+        this.skipQC = skipQC;
+    }
+
+    public boolean isDefaultInStock() {
+        return defaultInStock;
+    }
+
+    public void setDefaultInStock(boolean defaultInStock) {
+        this.defaultInStock = defaultInStock;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -809,11 +809,11 @@ public class WmsHqlPack {
      * @param tranNo
      * @return
      */
-    public static String packWmsTransSn(Long tranNo) {
+    public static String packWmsTransSn(String tranNo) {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getNumEqualPack(tranNo, "transNo", result);
+        HqlPack.getStringEqualPack(tranNo, "transNo", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         return result.toString();