From b9b65f08381f3fb4f92889a67b33e55527f16682 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 26 May 2025 13:20:57 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=201.TMS=E7=B3=BB=E7=BB=9F-=E7=BD=91?=
 =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=EF=BC=9A=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=AE=A1=E6=89=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=9B=9E=E6=AC=BE=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E8=A2=AB=E4=BF=AE=E6=94=B9=E7=9A=84=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E9=A2=9D=E5=BA=A6=E4=B8=8D=E8=B6=B3?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=BA=94=E8=AF=A5=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=202.=E6=96=B0=E5=A2=9E=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=9A=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7/=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E6=9C=88=E7=BB=93=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E8=BF=90=E5=8D=95=E6=98=AF=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E4=B9=8B=E5=89=8D=E5=BC=80=E7=9A=84=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E4=B9=8B=E5=90=8E=E5=BC=80=E7=9A=84=EF=BC=8C=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E5=BC=80=E7=9A=84=E5=B0=B1=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xdadan/erp/emis/service/EmisBaseService.java    |  7 ++++---
 .../impl/EmisWaybillAjustApplyServiceImpl.java      | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

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 86d8479a7..11df6c884 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
@@ -4058,15 +4058,16 @@ public class EmisBaseService {
       * 检查月结客户首次签约日期，首次签约之前开的不允许修改
       *
       * @param emisWaybillOld
+      * @param emisWaybillNew
       * @throws EmisBizError
       */
-     protected void checkFirstSigningDay(EmisWaybill emisWaybillOld) throws EmisBizError {
-         if (emisWaybillOld == null || emisWaybillOld.getOrderDate() == null || StringUtil.isBlank(emisWaybillOld.getCustNo())) {
+     protected void checkFirstSigningDay(EmisWaybill emisWaybillOld, EmisWaybill emisWaybillNew) throws EmisBizError {
+         if (emisWaybillOld == null || emisWaybillOld.getOrderDate() == null || emisWaybillNew == null || StringUtil.isBlank(emisWaybillNew.getCustNo())) {
              return;
          }
 
          EmisCustomerUser emisCustomerUser = emisCustomerUserMapper
-                 .selectMonthCustomerByMonthlyPayCode(emisWaybillOld.getCustNo());
+                 .selectMonthCustomerByMonthlyPayCode(emisWaybillNew.getCustNo());
          if (emisCustomerUser == null || StringUtil.isBlank(emisCustomerUser.getFirstSigningDay())) {
              return;
          }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
index 222e9c82f..92683743d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
@@ -110,7 +110,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         }
 
         // 检查月结客户首次签约日期，首次签约之前开的不允许修改
-        checkFirstSigningDay(emisWaybillOld);
+        checkFirstSigningDay(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
+
+        // 检查月结/现金客户额度
+        checkUseQuotaCredit(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
 
         // 插入数据
         emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
@@ -131,6 +134,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         return 1;
     }
 
+    private EmisWaybill getEmisWaybillNewFromJson(EmisWaybillAjustApply emisWaybillAjustApply) {
+        JSONObject jsonObject = JSONObject.parseObject(emisWaybillAjustApply.getJsonData());
+        JSONObject newValueJObj=jsonObject.getJSONObject("newValue");
+        WaybillOrder waybillOrder=newValueJObj.toJavaObject(WaybillOrder.class);
+        EmisWaybill emisWaybillSave = waybillOrder.toDb();
+        return emisWaybillSave;
+    }
+
     /**
      * 修改运单调整申请
      *