获取打印策略修正

#552
guoxunbo · Apr 6, 2021 · 5e64733 · 5e64733
1 parent 6443733
commit 5e64733
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/newbiest-mm/src/main/java/com/newbiest/mms/print/DefaultPrintStrategy.java b/newbiest-mm/src/main/java/com/newbiest/mms/print/DefaultPrintStrategy.java
@@ -31,7 +31,7 @@
  * @author guoxunbo
  * @date 4/6/21 3:07 PM
  */
-@Component
+@Component("defaultPrintStrategy")
 @Slf4j
 public class DefaultPrintStrategy implements IPrintStrategy {
 

diff --git a/newbiest-mm/src/main/java/com/newbiest/mms/service/impl/PrintServiceImpl.java b/newbiest-mm/src/main/java/com/newbiest/mms/service/impl/PrintServiceImpl.java
@@ -41,6 +41,9 @@ public class PrintServiceImpl implements PrintService {
 
     public static final String PRINT_MATERIAL_LOT = "printMLot";
 
+    @Autowired
+    Map<String, IPrintStrategy> printStrategyMap;
+
     @Autowired
     WorkStationRepository workStationRepository;
 
@@ -58,7 +61,7 @@ public void printMLot(MaterialLot materialLot) throws ClientException {
             if (workStation == null) {
                 throw new ClientParameterException(MmsException.MM_WORK_STATION_IS_NOT_EXIST, transactionIp);
             }
-            LabelTemplate labelTemplate = labelTemplateRepository.findOneByName("PRINT_MATERIAL_LOT");
+            LabelTemplate labelTemplate = labelTemplateRepository.findOneByName("PrintMLot");
             if (labelTemplate == null) {
                 throw new ClientParameterException(MmsException.MM_LBL_TEMPLATE_IS_NOT_EXIST, transactionIp);
             }
@@ -75,7 +78,11 @@ public void printMLot(MaterialLot materialLot) throws ClientException {
             parameterMap.put("specification", materialLot.getMaterialDesc());
             printContext.setParameterMap(parameterMap);
 
-            IPrintStrategy printStrategy = new DefaultPrintStrategy();
+            IPrintStrategy printStrategy = printStrategyMap.get("PrintMLot");
+            if (printStrategy == null) {
+                printStrategy = printStrategyMap.get("defaultPrintStrategy");
+            }
+//            IPrintStrategy printStrategy = new DefaultPrintStrategy();
             printStrategy.print(printContext);
         } catch (Exception e) {
             throw ExceptionManager.handleException(e, log);