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

@@ -502,27 +502,4 @@ public class CommonEnumUtil {
         }
     }
 
-    /**
-     * 启用或禁用
-     */
-    public enum OPEN_CLOSE {
-        OPEN(1, "启用"),
-        CLOSE(2, "禁用");
-
-        private int value;
-        private String description;
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        OPEN_CLOSE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-    }
 }

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/sqlpack/WmsHqlPack.java

@@ -48,6 +48,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result);
         HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsRoutingDetail.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -66,6 +67,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
         HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getStringEqualPack(wmsRoutingAssign.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -82,6 +84,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result);
         HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -100,6 +103,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result);
         HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result);
         HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
+        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -270,6 +274,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
         HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
         HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -288,6 +293,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
+        HqlPack.getStringEqualPack(basVendor.getOrganizeCode(), "organizeCode", result);
         if (basVendor.getIsAsn() != null) {
             HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
         }
@@ -310,6 +316,7 @@ public class WmsHqlPack {
         }
         HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
         HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -346,8 +353,8 @@ public class WmsHqlPack {
 
     public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result);
         return result.toString();
     }
 
@@ -409,6 +416,27 @@ public class WmsHqlPack {
     }
 
     /**
+     * ASN订单分页查询条件
+     * @param wmsASNMaster
+     * @return
+     */
+    public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getStatus().toString(),"status",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result);
+        //有效性
+        HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
+        return result.toString();
+    }
+
+    /**
      * 产品发运信息 查询条件封装
      *
      * @param wmsShopping