From dc4b1769384c73041eb73ce13a1c48c6cbd2e155 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Wed, 4 Aug 2021 16:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/controller/ProdReadyTaskController.java | 8 ++++++++
 .../common/service/impl/ProdReadyTaskServiceImpl.java     | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ProdReadyTaskController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ProdReadyTaskController.java
index 07c61ab7..c26b6b62 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ProdReadyTaskController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ProdReadyTaskController.java
@@ -2,8 +2,11 @@ package com.foreverwin.mesnac.common.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.model.ProdReadyTask;
 import com.foreverwin.mesnac.common.service.ProdReadyTaskService;
+import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
@@ -33,6 +36,11 @@ public class ProdReadyTaskController {
     @ResponseBody
     @GetMapping("/doPrint")
     public R doPrint(ProdReadyTask prodReadyTask){
+        prodReadyTask = prodReadyTaskService.getById(prodReadyTask.getHandle());
+        String result = prodReadyTask.getResult();
+        if (StringUtil.isBlank(result) || !prodReadyTask.getResult().equals(Constants.RSESULT_OK)){
+            throw new BaseException("未准备合格不能打印");
+        }
         prodReadyTaskService.doPrint(prodReadyTask);
         return R.ok();
     }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index b46eeed3..d5b51b5a 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -313,9 +313,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
     public void doPrint(ProdReadyTask prodReadyTask) {
         String site = CommonMethods.getSite();
         String user = CommonMethods.getUser();
-        String dispatchNo = prodReadyTask.getDispatchNo();
+        String sfcDispatchBo = prodReadyTask.getSfcDispatchBo();
         SfcDispatchDto sfcDispatchDto=new SfcDispatchDto();
-        sfcDispatchDto.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site,dispatchNo));
+        sfcDispatchDto.setHandle(sfcDispatchBo);
         sfcDispatchDto = sfcDispatchCommonService.findSfcDispatchBySfc(sfcDispatchDto);
         List<PrintLog> printList=new ArrayList<>();
         List<LabelPrintDto> labelPrintDtoList = new ArrayList<>();
@@ -354,7 +354,6 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         labelPrintDto.setOperation(sfcDispatchDto.getOperation());
         labelPrintDtoList.add(labelPrintDto);
         printData = JSON.toJSONString(labelPrintDtoList);
-        List<PrintLog> list = printLogService.list();
         //打印记录
         printTag.setHandle(UUID.randomUUID().toString());
         printTag.setPrintName(printName);