From 589d304945feb4fc3a6899c131a4401a71dffb79 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 11:10:53 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java   |  8 ++++++++
 .../com/xdadan/erp/emis/domain/vo/WaybillOrder.java    |  3 +++
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 +++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index a743c2df6..916ec8095 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -417,7 +417,15 @@ public class EmisWaybill extends BaseEntity
     private String lastTraceInfo;
 
 
+
     // 最近一条扫描记录
     private EmisTmsScanRecord lastScanRecord;
 
+    // - 揽收底单图片
+    // - 签收底单图片
+    // - 货物图片
+//    private String billPicSendRmk;
+//    private String billPicDispatchRmk;
+    private String billPicGoodsRmk;
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 41de4977e..5537bdf93 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -257,6 +257,9 @@ public class WaybillOrder  implements Serializable {
     /* 签收底单图片 */
     private String billPicDispatchRmk;
 
+    // 货物图片
+    private String billPicGoodsRmk;
+
 
     /* 扩展信息 */
     /* 是否生成子单 1-是 0-否 */
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 492cba0c7..69ea2292a 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,18 +410,18 @@ public class EmisBaseService {
              return null;
          }
 
-         if(Integer.valueOf(subBillSuffix)>waybill.getParcelQty()){
-             // 子单尾数超过总件数,查不到信息
-             return null;
+         if(isSubBill) {
+             if (Integer.valueOf(subBillSuffix) > waybill.getParcelQty()) {
+                 // 子单尾数超过总件数,查不到信息
+                 return null;
+             }
          }
 
-
          String parcelQty="0";
          if(waybill.getParcelQty()!=null){
              parcelQty=waybill.getParcelQty().toString();
          }
 
-
          Map<String, Object> order = new HashMap<>();
          order.put("orderSn", waybill.getOrderSn());
          order.put("ydSn", billCode);