From e1d19b270ead01711a18e74857addc1cd5372cac Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 08:46:52 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83=E6=95=B4=EF=BC=9A?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=BC=96=E5=8F=B7=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=BB=8E=E5=89=8D=E7=AB=AF=E7=94=9F=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E8=AE=BA=E6=98=AF=E5=90=A6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=83=BD=E4=BC=9A=E6=B5=AA=E8=B4=B9=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=8E=E5=90=8E=E7=AB=AF=E7=94=9F=E6=88=90=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=BC=96=E5=8F=B7=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=89=8D=E7=AB=AF=E5=A4=87=E6=B3=A8=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E8=AF=A6=E6=83=85=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=A4=87=E6=B3=A8=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysCustomerQuoteServiceImpl.java | 6 ++- .../templates/system/customerQuote/add.html | 50 +++++++++---------- .../system/customerQuote/detail.html | 2 +- .../templates/system/customerQuote/edit.html | 2 +- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index 227b27cd..6945d23c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -190,6 +190,10 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { sysCustomerQuote.setCreateBy(loginName); sysCustomerQuote.setCreateTime(DateUtils.getNowDate()); String commonCurrency = sysCustomerQuote.getCommonCurrency(); + //后台获取客户报价编号 + String quoteCode = redisCache.generateBillNo("KHBJ"); + + sysCustomerQuote.setSupplierCode(quoteCode); if (RMB.equals(commonCurrency)){ sysCustomerQuote.setConfirmTax("1"); }else { @@ -202,7 +206,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { return result; } for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuoteChildList) { - sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); + sysCustomerQuoteChild.setQuoteId(quoteCode); sysCustomerQuoteChild.setCreateTime(new Date()); sysCustomerQuoteChild.setCreateBy(loginName); sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index 4afb7940..62c3e83d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -11,12 +11,12 @@
-
- -
- -
-
+ + + + + +
@@ -113,7 +113,7 @@
- +
@@ -607,24 +607,24 @@ } }); }); - function getCustomerCode(){ - //获取单号 - $.ajax({ - url: prefix + "/getId", - type: "post", - dateType: "json", - success: function (resp) { - if (resp.code === 0) { - $("input[name='supplierCode']").val(resp.data); - } else { - $.modal.msgError("失败啦"); - } - }, - error: function () { - $.modal.msgError("后台出错啦！"); - } - }); - } + // function getCustomerCode(){ + // //获取单号 + // $.ajax({ + // url: prefix + "/getId", + // type: "post", + // dateType: "json", + // success: function (resp) { + // if (resp.code === 0) { + // $("input[name='supplierCode']").val(resp.data); + // } else { + // $.modal.msgError("失败啦"); + // } + // }, + // error: function () { + // $.modal.msgError("后台出错啦！"); + // } + // }); + // } function getBusinessMembers(){ /*业务员列表*/ $.ajax({ diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html index 1545e7c7..6a3c95ef 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html @@ -89,7 +89,7 @@
- +