From ad0899408fac115d96f82ae41dd19afc14efb984 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 17 Jul 2025 17:43:33 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E5=AF=84?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2/=E5=AF=84?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0/?=
 =?UTF-8?q?=E6=B4=BE=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2/?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=20-?=
 =?UTF-8?q?=E5=B7=B2=E5=81=9C=E7=94=A8=E7=9A=84=E6=9C=88=E7=BB=93=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=20=E5=85=81=E8=AE=B8=E6=A8=A1=E7=B3=8A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=80=89=E6=8B=A9=EF=BC=8C=E5=B9=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=20=20=20?=
 =?UTF-8?q?=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9=E6=AC=A1=E8=BF=94=E8=B4=A7?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8D=95=E4=B8=8D=E5=85=81=E8=AE=B8=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/EmisMonthpayAccountController.java    |  2 +-
 .../impl/EmisTmsSiteBatchServiceImpl.java      | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
index 140b80454..e92b0c106 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
@@ -74,7 +74,7 @@ public class EmisMonthpayAccountController extends EmisBaseController
      * @param emisCustomerUser
      * @return
      */
-    @JacksonFilter(include= {"customerCode","custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"customerCode","custNo","custName","payee","salesmen","payeeName","salesmenName","status"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listAllSimple")
     public TableDataInfo listAllSimple(EmisCustomerUser emisCustomerUser)
     {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
index 13a4720a4..dd296af83 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
@@ -147,13 +147,25 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
 
     public void checkSiteBatch(EmisTmsSiteBatch oldSiteBatch, String billCode) throws EmisBizError {
         EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
-        if (Objects.nonNull(emisWaybill) && StringUtil.isNotBlank(emisWaybill.getVirtualRemark())) {
-            throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "已绑定虚拟单，无法录入批次");
-        }
+        checkVirtual(billCode, emisWaybill);
         checkTransPlanRule(oldSiteBatch, emisWaybill);
         checkUnique(oldSiteBatch, billCode);
     }
 
+    private static void checkVirtual(String billCode, EmisWaybill emisWaybill) throws EmisBizError {
+        if (Objects.isNull(emisWaybill)) {
+            return;
+        }
+        if ("0086".equals(emisWaybill.getSendCountry())) {
+            if (StringUtil.isNotBlank(emisWaybill.getVirtualRemark())) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "已绑定虚拟单，无法录入批次");
+            }
+        }
+        if ("0086".equals(emisWaybill.getReceiveCountry()) && "1".equals(emisWaybill.getBlVirtual())) {
+            throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "返货虚拟单，无法录入批次");
+        }
+    }
+
     private void checkTransPlanRule(EmisTmsSiteBatch oldSiteBatch, EmisWaybill emisWaybill) throws EmisBizError {
         EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule();
         emisTransPlanRule.setStartSiteCode(oldSiteBatch.getStartSiteCode());