VDA收货【生产快速入库】组件，任务编号1051

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

@@ -3579,6 +3579,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static PART_ASSOCIATE_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -3635,8 +3644,8 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-    
+
-    
+
     /**
      * 物流规则 处理模式
      */

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

@@ -162,6 +162,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("类型名称")
     public String busiTypeName;
 
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java

@@ -42,4 +42,9 @@ public class GenerateSnRule {
      * 库位来源
      */
     private Integer locateSource;
+
+    /**
+     * 是否允许生成二维码
+     */
+    private Integer isSn2d;
 }

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

@@ -2376,9 +2376,9 @@ public class WmsHqlPack {
 
         return result;
     }
-    
+
-    
+
-    
+
     /**
      * 业务：库存查询封装
      *
@@ -2388,24 +2388,44 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
         DdlPackBean result = new DdlPackBean();
 
-     
+
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+
         getStringBuilderPack(wmsRouting, result);
 
         return result;
     }
-    
+
     public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
         DdlPackBean result = new DdlPackBean();
 
-     
+
         DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
 //        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+
         getStringBuilderPack(wmsRoutingRule, result);
 
         return result;
     }
+
+    /**
+     * 物料关系查询条件封装
+     *
+     * @param wmsPartRelation
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartRelation(WmsPartRelation wmsPartRelation) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringRightLikerPack(wmsPartRelation.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getPartName(), "partName", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateCode(), "associateCoded", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateNameAdd(), "associateNameAdd", result);
+        DdlPreparedPack.getNumEqualPack(wmsPartRelation.getAssociateType(), "associateType", result);
+
+        getStringBuilderPack(wmsPartRelation, result);
+
+        return result;
+    }
 }