Merge remote-tracking branch 'origin/uat-temp-castle-250213-45097' into test

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java

@@ -717,6 +717,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             orderAssembly.setProductPartNo(sortCfg.getProductPartNo());
             orderAssembly.setPid(sortCfg.getId());
             orderAssembly.setWorkCenterCode(workCenterCode);
+            orderAssembly.setPrintTemplate(sortCfg.getPrintTemplate());
+            orderAssembly.setPrinter(sortCfg.getPrinter());
             workOrderAssemblyList.add(orderAssembly);
         }
 
@@ -759,6 +761,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             orderAssembly.setMaxValue(ruleSortCfg.getMaxValue());
             orderAssembly.setMinValue(ruleSortCfg.getMinValue());
             orderAssembly.setProductPartNo(ruleSortCfg.getProductPartNo());
+            orderAssembly.setPrintTemplate(ruleSortCfg.getPrintTemplate());
+            orderAssembly.setPrinter(ruleSortCfg.getPrinter());
             workOrderAssemblyList.add(orderAssembly);
         }
         //查询所有共用的零件 且没有零件号，多用于螺钉---查询排序加工规则
@@ -797,6 +801,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             orderAssembly.setMaxValue(ruleSortCfg.getMaxValue());
             orderAssembly.setMinValue(ruleSortCfg.getMinValue());
             orderAssembly.setProductPartNo(ruleSortCfg.getProductPartNo());
+            orderAssembly.setPrintTemplate(ruleSortCfg.getPrintTemplate());
+            orderAssembly.setPrinter(ruleSortCfg.getPrinter());
             workOrderAssemblyList.add(orderAssembly);
         }
         return workOrderAssemblyList;