From eb0a103c49e65b5c58f2a0e0e3f3e9f3f584e516 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Fri, 14 Mar 2025 08:58:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wmsinventoryrecord/WmsInventoryRecordService.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
index 2b9f78b93e..9c373a0e93 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
@@ -304,7 +304,12 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         }
         //单据类型
         if (StringUtils.isNotBlank(query.getBillType())) {
-            qw.like("wir.billType", query.getBillType());
+            String billType = query.getBillType();
+            if (billType.equals("入库")) {
+                qw.like("wir.billType", 1);
+            } if (billType.equals("出库")) {
+                qw.like("wir.billType", 0);
+            }
         }
         //业务类型
         if (StringUtils.isNotBlank(query.getBusTypeValue())) {

From 534bd7b5f53f5774e18f5342d792423d454796e4 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 14 Mar 2025 11:06:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=AA=8C=E8=AF=81=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E4=B8=AD=E7=9A=84=E5=8F=91=E7=A5=A8=E4=BB=B7?=
 =?UTF-8?q?+=E9=85=8D=E4=BB=B6-=E9=85=8D=E4=BB=B6=E6=8A=B5=E9=A1=B6?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AD=89=E4=BA=8E=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E5=8D=95=E8=BD=A6=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 17d0d6662f..9d51618e51 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -3464,15 +3464,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         return rb.setMsg("金融方案中实收金额小于单台订金");
                     }
                     BigDecimal AmountAll = BigDecimal.ZERO;
+                    BigDecimal AllAmount = BigDecimal.ZERO;
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getMainVehicleAmount())) {
                         //主车发票价
                         AmountAll = AmountAll.add(new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()));
+                        AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()));
                     }
                     if (solutionsDetailsVo.isAccessoriesAmountCb()) {//包含配件
                         if (StringUtils.isNotBlank(solutionsDetailsVo.getAccessoriesAmount())) {
                             AmountAll = AmountAll.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
+                            AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
                         }
                     }
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
+                        AllAmount = AllAmount.subtract(new BigDecimal(solutionsDetailsVo.getOffsetAccessories()));
+                    }
+                    if(AllAmount.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) != 0){
+                        return rb.setMsg("需要先完善金融方案信息，再提交订单");
+                    }
                     //判断成交价与主车发票价和配件之和
                     if (AmountAll.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) < 0) {
                         return rb.setMsg("主车发票价与配件之和不能小于订单成交价");
@@ -8563,7 +8572,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String customerSid = busSalesOrder.getCustomerSid();
         LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
         if (loanPreloanCreditApply != null) {
-            if ((!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey()))|| !"通过".equals(loanPreloanCreditApply.getSsjg())) {
+            if ((!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())) || !"通过".equals(loanPreloanCreditApply.getSsjg())) {
                 return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
             }
         }

From 67beb3d14f33c342132fd4cf75b4413c48bdb4fa Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 14 Mar 2025 11:12:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=AA=8C=E8=AF=81=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E4=B8=AD=E7=9A=84=E5=8F=91=E7=A5=A8=E4=BB=B7?=
 =?UTF-8?q?+=E9=85=8D=E4=BB=B6-=E9=85=8D=E4=BB=B6=E6=8A=B5=E9=A1=B6?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AD=89=E4=BA=8E=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E5=8D=95=E8=BD=A6=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 9d51618e51..62ebd4e61c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -3476,11 +3476,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
                         }
                     }
-                    if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
-                        AllAmount = AllAmount.subtract(new BigDecimal(solutionsDetailsVo.getOffsetAccessories()));
+                    AllAmount = AmountAll.subtract(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice()));
+                    if (AllAmount.compareTo(BigDecimal.ZERO) > 0) {
+                        AllAmount = AllAmount;
+                    } else {
+                        AllAmount = BigDecimal.ZERO;
                     }
-                    if(AllAmount.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) != 0){
-                        return rb.setMsg("需要先完善金融方案信息，再提交订单");
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
+                        if(AllAmount.compareTo(new BigDecimal(solutionsDetailsVo.getOffsetAccessories())) != 0){
+                            return rb.setMsg("需要先完善金融方案信息，再提交订单");
+                        }
                     }
                     //判断成交价与主车发票价和配件之和
                     if (AmountAll.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) < 0) {

From 985a73baf75a6995a99880de8e42d3314041acb2 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 14 Mar 2025 11:15:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=AA=8C=E8=AF=81=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E4=B8=AD=E7=9A=84=E5=8F=91=E7=A5=A8=E4=BB=B7?=
 =?UTF-8?q?+=E9=85=8D=E4=BB=B6-=E9=85=8D=E4=BB=B6=E6=8A=B5=E9=A1=B6?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AD=89=E4=BA=8E=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E5=8D=95=E8=BD=A6=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java     | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 62ebd4e61c..9d51618e51 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -3476,16 +3476,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
                         }
                     }
-                    AllAmount = AmountAll.subtract(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice()));
-                    if (AllAmount.compareTo(BigDecimal.ZERO) > 0) {
-                        AllAmount = AllAmount;
-                    } else {
-                        AllAmount = BigDecimal.ZERO;
-                    }
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
-                        if(AllAmount.compareTo(new BigDecimal(solutionsDetailsVo.getOffsetAccessories())) != 0){
-                            return rb.setMsg("需要先完善金融方案信息，再提交订单");
-                        }
+                        AllAmount = AllAmount.subtract(new BigDecimal(solutionsDetailsVo.getOffsetAccessories()));
+                    }
+                    if(AllAmount.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) != 0){
+                        return rb.setMsg("需要先完善金融方案信息，再提交订单");
                     }
                     //判断成交价与主车发票价和配件之和
                     if (AmountAll.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) < 0) {