开发po订单主表、明细表

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -10,6 +10,90 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+    /**
+     * PO订单明细信息 是否免费
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_FREE {
+        CHARGING(0, "计费"), GRATIS(1, "免费");
+
+        private int value;
+        private String description;
+
+        private IS_FREE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PO订单明细信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DETAILS_STATUS {
+        NORMAL(10, "N", "正常"),
+        ANCEL(20, "C", "行取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ORDER_DETAILS_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * PO主表信息 单据来源
@@ -167,6 +251,7 @@ public class WmsEnumUtil {
     /**
      * 交易状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_STATUS {
         CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败");
 

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

@@ -45,28 +45,28 @@ public class WmsPOMasterDetails extends BaseBean {
     public String partNameRdd;
 
     @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "-1")
+    @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
     @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
+    @ApiParam(value = "条码打印数量", example = "0")
     public Double printQty;
 
     @Column(name="RC_QTY")
-    @ApiParam("收货数量")
+    @ApiParam(value = "收货数量", example = "0")
     public Double rcQty;
 
     @Column(name="PASS_QTY")
-    @ApiParam("质检合格数量")
+    @ApiParam(value = "质检合格数量", example = "0")
     public Double passQty;
 
     @Column(name="NG_QTY")
-    @ApiParam("质检不合格数量")
+    @ApiParam(value = "质检不合格数量", example = "0")
     public Double ngQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")
-    public Double unit;
+    public String unit;
 
     @Column(name="ZDATE")
     @ApiParam("计划交货日期")
@@ -81,7 +81,7 @@ public class WmsPOMasterDetails extends BaseBean {
     public String whNo;
 
     /**
-     * 状态:N=正常,C=行取消
+     * 状态:10 N=正常,20 C=行取消
      */
     @Column(name="ITEM_STATUS")
     @ApiParam("状态")

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

@@ -11,6 +11,25 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
  * @Modify:
  **/
 public class WmsHqlPack {
+    /**
+     * PO订单明细表 分页查询
+     *
+     * @param wmsPOMasterDetails
+     * @return
+     */
+    public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
+
+        return result.toString();
+    }
 
     /**
      * PO订单主表信息 分页查询
@@ -28,6 +47,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
         HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
 
         return result.toString();
     }