From bc81539ac5b3c7aa5d0b1081a260191bac1eba76 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 26 Aug 2021 11:03:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/ProdReadyTaskServiceImpl.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 ceeba0f5..e441cdc4 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
@@ -525,12 +525,10 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
          * 根据返回值，更新打印机信息-printName及打印是否成功信息isPrint
          */
         JSONObject jsonObject = JSONObject.parseObject(post);
-        String code = jsonObject.getString("code");
-        if (code == null) {
-
-        }
-        if (post.indexOf("500") != -1) {
-            throw BusinessException.build("打印失败！");
+        Integer code = jsonObject.getInteger("code");
+        String msg = jsonObject.getString("msg");
+        if (code != 0){
+            throw BusinessException.build(msg);
         }
         if (printLogList.isEmpty()) {
             printTag.setIsPrint("true");

From 814e7e68b3179c63d56fad5876cca97da8d7a2bd Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 26 Aug 2021 11:19:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

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 e441cdc4..373e6b91 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
@@ -468,6 +468,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             labelPrintDto.setPrintTemplate(type);
             labelPrintDto.setShopOrder(shopOrder);
             labelPrintDto.setItem(selectCurrent.getItem());
+            labelPrintDto.setPrintNum(1);
             labelPrintDto.setItemDescription(selectCurrent.getDescription());
             labelPrintDto.setSfc(prodReadyTask.getSfc());
             Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc()));