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/WmsDocMovementMaster.java

@@ -100,4 +100,12 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;
+
+    @Transient
+    @ApiParam(value = "源库存地代码")
+    private String srcAreaNo;
+
+    @Transient
+    @ApiParam(value = "目的库存地代码")
+    private String desrAreaNo;
 }

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

@@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "QTY")
-    @ApiParam(value = "交易数量", example = "1")
-    private Double qty;
-
-    @Column(name = "REJECT_QTY")
-    @ApiParam(value = "不合格交易数量", example = "1")
-    private Double rejectQty;
-
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "状态", example = "10")
     private Integer transStatus;
@@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean {
     @Column(name = "ERROR_MESSAGE")
     @ApiParam(value = "错误信息")
     private String errorMessage;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
+
+    @Column(name = "FAIL_QTY")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double failQty;
+
+    @Column(name = "HOLD_QTY")
+    @ApiParam(value = "隔离数量", example = "0")
+    private Double holdQty;
+
+    @Column(name = "QC_QTY")
+    @ApiParam(value = "质检中数量", example = "0")
+    private Double qcQty;
+
+    @Column(name = "RIN_QTY")
+    @ApiParam(value = "待入库数量", example = "0")
+    private Double rinQty;
+
+    @Column(name = "FREEZE_QTY")
+    @ApiParam(value = "冻结数量", example = "0")
+    private Double freezeQty;
+
+    @Column(name = "CONSIGN_QTY")
+    @ApiParam(value = "寄售数量", example = "0")
+    private Double consignQty;
+
+    @Column(name = "LOCK_QTY")
+    @ApiParam(value = "锁定数量", example = "0")
+    private Double lockQty;
 }

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

@@ -648,6 +648,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);