From 25089d25586a4b08981a9b722f0b49663649373e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 11:26:04 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisCommonController.java  |  5 ++---
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index a86b5371e..380bb7b32 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -253,13 +253,12 @@ public class EmisCommonController extends BaseController
                     printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
                     printItem.put("result","success");
                     printItem.put("message","success");
+                    return AjaxResult.success("获取成功",printItem);
                 }else{
-                    printItem.put("result","fail");
-                    printItem.put("message","未获取到数据");
+                    return AjaxResult.error("单号不存在:"+billCode);
                 }
 
 
-                return AjaxResult.success("获取成功",printItem);
             }catch (Exception ex){
                 ex.printStackTrace();
                 return AjaxResult.error("获取失败");
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 69ea2292a..00a07695e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -410,6 +410,11 @@ public class EmisBaseService {
              return null;
          }
 
+         String parcelQty="0";
+         if(waybill.getParcelQty()!=null){
+             parcelQty=waybill.getParcelQty().toString();
+         }
+
          if(isSubBill) {
              if (Integer.valueOf(subBillSuffix) > waybill.getParcelQty()) {
                  // 子单尾数超过总件数,查不到信息
@@ -417,10 +422,7 @@ public class EmisBaseService {
              }
          }
 
-         String parcelQty="0";
-         if(waybill.getParcelQty()!=null){
-             parcelQty=waybill.getParcelQty().toString();
-         }
+
 
          Map<String, Object> order = new HashMap<>();
          order.put("orderSn", waybill.getOrderSn());