md

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;
+
 }

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-否 */

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()){
+         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);