卡斯马基础界面--客户条码规则、产品容器容量配置

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3611,23 +3611,35 @@ public class MesHqlPack {
     /**
      * MES客户条码规则查询条件封装
      *
-     * @param mesCustomerSnRule
+     * @param customerSnRule 客户条码规则查询条件
-     * @return
+     * @return 查询数据
      */
-    public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
+    public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule customerSnRule) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customerSnRule, customerSnRule.getOrganizeCode());
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
+        if (!StringUtils.isEmpty(customerSnRule.getOrganizeCode())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(customerSnRule.getCustomerCode())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerCode(), "customerCode", packBean);
+        }
+        if (!StringUtils.isEmpty(customerSnRule.getCustomerPartNo())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
+        if (!StringUtils.isEmpty(customerSnRule.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
+        if (!StringUtils.isEmpty(customerSnRule.getLength())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
+            DdlPreparedPack.getNumEqualPack(customerSnRule.getLength(), "length", packBean);
         }
         return packBean;
     }
 
+    /**
+     * MES物料上炉模式查询条件封装
+     *
+     * @param partFurnace 物料上炉模式查询条件
+     * @return 查询数据
+     */
     public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) {
         DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode());
         DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean);