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

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

@@ -80,7 +80,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 主表信息 单据类型
      */
@@ -584,60 +583,37 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LINK_ORDER_TYPE {
-        ASN(10, "ASN", "ASN"),
-        PO(20, "PO", "PO"),
-        SO(30, "SO", "SO"),
-        MOVE(40, "MOVE", "MOVE"),
-        IN_STOCK(50, "IN_STOCK", "IN_STOCK"),
-        SHIPPING(60, "SHIPPING", "SHIPPING"),
-        QC(70, "QC", "QC"),
-        CS(80, "CS", "CS");
-        private int value;
-        private String code;
+        ASN("ASN", "ASN"),
+        PO("PO", "PO"),
+        SO("SO", "SO"),
+        MOVE("MOVE", "MOVE"),
+        IN_STOCK("IN_STOCK", "IN_STOCK"),
+        SHIPPING("SHIPPING", "SHIPPING"),
+        QC("QC", "QC"),
+        CS("CS", "CS");
+        private String value;
         private String description;
 
-        LINK_ORDER_TYPE(int value, String code, String description) {
+        LINK_ORDER_TYPE(String value, 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;
+            return value;
         }
 
-        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;
+        public String getValue() {
+            return value;
         }
 
-        public static LINK_ORDER_TYPE codeOf(String code) {
-            int tmp = 1;
+        public static LINK_ORDER_TYPE codeOf(String value) {
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
+                if (values()[i].value.equals(value)) {
                     return values()[i];
                 }
             }
@@ -720,7 +696,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
-        CREATE(10,"创建"),
+        CREATE(10, "创建"),
         QUALITY_CONTROL(20, "质检中"),
         PRE_INSTOCK(30, "待入库"),
         INSTOCKED(40, "入库"),

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.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 SwebPackage extends BaseBean {
     @ApiParam("上级包装编号")
     public String parentPackageNo;
 
+    @ColumnDefault("0")
     @Column(name="PACKAGE_QTY")
     @ApiParam(value = "包装件数", example = "1")
     public Integer packageQty;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.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;
 
@@ -44,6 +45,7 @@ public class SwebProcurementPlanOrderDetails extends BaseBean {
     @Column(name = "UNIT")
     private String unit;
 
+    @ColumnDefault("0")
     @ApiParam("标准包装")
     @Column(name = "SNP_QTY")
     private Double snpQty;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.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;
 
@@ -38,6 +39,7 @@ public class SwebPurchaseChangeLog extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("零件数量")
+    @ColumnDefault("0")
     public Double qty;
 
     @Column(name = "REMARK")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-02 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPurchaseForPubListModel {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
-import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
+import cn.estsh.i3plus.pojo.sweb.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -18,11 +18,12 @@ public class SwebHqlPack {
 
     /**
      * 通用封装isValid、isDeleted等参数
+     *
      * @param bean
      * @param hqlStr
      * @return
      */
-    private static String buildHql(BaseBean bean, StringBuffer hqlStr){
+    private static String buildHql(BaseBean bean, StringBuffer hqlStr) {
         // 判断工厂代码是否为空
         if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
             SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
@@ -34,11 +35,39 @@ public class SwebHqlPack {
         return hqlStr.toString();
     }
 
-    public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){
+    public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
         HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
-        return buildHql(purchaseOrder,result);
+        return buildHql(purchaseOrder, result);
+    }
+
+    public static String getPackAgeWhereHql(SwebPackage swebPackage) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
+        HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
+        HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
+        return buildHql(swebPackage, result);
+    }
+
+    public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
+        HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
+        return buildHql(swebProcurementPlanOrder, result);
+    }
+
+    public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
+        return buildHql(swebProcurementPlanOrderDetails, result);
+    }
+
+    public static String getVendorRelWhereHql(SwebVendorRel vendorRel) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
+        HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
+        return buildHql(vendorRel, result);
     }
 }