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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -41,6 +42,7 @@ public class WmsASNMasterDetails extends BaseBean {
     public Integer item;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
@@ -107,6 +109,7 @@ public class WmsASNMasterDetails extends BaseBean {
     public String vendorLotNo;
 
     @Column(name = "REC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "已收数量", example = "0")
     public Double recQty;
 

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

@@ -49,7 +49,7 @@ public class WmsActionResponseBean<Obj> {
     public Obj details;
 
     @ApiParam(value = "结果代码")
-    public Boolean codeStatus;
+    public Boolean codeStatus = true;
 
     @ApiParam(value = "作业任务编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -57,6 +58,7 @@ public class WmsCSFactTrans extends BaseBean {
     public String sn;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "库存数量", example = "0")
     public Double qty;
 
@@ -65,6 +67,7 @@ public class WmsCSFactTrans extends BaseBean {
     public String unit;
 
     @Column(name="FACT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "实盘数量", example = "0")
     public Double factQty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -40,6 +41,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer item;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -40,6 +41,7 @@ public class WmsDocMovementDetails extends BaseBean {
     public Integer item;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
@@ -76,6 +78,7 @@ public class WmsDocMovementDetails extends BaseBean {
     public String destLocateNo;
 
     @Column(name = "PRINT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "条码打印数量", example = "1")
     private Double printQty;
 
@@ -109,18 +112,22 @@ public class WmsDocMovementDetails extends BaseBean {
     private String remark;
 
     @Column(name = "PICK_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "已拣货数量", example = "1")
     private Double pickQty;
 
     @Column(name = "OUT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "已出库数量", example = "1")
     private Double outQty;
 
     @Column(name = "REC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "已收货数量", example = "1")
     private Double recQty;
 
     @Column(name = "MOVE_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "已移库数量", example = "1")
     private Double moveQty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -46,6 +47,7 @@ public class WmsDocMovementSn extends BaseBean {
     public String partNameRdd;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -45,6 +46,7 @@ public class WmsFGInStock extends BaseBean {
     public String partNameRdd;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -73,6 +74,7 @@ public class WmsMoveSn extends BaseBean {
     public String packAgeNo;
 
     @Column(name="SRC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
 
@@ -109,10 +111,12 @@ public class WmsMoveSn extends BaseBean {
     private Long finishedCounts;
 
     @Column(name="DEST_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "目标数量", example = "0")
     public Double destQty;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -40,6 +41,7 @@ public class WmsPOMasterDetails extends BaseBean {
     public Integer item;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
@@ -52,18 +54,22 @@ public class WmsPOMasterDetails extends BaseBean {
     public String orderNo;
 
     @Column(name = "PRINT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "条码打印数量", example = "0")
     public Double printQty;
 
     @Column(name = "RC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     public Double rcQty;
 
     @Column(name = "PASS_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "质检合格数量", example = "0")
     public Double passQty;
 
     @Column(name = "NG_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "质检不合格数量", example = "0")
     public Double ngQty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -46,6 +47,7 @@ public class WmsPoSn extends BaseBean {
     public String partNameRdd;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
@@ -78,6 +80,7 @@ public class WmsPoSn extends BaseBean {
     public String groupNo;
 
     @Column(name="REC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     public Double recQty;
 }

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -41,6 +42,7 @@ public class WmsQCDetails extends BaseBean {
     public Integer item;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
@@ -65,14 +67,17 @@ public class WmsQCDetails extends BaseBean {
 
 
     @Column(name = "FACT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "实检数量", example = "0")
     public Double factQty;
 
     @Column(name = "PASS_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "合格数量", example = "0")
     public Double passQty;
 
     @Column(name = "REJECT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -42,6 +43,7 @@ public class WmsShopping extends BaseBean {
     public String partNameRdd;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -60,6 +61,7 @@ public class WmsSnPrintRcd extends BaseBean {
     private String unit;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -57,34 +58,42 @@ public class WmsStockQuan extends BaseBean {
     private String custNo;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;
 
     @Column(name = "FAIL_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     private Double failQty;
 
     @Column(name = "HOLD_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "隔离数量", example = "0")
     private Double holdQty;
 
     @Column(name = "QC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "质检中数量", example = "0")
     private Double qcQty;
 
     @Column(name = "RIN_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "待入库数量", example = "0")
     private Double rinQty;
 
     @Column(name = "FREEZE_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "冻结数量", example = "0")
     private Double freezeQty;
 
     @Column(name = "CONSIGN_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "寄售数量", example = "0")
     private Double consignQty;
 
     @Column(name = "LOCK_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -96,6 +97,7 @@ public class WmsStockSn extends BaseBean {
     private String unit;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     private Double qty;
     /**

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -57,10 +58,12 @@ public class WmsTaskDetails extends BaseBean {
     private String vendorNo;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "1")
     private Double qty;
 
     @Column(name = "TRANS_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "处理数量", example = "1")
     private Double transQty;
 

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -57,6 +58,7 @@ public class WmsTrans extends BaseBean{
     private Integer transStatus;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value ="需求数")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -93,34 +94,42 @@ public class WmsTransQuan extends BaseBean {
     private String errorMessage;
 
     @Column(name = "QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;
 
     @Column(name = "FAIL_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     private Double failQty;
 
     @Column(name = "HOLD_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "隔离数量", example = "0")
     private Double holdQty;
 
     @Column(name = "QC_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "质检中数量", example = "0")
     private Double qcQty;
 
     @Column(name = "RIN_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "待入库数量", example = "0")
     private Double rinQty;
 
     @Column(name = "FREEZE_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "冻结数量", example = "0")
     private Double freezeQty;
 
     @Column(name = "CONSIGN_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "寄售数量", example = "0")
     private Double consignQty;
 
     @Column(name = "LOCK_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 }

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -57,6 +58,7 @@ public class WmsTransRcd extends BaseBean{
     private Integer transStatus;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value ="需求数")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -65,10 +66,12 @@ public class WmsTransSn extends BaseBean {
     public String transCode;
 
     @Column(name="QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "交易数量", example = "0")
     public Double qty;
 
     @Column(name="REJECT_QTY")
+    @ColumnDefault("0")
     @ApiParam(value = "不合格交易数量", example = "0")
     public Double rejectQty;
 

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

@@ -60,12 +60,12 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
+        HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
+        HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
 
         getStringBuilderPack(wmsPOMasterDetails, result);
 
@@ -1378,7 +1378,7 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
+        HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         getStringBuilderPack(wmsStockSn, result);
         HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         return result.toString();
@@ -1479,7 +1479,7 @@ public class WmsHqlPack {
             HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
         }
         if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
-            HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
+            HqlPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
         }
         getStringBuilderPack(wmsDataAuth, result);
         return result.toString();
@@ -1544,4 +1544,19 @@ public class WmsHqlPack {
         return result.toString();
     }
 
+    /**
+     * 移库单订单条码表 分页查询
+     *
+     * @param wmsDocMovementSn
+     * @return
+     */
+    public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsDocMovementSn, result);
+
+        return result.toString();
+    }
 }