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

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

@@ -10,16 +10,150 @@ 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主表信息 单据来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_ORDER_SRC {
+        MNU(1, "MNU", "手工"),
+        ERP(2, "ERP", "ERP接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_ORDER_SRC(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主表信息 单据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PO_ORDER_TYPE {
         REG(1, "REG", "原物料采购"),
-        SUB(2, "SUB", "委外采购"),
+        SUB(10, "SUB", "委外采购"),
-        TAR(3, "TAR", "多角贸易采购"),
+        TAR(20, "TAR", "多角贸易采购"),
-        TAP(4, "TAP", "多角代采购");
+        TAP(30, "TAP", "多角代采购");
 
         private int value;
         private String code;
@@ -68,7 +202,7 @@ public class WmsEnumUtil {
      * PO主表信息 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_ORDER_STATUS {
+    public enum ORDER_STATUS {
         CREATE(0, "新建"),
         RECEIPT(10, "收货中"),
         RECEIPT_FINISH(20, "收货完成"),
@@ -80,7 +214,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        private PO_ORDER_STATUS(int value, String description) {
+        private ORDER_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -117,6 +251,7 @@ public class WmsEnumUtil {
     /**
      * 交易状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_STATUS {
         CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败");
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -881,7 +881,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) {
         if(propValues != null && propValues.length > 0){
             String hql = "update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
+                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
                     + propName + " in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
             query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
@@ -903,7 +903,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) {
         if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
             StringBuffer sb = new StringBuffer("update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
+                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
             appendQL(sb,propName,propValue);
             Query query = entityManager.createQuery(sb.toString());
             query.setParameter("modifyUser",username);

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

@@ -33,20 +33,20 @@ public class WmsPOMaster extends BaseBean {
     public String orderNo;
 
     /**
-     * 单据类型:1 REG=原物料采购,
+     * 单据类型:
-     * 2 SUB=委外采购,3 TAR=多角贸易采购,4 TAP=多角代采购
+     * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="PO_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String poType;
 
     /**
-     * 状态:0=新建,10=收货中,20=收货完成,
+     * 状态:1=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="PO_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer poStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")
@@ -56,6 +56,9 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("版本")
     public String version;
 
+    /**
+     * 单据来源：1 MNU=手工,2 ERP=ERP接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;

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

@@ -49,20 +49,20 @@ public class WmsPOMasterDetails extends BaseBean {
     public Double qty;
 
     @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
+    @ApiParam(value = "条码打印数量", example = "0")
-    public String printQty;
+    public Double printQty;
 
     @Column(name="RC_QTY")
-    @ApiParam("收货数量")
+    @ApiParam(value = "收货数量", example = "0")
-    public String rcQty;
+    public Double rcQty;
 
     @Column(name="PASS_QTY")
-    @ApiParam("质检合格数量")
+    @ApiParam(value = "质检合格数量", example = "0")
-    public String passQty;
+    public Double passQty;
 
     @Column(name="NG_QTY")
-    @ApiParam("质检不合格数量")
+    @ApiParam(value = "质检不合格数量", example = "0")
-    public String ngQty;
+    public Double ngQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")
@@ -81,11 +81,11 @@ public class WmsPOMasterDetails extends BaseBean {
     public String whNo;
 
     /**
-     * 状态:N=正常,C=行取消
+     * 状态:10 N=正常,20 C=行取消
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam("状态")
-    public String status;
+    public String itemStatus;
 
     @Column(name="SNP")
     @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();
+    }
 
     /**
      * 库存移动单详情查询封装
@@ -57,11 +76,12 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsPOMaster.getType(), "type", result);
+        HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getStatus(), "status", result);
+        HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         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();
     }