Merge remote-tracking branch 'origin/master'

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()));
@@ -525,12 +526,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");