From 04c8a57f1ca6edc006dc4843673e41ddd6a0d7e9 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 10:02:55 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AE=A2=E9=87=91?= =?UTF-8?q?=E4=B8=BA=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 13 +++---------- .../BusSalesOrderPriceService.java | 15 --------------- .../finpaymentrecord/FinPaymentrecordService.java | 2 ++ 3 files changed, 5 insertions(+), 25 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 791edbea34..4bad908e42 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 @@ -1550,9 +1550,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Fri, 9 Sep 2022 10:22:49 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A4=96=E9=87=87?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finpaymentrecord/FinPaymentrecordService.java | 2 +- .../anrui/fin/biz/kingdee/FinKingDeeFeignRest.java | 2 +- .../appayable/APPayableCastToKingDeeBillFields.java | 2 +- .../appaybill/ApPayBillCastToKingDeeBillFields.java | 10 +++++----- .../appaybill/ApPayBillService.java | 2 +- .../kingdee/{saloutstock => }/appaybill/data.json | 0 .../appaybill/data_FPAYBILLENTRY.json | 0 .../{saloutstock => }/appaybill/data_data.json | 0 .../{saloutstock => }/appaybill/data_model.json | 0 .../kingdee/{saloutstock => }/appaybill/remarks.txt | 0 .../appaybill/webapi测试的数据.txt | 0 .../appaybill/~$付款单的参数必填备注.xlsx | Bin .../appaybill/付款单的参数必填备注.xlsx | Bin .../purmrb/PurMrbCastToKingDeeBillFields.java | 7 ++++--- .../ReceivableBillCastToKingDeeBillFields.java | 4 ++-- .../SalOutStockCastToKingDeeBillFields.java | 6 +++--- .../STKInStockCastToKingDeeBillFields.java | 6 ++++-- .../biz/kingdee/stkinstock/data_FInStockEntry.json | 2 +- .../StkTransferDirectCastToKingDeeBillFields.java | 7 ++++--- .../kingdee/stktransferdirect/data_FBillEntry.json | 2 +- 20 files changed, 28 insertions(+), 24 deletions(-) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/ApPayBillCastToKingDeeBillFields.java (88%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/ApPayBillService.java (95%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/data.json (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/data_FPAYBILLENTRY.json (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/data_data.json (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/data_model.json (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/remarks.txt (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/webapi测试的数据.txt (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/~$付款单的参数必填备注.xlsx (100%) rename anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/{saloutstock => }/appaybill/付款单的参数必填备注.xlsx (100%) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 78e31db14d..6593770137 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -37,7 +37,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.*; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; -import com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill.ApPayBillService; +import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index a83f0d5563..f12da65cdf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -13,7 +13,7 @@ import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; -import com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill.ApPayBillService; +import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService; import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService; import com.yxt.anrui.fin.biz.kingdee.bdmaterial.BdMaterialService; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java index d2a62b50c1..04e1208515 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appayable/APPayableCastToKingDeeBillFields.java @@ -29,7 +29,6 @@ public class APPayableCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_model.json"); - String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appayable/data_FEntityDetail.json"); //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -41,6 +40,7 @@ public class APPayableCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java similarity index 88% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillCastToKingDeeBillFields.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java index 2dbe19b1bd..a7e9fa832d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill; +package com.yxt.anrui.fin.biz.kingdee.appaybill; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -26,10 +26,10 @@ public class ApPayBillCastToKingDeeBillFields { /** * 取模板 */ - String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data.json"); - String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_data.json"); - String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_model.json"); - String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_FPAYBILLENTRY.json"); + String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data.json"); + String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data_data.json"); + String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json"); + String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json"); //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java similarity index 95% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillService.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java index 3338274c9d..0a06326710 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/ApPayBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.fin.biz.kingdee.saloutstock.appaybill; +package com.yxt.anrui.fin.biz.kingdee.appaybill; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data.json similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data.json rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data.json diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_FPAYBILLENTRY.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_FPAYBILLENTRY.json rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_data.json similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_data.json rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_data.json diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/data_model.json rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/remarks.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/remarks.txt similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/remarks.txt rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/remarks.txt diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/webapi测试的数据.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/webapi测试的数据.txt similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/webapi测试的数据.txt rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/webapi测试的数据.txt diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/~$付款单的参数必填备注.xlsx b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/~$付款单的参数必填备注.xlsx similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/~$付款单的参数必填备注.xlsx rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/~$付款单的参数必填备注.xlsx diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/付款单的参数必填备注.xlsx b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/付款单的参数必填备注.xlsx similarity index 100% rename from anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/appaybill/付款单的参数必填备注.xlsx rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/付款单的参数必填备注.xlsx diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbCastToKingDeeBillFields.java index 063041ee47..bddfc6c2cc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/purmrb/PurMrbCastToKingDeeBillFields.java @@ -32,11 +32,10 @@ public class PurMrbCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_model.json"); - String fPURMRBENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/purmrb/data_FPURMRBENTRY.json"); - log.info("readJsonFile:{}",readJsonFile); + log.info("readJsonFile:{}",readJsonFile); log.info("fEntityData_:{}",fEntityData_); log.info("fEntityModel_:{}",fEntityModel_); - log.info("fPURMRBENTRY_:{}",fPURMRBENTRY_); + //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -48,6 +47,8 @@ public class PurMrbCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java index e7f148f1a8..8433c3f860 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/receivablebill/ReceivableBillCastToKingDeeBillFields.java @@ -29,8 +29,7 @@ public class ReceivableBillCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_model.json"); - String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityDetail.json"); - String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityPlan.json"); + String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/receivablebill/data_FEntityPlan.json"); //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -43,6 +42,7 @@ public class ReceivableBillCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java index d3487b5358..32eb4666b9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java @@ -32,11 +32,9 @@ public class SalOutStockCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json"); - String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json"); - log.info("readJsonFile:{}",readJsonFile); + log.info("readJsonFile:{}",readJsonFile); log.info("fEntityData_:{}",fEntityData_); log.info("fEntityModel_:{}",fEntityModel_); - log.info("fEntity_:{}",fEntity_); //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -48,6 +46,8 @@ public class SalOutStockCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockCastToKingDeeBillFields.java index b9223f522b..887f6657cf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockCastToKingDeeBillFields.java @@ -32,11 +32,11 @@ public class STKInStockCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json"); - String fInStockEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json"); + log.info("readJsonFile:{}",readJsonFile); log.info("fEntityData_:{}",fEntityData_); log.info("fEntityModel_:{}",fEntityModel_); - log.info("fInStockEntry_:{}",fInStockEntry_); + //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -48,6 +48,8 @@ public class STKInStockCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json index 005791cf56..e6d17e2274 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_FInStockEntry.json @@ -11,7 +11,7 @@ "FNumber": "liang" }, "FLot": { - "FNumber": "@KD_Flot" + "FNumber": "@KD_FLot" }, "FStockId": { "FNumber": "@KD_FStockId" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java index efa180c9aa..fbf7ae00ed 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java @@ -32,11 +32,10 @@ public class StkTransferDirectCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json"); - String fBillEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json"); - log.info("readJsonFile:{}",readJsonFile); + log.info("readJsonFile:{}",readJsonFile); log.info("fEntityData_:{}",fEntityData_); log.info("fEntityModel_:{}",fEntityModel_); - log.info("FBillEntry_:{}",fBillEntry_); + //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -48,6 +47,8 @@ public class StkTransferDirectCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json index 1f3ce9cb83..1a7c30a0b8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json @@ -9,7 +9,7 @@ "FNumber": "@KD_FDestLot" }, "FLot": { - "FNumber": "@KD_Flot" + "FNumber": "@KD_FLot" }, "FQty": 1.0, "FSrcStockId": { From dc08e78afbb99cbecb86645fc686728b2c4b61e0 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 9 Sep 2022 10:27:43 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A4=96=E9=87=87?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/baseaccadjapply/BaseAccadjApplyService.java | 2 +- .../yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 8e67dd2954..c32f4a252c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -423,7 +423,7 @@ public class BaseAccadjApplyService extends MybatisBaseService Date: Fri, 9 Sep 2022 10:43:13 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE?= =?UTF-8?q?=E4=B9=B0=E6=96=AD=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=97?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue | 2 +- .../weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue index 78e0621433..456371ac3c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue @@ -260,6 +260,7 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') req.pageList(this.listQuery).then((response) => { this.listLoading = false if (response.success) { @@ -323,7 +324,6 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') this.init() }, // 添加修改返回 diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue index 87b38507e2..78f654556b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue @@ -260,6 +260,7 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') req.pageList(this.listQuery).then((response) => { this.listLoading = false if (response.success) { @@ -323,7 +324,6 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') this.init() }, // 添加修改返回 From 3cb6a08fa0b55aa503cedc1ce4590de97ab31fd6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 10:56:30 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E8=AF=A6=E6=83=85=E4=B8=AD=E6=8B=BC=E6=8E=A5=E4=B8=8A?= =?UTF-8?q?=E8=A3=85=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 4 ++-- .../BusSalesOrderMakeupMapper.xml | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 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 4bad908e42..0f451d43a2 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 @@ -1932,8 +1932,8 @@ public class BusSalesOrderService extends MybatisBaseService 0, GROUP_CONCAT('外廓尺寸：', overallDimension), NULL), + IF(LENGTH(trim(GROUP_CONCAT(color))) > 0, GROUP_CONCAT('颜色：', color), + NULL), IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质：', plateMaterial), NULL), IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度：', plateThickness), NULL), - IF(LENGTH(trim(GROUP_CONCAT(announcementModel))) > 0, GROUP_CONCAT('公告型号：', announcementModel), - NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice), - NULL), + IF(LENGTH(trim(GROUP_CONCAT(tarpaulinSlide))) > 0, GROUP_CONCAT('篷布滑道：', tarpaulinSlide), + NULL), + IF(LENGTH(trim(GROUP_CONCAT(refirgerator))) > 0, GROUP_CONCAT('冷藏冷机：', refirgerator), + NULL), + IF(LENGTH(trim(GROUP_CONCAT(selfUnHyCoPl))) > 0, GROUP_CONCAT('自卸液压盖版：', selfUnHyCoPl), + NULL), + IF(LENGTH(trim(GROUP_CONCAT(floorHeating))) > 0, GROUP_CONCAT('底板加热：', floorHeating), + NULL), + IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice, '元'), + NULL), IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置：', moreConfig), NULL), IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注：', remarks), From 775c32b6947e8b08cb9f7b453e1269157b16735a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 9 Sep 2022 11:04:40 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E8=B0=83=E8=BD=A6=E8=B0=83=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tiaozhangshenqingguanliAdd.vue | 57 ++++++++------ .../tiaozhangshenqingEdit.vue | 74 ++++++++----------- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue index 54e81ad644..586d7f2d62 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue @@ -30,15 +30,15 @@ - - + + - - + + @@ -122,7 +122,7 @@ From 82c2f25717aa01ab390507a1c0f2e45ebf2bcc60 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 9 Sep 2022 11:09:14 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java | 2 +- .../yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index efb5e9ae0e..7b851231c0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -202,7 +202,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { /** * //采购组织:FPurchaseOrgId (必填项) */ - stkInStock.setFPurchaseOrgId("102"); + stkInStock.setFPurchaseOrgId("101"); /** * // 供应商:FSupplierId (必填项) */ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json index 561664194d..d2594faef2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/data_model.json @@ -8,7 +8,7 @@ "FNumber": "@KD_FPurchaseOrgId" }, "FDemandOrgId": { - "FNumber": "" + "FNumber": "@KD_FPurchaseOrgId" }, "FPurchaseOrgId": { "FNumber": "@KD_FPurchaseOrgId" @@ -20,13 +20,13 @@ "FNumber": "@KD_FSupplierId" }, "FSupplyId": { - "FNumber": "" + "FNumber": "@KD_FSupplierId" }, "FSettleId": { - "FNumber": "" + "FNumber": "@KD_FSupplierId" }, "FChargeId": { - "FNumber": "" + "FNumber": "@KD_FSupplierId" }, "FOwnerTypeIdHead": "BD_OwnerOrg", "FOwnerIdHead": { From 89a2a0bb2ae44bdc4f3a5489f0e5a363ecf113d0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 11:13:01 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml index fbb2f3b6cb..d96fe89d11 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml @@ -32,6 +32,7 @@ set insuranceNum = NULL, insuranceCarMoney=NULL, insuranceName=NULL, + insuranceNumKey=NULL, remarks = #{remarks} where salesOrderSid = #{sid} From 5e879ae825c5a494256087d9f4a9b00ece84a224 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 13:45:29 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=AE=80=E6=98=93=E8=AE=A2=E9=87=91=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppBusSalesOrderDepositListVo.java | 5 +++++ .../BusDepositFictitiousMapper.xml | 5 +++-- .../BusSalesOrderDepositService.java | 11 ++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java index 76ad317600..1a6927d54a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java @@ -32,4 +32,9 @@ public class AppBusSalesOrderDepositListVo implements Vo { private String name; private Boolean showImage; + @ApiModelProperty("订金总数") + private String deposit; + + @ApiModelProperty("已使用订金") + private String usedDeposit; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml index eefb64066a..0dc35dbeb9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml @@ -40,9 +40,10 @@ select bf.depositBillNo as virtualOrderId, bd.sid as virtualOrderSid, bd2.draweeName as name, - bf.depositPrice as remainderMoney, bf.price as payMoney, - bf.payPath + bf.payPath, + bd2.usedDeposit, + bd2.deposit from bus_deposit_fictitious bf left join bus_main_deposit bd on bd.sid = bf.depositBillSid left join bus_deposit bd2 on bf.depositBillSid = bd2.billSid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index c4e3c402a9..3ccde44e78 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -166,6 +166,15 @@ public class BusSalesOrderDepositService extends MybatisBaseService0){ + if (bigDecimalAll.compareTo(new BigDecimal(dto.getDepositAll())) > 0) { return rb.setMsg("结转金额大于订金合计，请重新选择"); } } From a153ad76cb7f682640ba538dc1f4a99f610b407c Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 9 Sep 2022 13:52:02 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 7b851231c0..0b44fd87a0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -210,7 +210,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { /** * //分配目标组织:TOrgId (必填项) */ - stkInStock.setTOrgId("102"); + stkInStock.setTOrgId("100012"); /** * // 物料列表:FInStockEntry (必填项) */ From 9b86e0756b3096e6a29faed7cdb714f8a6c4af5d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 14:23:48 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/order/AppOrderModelInfoVo.java | 2 ++ .../app/order/AppOrderTopInfoVo.java | 3 ++ .../bussalesorder/BusSalesOrderService.java | 35 ++++++++++--------- .../BusSalesOrderMakeupMapper.xml | 5 ++- .../BusSalesOrderModelMapper.xml | 3 +- .../saleOrders/order/OrderModelInfoVo.java | 2 ++ 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java index 972a08e1e8..b620b25629 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java @@ -37,4 +37,6 @@ public class AppOrderModelInfoVo implements Vo { @ApiModelProperty("配置") private String config; + + private String specialInstructions; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java index 7046dcc988..5e603b0ba2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app.order; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,4 +30,6 @@ public class AppOrderTopInfoVo implements Vo { @ApiModelProperty(value = "上装名称") private String topName; + @JsonIgnore + private String remarks; } 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 0f451d43a2..9838f7b6b4 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 @@ -1268,9 +1268,9 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = crmVehicledemandFeign.selectCrmDemand(intentionSid); CrmOrderVo crmOrderVo = resultBean.getData(); - BeanUtil.copyProperties(crmOrderVo,vo); + BeanUtil.copyProperties(crmOrderVo, vo); vo.setIntentionSid(intentionSid); vo.setAffiliatedType("1"); @@ -1645,9 +1645,9 @@ public class BusSalesOrderService extends MybatisBaseService stringList = Arrays.asList(topInfo.getContractPath().split(",")); if (!stringList.isEmpty()) { List stringList1 = new ArrayList<>(); - stringList.stream().forEach(i->{ - stringList1.add(fileUploadComponent.getUrlPrefix()+i); + stringList.stream().forEach(i -> { + stringList1.add(fileUploadComponent.getUrlPrefix() + i); }); topInfo.setContractImages(stringList1); } } + if (StringUtils.isNotBlank(topInfo.getRemarks())) { + topInfo.setTopBean(topInfo.getTopBean() + "\n" + "备注："+topInfo.getRemarks()); + } vo.setTopInfo(topInfo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index 2793a4d17d..ac95d9e96b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -80,11 +80,10 @@ IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice, '元'), NULL), IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置：', moreConfig), - NULL), - IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注：', remarks), NULL)) as topBean, contractPath, - topName + topName, + remarks FROM bus_sales_order_makeup where salesOrderSid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml index 428d7f4aa0..f808eeeacb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml @@ -63,7 +63,8 @@ when 1 then '0' when 2 then '1' when 3 then '2' end as type, - bp.quantity as total + bp.quantity as total, + bm.specialConfig as specialInstructions from bus_sales_order_model bm left join bus_sales_order bo on bm.salesOrderSid = bo.sid left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java index c28c5e20d1..14ca66502c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java @@ -32,4 +32,6 @@ public class OrderModelInfoVo implements Vo { private List orderList; @ApiModelProperty(value = "合计数量") private String total; + + private String specialInstructions; } From 9403e71bf997499dff3ec62de25966a91402805a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 15:07:41 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderDepositService.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index 3ccde44e78..0106701376 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -244,6 +244,19 @@ public class BusSalesOrderDepositService extends MybatisBaseService listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); + listVos.removeAll(Collections.singleton(null)); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + //查询该虚拟订金单已使用的订金值 + String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); + depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); + //更新该虚拟订单的订金值 + busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); + } + } } } List list = busDepositFictitiousService.getList(depositSid); From 43d971c4029abb98b7c009ff71457a46b61a74be Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 15:17:49 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 9838f7b6b4..68c6f06f77 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 @@ -58,6 +58,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; @@ -76,6 +77,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDeta import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto; +import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService; import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService; import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; @@ -207,6 +209,8 @@ public class BusSalesOrderService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //再加回来 + BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); + //根据订金sid查询虚拟订单和订金的关联 + List listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); + listVos.removeAll(Collections.singleton(null)); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + //查询该虚拟订金单已使用的订金值 + String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); + depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); + //更新该虚拟订单的订金值 + busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); + } + } return rb.success().setData(resultBean.getData()); } } From 05f4cb69467b978b91d9413f138b02d49d389e92 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 15:31:35 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 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 68c6f06f77..708ec445c5 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 @@ -989,16 +989,18 @@ public class BusSalesOrderService extends MybatisBaseService listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); - listVos.removeAll(Collections.singleton(null)); - if (!listVos.isEmpty()) { - for (AppBusSalesOrderDepositListVo listVo : listVos) { - //查询该虚拟订金单已使用的订金值 - String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); - depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); - //更新该虚拟订单的订金值 - busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); + if("02".equals(busSalesOrderDeposit.getDepositTypeKey())){ + //根据订金sid查询虚拟订单和订金的关联 + List listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); + listVos.removeAll(Collections.singleton(null)); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + //查询该虚拟订金单已使用的订金值 + String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); + depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); + //更新该虚拟订单的订金值 + busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); + } } } return rb.success().setData(resultBean.getData()); @@ -2220,12 +2222,12 @@ public class BusSalesOrderService extends MybatisBaseService Date: Fri, 9 Sep 2022 15:37:25 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 708ec445c5..25a36c37a5 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 @@ -1766,6 +1766,20 @@ public class BusSalesOrderService extends MybatisBaseService listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); + listVos.removeAll(Collections.singleton(null)); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + //查询该虚拟订金单已使用的订金值 + String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); + depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); + //更新该虚拟订单的订金值 + busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); + } + } + } //删除订金信息 busSalesOrderDepositService.deleteByOrderSid(sid); if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) { From 753c28210d3e91d4cd85600cf88bac801e62b540 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 16:22:07 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 14 +++++++---- .../BusSalesOrderDepositService.java | 25 ++++++++++--------- 2 files changed, 22 insertions(+), 17 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 25a36c37a5..301440b3c6 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 @@ -989,7 +989,7 @@ public class BusSalesOrderService extends MybatisBaseService listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); listVos.removeAll(Collections.singleton(null)); @@ -2238,10 +2238,14 @@ public class BusSalesOrderService extends MybatisBaseService listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); - listVos.removeAll(Collections.singleton(null)); - if (!listVos.isEmpty()) { - for (AppBusSalesOrderDepositListVo listVo : listVos) { - //查询该虚拟订金单已使用的订金值 - String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); - depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); - //更新该虚拟订单的订金值 - busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); - } + + } + //查询该订金信息的结转信息中已结转的，再加回至简易订金单的已使用订金中 + //根据订金sid查询虚拟订单和订金的关联 + List listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); + listVos.removeAll(Collections.singleton(null)); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + //查询该虚拟订金单已使用的订金值 + String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); + depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString(); + //更新该虚拟订单的订金值 + busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); } } } From fc89c5287ca0fb7d95724114736fdeb9d6f54774 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 9 Sep 2022 16:25:46 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index b44fc811bc..90839e05b5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -977,7 +977,9 @@