生产准备任务检验界面新增打印机

common/src/main/java/com/foreverwin/mesnac/common/controller/ProdReadyTaskController.java

@@ -36,13 +36,13 @@ public class ProdReadyTaskController {
     @ResponseBody
     @PostMapping("/doPrint")
     public R doPrint(@RequestBody List<ProdReadyTask> list){
-        for (ProdReadyTask prodReadyTask:list){
+        for (ProdReadyTask readyTask:list){
-            prodReadyTask = prodReadyTaskService.getById(prodReadyTask.getHandle());
+            ProdReadyTask prodReadyTask = prodReadyTaskService.getById(readyTask.getHandle());
             String result = prodReadyTask.getResult();
             if (StringUtil.isBlank(result) || !prodReadyTask.getResult().equals(Constants.RSESULT_OK)){
                 throw new BaseException("未准备合格不能打印");
             }
-            prodReadyTaskService.doPrint(prodReadyTask);
+            prodReadyTaskService.doPrint(prodReadyTask,readyTask.getStatus());
         }
         return R.ok();
     }

common/src/main/java/com/foreverwin/mesnac/common/service/ProdReadyTaskService.java

@@ -38,7 +38,7 @@ public interface ProdReadyTaskService extends IService<ProdReadyTask> {
 
     boolean saveResult(ProdReadyTask prodReadyTask);
 
-    void doPrint(ProdReadyTask prodReadyTask);
+    void doPrint(ProdReadyTask prodReadyTask ,String printerName);
 
     void sendMsgJob(String site);
 

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -434,7 +434,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
     }
 
     @Override
-    public void doPrint(ProdReadyTask prodReadyTask) {
+    public void doPrint(ProdReadyTask prodReadyTask ,String printerName) {
         String site = CommonMethods.getSite();
         String user = CommonMethods.getUser();
         String sfcDispatchBo = prodReadyTask.getSfcDispatchBo();
@@ -454,7 +454,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         if (StringUtil.notBlank(factory)&&factory.equals("6100")){
             type=Constants.PRINT_TYPE_PRODUCT;
         }
-        if (StringUtil.isBlank(printName)) {
+        if (printerName == null && StringUtil.isBlank(printName)) {
             throw new BaseException("资源" + resrce + "维护的打印机不能为空");
         }
         String item = prodReadyTask.getItem();
@@ -469,7 +469,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         if (printLogList.isEmpty() || !printLogList.isEmpty()) {
             //打印参数
             LabelPrintDto labelPrintDto = new LabelPrintDto();
-            labelPrintDto.setPrinter(printName);
+            labelPrintDto.setPrinter(printerName == null ? printName : printerName);
             labelPrintDto.setPrintTemplate(type);
             labelPrintDto.setShopOrder(shopOrder);
             labelPrintDto.setItem(selectCurrent.getItem());