Merge remote-tracking branch 'origin/dev-temp-xw-202502100000-44915' into test

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java

@@ -25,6 +25,10 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
         DdlPreparedPack.getStringEqualPack(bean.getCraftCode(), MesExtConstWords.CRAFT_CODE, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getAssemblyPartNo(), MesExtConstWords.ASSEMBLY_PART_NO, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getAssemblyPartName(), MesExtConstWords.ASSEMBLY_PART_NAME, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getAssemblyPartNo(), MesExtConstWords.ASSEMBLY_PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getVehicleNo(), MesExtConstWords.VEHICLE_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getVehicleClassNo(), MesExtConstWords.VEHICLE_CLASS_NO, packBean);
+
     }
 
     @Override

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java

@@ -193,6 +193,9 @@ public class MesExtConstWords {
     public static final String PRT_VEHICLE_COUNT = "prtVehicleCount";
     //车型代码
     public static final String VEHICLE_NO = "vehicleNo";
+    //车型代码
+    public static final String VEHICLE_CLASS_NO = "vehicleClassNo";
+
     //拉动单类型
     public static final String PULL_ORDER_TYPE = "pullOrderType";
     //拉动单状态