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

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);
     }
 }

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

@@ -170,6 +170,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public Double inputNCQty;
 
+    @ApiParam(value = "前端散件表格是否编辑")
+    @Transient
+    public Boolean isSet = false;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

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

@@ -1033,7 +1033,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "",
                 WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result);
-        HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result);
         //单号
         HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsQCMaster, result);