From aebd21a3d66dd6ac3aa4df25897affbda9f14b58 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 15 Dec 2025 11:47:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20=20tms=E3=80=81oms=E3=80=81?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=81app=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=8E=B0=E9=87=91=E5=AE=A2=E6=88=B7=E6=97=B6=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E5=85=B3=E9=94=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=9E=83=E5=9C=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xdadan/erp/emis/service/EmisBaseService.java | 3 +++
 1 file changed, 3 insertions(+)

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 91f44b892..4bba88ee9 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
@@ -3381,6 +3381,9 @@ public class EmisBaseService {
       * @return
       */
      public EmisCustomerUser createMoneyCustomerUser(EmisCustomerUser emisCustomerUser) {
+         if(Objects.isNull(emisCustomerUser)||StringUtils.isBlank(emisCustomerUser.getPhone())){
+             return new EmisCustomerUser();
+         }
          // 直接返回客户
          if (emisCustomerUser.getCustomerCode() != null) {
              return emisCustomerUser;

From 77741b06f9f0bd8f30ef06680d0acbe3083a29c1 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 15 Dec 2025 14:06:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20TMS-=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC-=E5=AF=BC=E5=85=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/EmisTmsSiteBatchController.java     | 12 +++++++++---
 .../erp/web/emis/annotation/WaybillLightCount.java   |  1 +
 .../com/xdadan/erp/emis/domain/EmisWaybillOther.java |  1 +
 .../erp/emis/mapper/EmisWaybillOtherMapper.java      |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
index 2b2d8f93e..68290f7c0 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
@@ -97,13 +97,19 @@ public class EmisTmsSiteBatchController extends EmisBaseController
 
     /**
      * 用于批次批量上传使用
+     *
      * @param emisTmsSiteBatch
      * @return
      */
     @GetMapping("/listBySupplerAndCarNo")
-    public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch)
-    {
-        List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(),emisTmsSiteBatch.getCarNo(),emisTmsSiteBatch.getEtd());
+    public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch) {
+        if (StringUtils.isNotBlank(emisTmsSiteBatch.getBatchNo())) {
+            EmisTmsSiteBatch queryByBatchNo = new EmisTmsSiteBatch();
+            queryByBatchNo.setBatchNo(emisTmsSiteBatch.getBatchNo());
+            List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(queryByBatchNo);
+            return getDataTable(list);
+        }
+        List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(), emisTmsSiteBatch.getCarNo(), emisTmsSiteBatch.getEtd());
         return getDataTable(list);
     }
 
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
index 6dc3c9a1a..3da1fc0f2 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
@@ -13,3 +13,4 @@ public @interface WaybillLightCount {
 }
 
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
index 3e43fa21f..891f0c016 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
@@ -50,3 +50,4 @@ public class EmisWaybillOther extends BaseEntity {
 }
 
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
index bc7b3d75d..4f27c0854 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
@@ -79,3 +79,4 @@ public interface EmisWaybillOtherMapper extends BaseMapper<EmisWaybillOther> {
 }
 
 
+