From bbbcfe63172d47c21303bfc138795636a91b7557 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Thu, 4 Apr 2024 20:20:14 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E6=A8=A1=E5=9D=97:?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E5=AE=A1=E6=A0=B8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=8A=A5=E4=BB=B7=E6=B5=81=E7=A8=8B=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E6=9C=AA=E8=83=BD=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysCustomerQuoteController.java | 2 +- .../controller/SysSalesOrderController.java | 6 +- .../ruoyi/system/domain/SysCustomerQuote.java | 53 +- .../ruoyi/system/domain/SysSalesOrder.java | 197 ++- .../system/domain/SysSalesOrderChild.java | 176 ++- .../system/service/ISysSalesOrderService.java | 1 - .../impl/SysCustomerQuoteServiceImpl.java | 4 +- .../impl/SysSalesOrderServiceImpl.java | 47 +- .../mapper/system/SysCustomerMapper.xml | 8 +- .../mapper/system/SysCustomerQuoteMapper.xml | 8 +- .../mapper/system/SysSalesOrderMapper.xml | 217 +++- .../resources/templates/erp/material/add.html | 18 - .../templates/system/contacts/contacts.html | 9 - .../templates/system/customer/customer.html | 3 +- .../system/customer/taskModifyApply.html | 1 + .../system/customer/taskYwjlVerify.html | 1 + .../system/customer/taskYwzgVerify.html | 1 + ...askGozjVerify.html => taskZozjVerify.html} | 1 + .../templates/system/customerQuote/add.html | 20 +- .../system/customerQuote/customerQuote.html | 2 +- .../templates/system/customerQuote/edit.html | 55 +- .../templates/system/salesOrder/add.html | 1106 ++++++----------- .../templates/system/salesOrder/edit.html | 460 ++++--- .../system/salesOrder/salesOrder.html | 52 +- .../templates/system/shippingaddress/add.html | 2 +- 25 files changed, 1162 insertions(+), 1288 deletions(-) rename ruoyi-admin/src/main/resources/templates/system/customer/{taskGozjVerify.html => taskZozjVerify.html} (99%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java index 9c0d4583..457f5c27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java @@ -307,7 +307,7 @@ public class SysCustomerQuoteController extends BaseController @RequestMapping("/getCustomerQuoteSelList") @ResponseBody - public AjaxResult ggetCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){ + public AjaxResult getCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){ SysCustomerQuoteVo sysCustomerQuoteVo = new SysCustomerQuoteVo(); sysCustomerQuoteVo.setKeyword(keyword); return success(sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index 88133580..da83d6bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -150,10 +150,10 @@ public class SysSalesOrderController extends BaseController /** * 修改销售订单 */ - @GetMapping("/edit/{salesOrderId}") - public String edit(@PathVariable("salesOrderId") Long salesOrderId, ModelMap mmap) + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { - SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(salesOrderId); + SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(id); mmap.put("sysSalesOrder", sysSalesOrder); return prefix + "/edit"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java index cee5ade1..f4619952 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java @@ -62,14 +62,14 @@ public class SysCustomerQuote extends BaseEntity /** 不含税总价(RMB) */ @Excel(name = "不含税总价(RMB)") - private Decimal noRmbSum; + private Double noRmbSum; @Excel(name = "不含税单价(RMB)") - private Decimal noRmb; + private Double noRmb; @Excel(name = "含税单价(RMB)") - private Decimal rmb; + private Double rmb; /** 含税总价(RMB) */ @Excel(name = "含税总价(RMB)") - private Decimal rmbSum; + private Double rmbSum; /** 不含税单价(美元) */ @Excel(name = "不含税单价(美元)") @@ -79,10 +79,10 @@ public class SysCustomerQuote extends BaseEntity private Double noUsdSum; /** 含税总价(美元) */ @Excel(name = "含税单价(美元)") - private Decimal usd; + private Double usd; /** 含税总价(美元) */ @Excel(name = "含税总价(美元)") - private Decimal usdSum; + private Double usdSum; private String businessMembers; @Excel(name = "审核标志: 0未审核 1审核成功 2审核拒绝") @@ -224,35 +224,35 @@ public class SysCustomerQuote extends BaseEntity return enterpriseSum; } - public Decimal getNoRmbSum() { + public Double getNoRmbSum() { return noRmbSum; } - public void setNoRmbSum(Decimal noRmbSum) { + public void setNoRmbSum(Double noRmbSum) { this.noRmbSum = noRmbSum; } - public Decimal getNoRmb() { + public Double getNoRmb() { return noRmb; } - public void setNoRmb(Decimal noRmb) { + public void setNoRmb(Double noRmb) { this.noRmb = noRmb; } - public Decimal getRmb() { + public Double getRmb() { return rmb; } - public void setRmb(Decimal rmb) { + public void setRmb(Double rmb) { this.rmb = rmb; } - public Decimal getRmbSum() { + public Double getRmbSum() { return rmbSum; } - public void setRmbSum(Decimal rmbSum) { + public void setRmbSum(Double rmbSum) { this.rmbSum = rmbSum; } @@ -272,31 +272,38 @@ public class SysCustomerQuote extends BaseEntity this.noUsdSum = noUsdSum; } - public Decimal getUsd() { + public Double getUsd() { return usd; } - public void setUsd(Decimal usd) { + public void setUsd(Double usd) { this.usd = usd; } - public Decimal getUsdSum() { + public Double getUsdSum() { return usdSum; } - public void setUsdSum(Decimal usdSum) { + public void setUsdSum(Double usdSum) { this.usdSum = usdSum; } - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; + + public String getDeginFlag() { + return deginFlag; } - public String getDelFlag() - { + public void setDeginFlag(String deginFlag) { + this.deginFlag = deginFlag; + } + + public String getDelFlag() { return delFlag; } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public List getSysCustomerQuoteChildList() { return sysCustomerQuoteChildList; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index 94ae4533..23670f9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -41,16 +41,25 @@ public class SysSalesOrder extends BaseEntity { /* 客户代码*/ @Excel(name = "客户代码") private String enterpriseCode; - + @Excel(name="币种") + private String commonCurrency; + /*美元汇率*/ + private Double usdTax; + /*税率*/ + private String taxRate; + /*是否开票*/ + private String invoice; /* 客户名称*/ @Excel(name = "客户名称") private String enterpriseName; + /*事业部*/ + private String customerPurser; /*客户电话*/ private String customerPhone; /*物料合计*/ - private String materialSum; + private Double materialSum; /*数量合计*/ - private String enterpriseSum; + private Double enterpriseSum; /*不含税单价(RMB)*/ private Double noRmbPrice; /*不含税总价(RMB)*/ @@ -69,6 +78,10 @@ public class SysSalesOrder extends BaseEntity { private String usdTaxSum; /*计划交付时间*/ private String deliveryTime; + /*客户收货人*/ + private String customerDelivery; + /*客户收货人电话*/ + private String deliveryPhone; /* 交货条件*/ @Excel(name = "交货条件") private String deliveryConditions; @@ -96,6 +109,10 @@ public class SysSalesOrder extends BaseEntity { /* 传真号码*/ @Excel(name = "传真号码") private String customerFax; + @Excel(name = "邮箱") + private String contactEmail; + @Excel(name="联系人职务") + private String contactPost; /*业务人员*/ @Excel(name = "业务人员") private String businessMembers; @@ -106,9 +123,6 @@ public class SysSalesOrder extends BaseEntity { /* 修改日期*/ @Excel(name = "客户验收时间") private String modificationTime; - /* 税率*/ - @Excel(name = "税率") - private String taxRate; /* 合计金额*/ @Excel(name = "合计金额") private String totalAmount; @@ -227,6 +241,38 @@ public class SysSalesOrder extends BaseEntity { this.enterpriseCode = enterpriseCode; } + public String getCommonCurrency() { + return commonCurrency; + } + + public void setCommonCurrency(String commonCurrency) { + this.commonCurrency = commonCurrency; + } + + public Double getUsdTax() { + return usdTax; + } + + public void setUsdTax(Double usdTax) { + this.usdTax = usdTax; + } + + public String getTaxRate() { + return taxRate; + } + + public void setTaxRate(String taxRate) { + this.taxRate = taxRate; + } + + public String getInvoice() { + return invoice; + } + + public void setInvoice(String invoice) { + this.invoice = invoice; + } + public String getEnterpriseName() { return enterpriseName; } @@ -235,6 +281,14 @@ public class SysSalesOrder extends BaseEntity { this.enterpriseName = enterpriseName; } + public String getCustomerPurser() { + return customerPurser; + } + + public void setCustomerPurser(String customerPurser) { + this.customerPurser = customerPurser; + } + public String getCustomerPhone() { return customerPhone; } @@ -243,20 +297,19 @@ public class SysSalesOrder extends BaseEntity { this.customerPhone = customerPhone; } - - public String getMaterialSum() { + public Double getMaterialSum() { return materialSum; } - public void setMaterialSum(String materialSum) { + public void setMaterialSum(Double materialSum) { this.materialSum = materialSum; } - public String getEnterpriseSum() { + public Double getEnterpriseSum() { return enterpriseSum; } - public void setEnterpriseSum(String enterpriseSum) { + public void setEnterpriseSum(Double enterpriseSum) { this.enterpriseSum = enterpriseSum; } @@ -332,6 +385,22 @@ public class SysSalesOrder extends BaseEntity { this.deliveryTime = deliveryTime; } + public String getCustomerDelivery() { + return customerDelivery; + } + + public void setCustomerDelivery(String customerDelivery) { + this.customerDelivery = customerDelivery; + } + + public String getDeliveryPhone() { + return deliveryPhone; + } + + public void setDeliveryPhone(String deliveryPhone) { + this.deliveryPhone = deliveryPhone; + } + public String getDeliveryConditions() { return deliveryConditions; } @@ -404,6 +473,22 @@ public class SysSalesOrder extends BaseEntity { this.customerFax = customerFax; } + public String getContactEmail() { + return contactEmail; + } + + public void setContactEmail(String contactEmail) { + this.contactEmail = contactEmail; + } + + public String getContactPost() { + return contactPost; + } + + public void setContactPost(String contactPost) { + this.contactPost = contactPost; + } + public String getBusinessMembers() { return businessMembers; } @@ -420,12 +505,12 @@ public class SysSalesOrder extends BaseEntity { this.confirmTax = confirmTax; } - public String getTaxRate() { - return taxRate; + public String getModificationTime() { + return modificationTime; } - public void setTaxRate(String taxRate) { - this.taxRate = taxRate; + public void setModificationTime(String modificationTime) { + this.modificationTime = modificationTime; } public String getTotalAmount() { @@ -476,14 +561,6 @@ public class SysSalesOrder extends BaseEntity { this.updateInfoTime = updateInfoTime; } - public String getModificationTime() { - return modificationTime; - } - - public void setModificationTime(String modificationTime) { - this.modificationTime = modificationTime; - } - public String getTradeClause() { return tradeClause; } @@ -492,11 +569,11 @@ public class SysSalesOrder extends BaseEntity { this.tradeClause = tradeClause; } - public Integer getOutboundQuantity() { + public Integer getOutBoundQuantity() { return outBoundQuantity; } - public void setOutboundQuantity(Integer outBoundQuantity) { + public void setOutBoundQuantity(Integer outBoundQuantity) { this.outBoundQuantity = outBoundQuantity; } @@ -508,13 +585,12 @@ public class SysSalesOrder extends BaseEntity { this.unBoundQuantity = unBoundQuantity; } - - public Integer getOutBoundQuantity() { - return outBoundQuantity; + public String getApplyUser() { + return applyUser; } - public void setOutBoundQuantity(Integer outBoundQuantity) { - this.outBoundQuantity = outBoundQuantity; + public void setApplyUser(String applyUser) { + this.applyUser = applyUser; } public Date getApplyTime() { @@ -541,6 +617,22 @@ public class SysSalesOrder extends BaseEntity { this.applyTitle = applyTitle; } + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + public String getCancelInstanceId() { return cancelInstanceId; } @@ -578,7 +670,12 @@ public class SysSalesOrder extends BaseEntity { .add("salesOrderNumber", salesOrderNumber) .add("salesOrderType", salesOrderType) .add("enterpriseCode", enterpriseCode) + .add("commonCurrency", commonCurrency) + .add("usdTax", usdTax) + .add("taxRate", taxRate) + .add("invoice", invoice) .add("enterpriseName", enterpriseName) + .add("customerPurser", customerPurser) .add("customerPhone", customerPhone) .add("materialSum", materialSum) .add("enterpriseSum", enterpriseSum) @@ -591,6 +688,8 @@ public class SysSalesOrder extends BaseEntity { .add("usdPrice", usdPrice) .add("usdTaxSum", usdTaxSum) .add("deliveryTime", deliveryTime) + .add("customerDelivery", customerDelivery) + .add("deliveryPhone", deliveryPhone) .add("deliveryConditions", deliveryConditions) .add("deliveryMethod", deliveryMethod) .add("deliveryAddress", deliveryAddress) @@ -600,10 +699,11 @@ public class SysSalesOrder extends BaseEntity { .add("customerContact", customerContact) .add("contactNumber", contactNumber) .add("customerFax", customerFax) + .add("contactEmail", contactEmail) + .add("contactPost", contactPost) .add("businessMembers", businessMembers) .add("confirmTax", confirmTax) .add("modificationTime", modificationTime) - .add("taxRate", taxRate) .add("totalAmount", totalAmount) .add("fileUpload", fileUpload) .add("standbyOne", standbyOne) @@ -611,32 +711,17 @@ public class SysSalesOrder extends BaseEntity { .add("firstAddTime", firstAddTime) .add("updateInfoTime", updateInfoTime) .add("tradeClause", tradeClause) - .add("outboundQuantity", outBoundQuantity) + .add("outBoundQuantity", outBoundQuantity) .add("unBoundQuantity", unBoundQuantity) + .add("applyUser", applyUser) + .add("applyTime", applyTime) + .add("submitInstanceId", submitInstanceId) + .add("applyTitle", applyTitle) + .add("instanceId", instanceId) + .add("instanceType", instanceType) + .add("cancelInstanceId", cancelInstanceId) + .add("restoreInstanceId", restoreInstanceId) + .add("sysSalesOrderChildList", sysSalesOrderChildList) .toString(); } - - public String getInstanceId() { - return instanceId; - } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } - - public String getInstanceType() { - return instanceType; - } - - public void setInstanceType(String instanceType) { - this.instanceType = instanceType; - } - - public String getApplyUser() { - return applyUser; - } - - public void setApplyUser(String applyUser) { - this.applyUser = applyUser; - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java index 6fabae72..b2ab61ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java @@ -56,6 +56,9 @@ public class SysSalesOrderChild extends BaseEntity { @Excel(name = "物料的品牌") private String brand; + @Excel(name="单位") + private String unit; + /** 物料的图片 */ @Excel(name = "物料的图片") private String photoUrl; @@ -66,31 +69,50 @@ public class SysSalesOrderChild extends BaseEntity { /** 国内税率 */ @Excel(name = "国内税率") - private BigDecimal countTax; + private Double countTax; /** 美元汇率 */ @Excel(name = "美元汇率") - private BigDecimal usdTax; + private Double usdTax; /*物料合计*/ - private String materialSum; + private Double materialSum; /*数量合计*/ - private String enterpriseSum; - /*不含税单价(RMB)*/ - private Double noRmbPrice; - /*不含税总价(RMB)*/ - private Double noRmbSum; - /*含税单价(RMB)*/ - private Double rmbPrice; - /*含税总价(RMB)*/ - private Double rmbTaxSum; - /*不含税单价(美元)*/ - private Double noUsdPrice; - /*不含税总价(美元)*/ - private Double noUsdSum; - /*含税单价(美元)*/ - private Double usdPrice; - /*含税总价(美元)*/ - private String usdTaxSum; + private Double enterpriseSum; + @Excel(name = "物料的对外售价") + private BigDecimal materialSole; + + /** 物料的不含税单价(RMB) */ + @Excel(name = "物料的不含税单价(RMB) ") + private BigDecimal materialRmb; + + /** 物料的含税单价(RMB) */ + @Excel(name = "物料的含税单价(RMB)") + private BigDecimal materialNoRmb; + + /** 物料的不含税单价(USD) */ + @Excel(name = "物料的不含税单价(USD)") + private BigDecimal materialNoUsd; + + /** 物料的含税单价(USD) */ + @Excel(name = "物料的含税单价(USD)") + private BigDecimal materialUsd; + + /** 物料的含税总价(USD) */ + @Excel(name = "物料的含税总价(USD)") + private BigDecimal materialUsdSum; + + /** 物料的不含税总价(USD) */ + @Excel(name = "物料的不含税总价(USD)") + private BigDecimal materialNoUsdSum; + + /** 物料的含税总价(RMB) */ + @Excel(name = "物料的含税总价(RMB)") + private BigDecimal materialNoRmbSum; + + /** 物料的不含税总价(RMB) */ + @Excel(name = "物料的不含税总价(RMB)") + private BigDecimal materialRmbSum; + /*业务人员*/ @Excel(name = "业务人员") private String businessMembers; @@ -203,6 +225,14 @@ public class SysSalesOrderChild extends BaseEntity { this.brand = brand; } + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + public String getPhotoUrl() { return photoUrl; } @@ -219,100 +249,108 @@ public class SysSalesOrderChild extends BaseEntity { this.describe = describe; } - public BigDecimal getCountTax() { + public Double getCountTax() { return countTax; } - public void setCountTax(BigDecimal countTax) { + public void setCountTax(Double countTax) { this.countTax = countTax; } - public BigDecimal getUsdTax() { + public Double getUsdTax() { return usdTax; } - public void setUsdTax(BigDecimal usdTax) { + public void setUsdTax(Double usdTax) { this.usdTax = usdTax; } - public String getMaterialSum() { + public Double getMaterialSum() { return materialSum; } - public void setMaterialSum(String materialSum) { + public void setMaterialSum(Double materialSum) { this.materialSum = materialSum; } - public String getEnterpriseSum() { + public Double getEnterpriseSum() { return enterpriseSum; } - public void setEnterpriseSum(String enterpriseSum) { + public void setEnterpriseSum(Double enterpriseSum) { this.enterpriseSum = enterpriseSum; } - public Double getNoRmbPrice() { - return noRmbPrice; + public BigDecimal getMaterialSole() { + return materialSole; + } + + public void setMaterialSole(BigDecimal materialSole) { + this.materialSole = materialSole; + } + + public BigDecimal getMaterialRmb() { + return materialRmb; } - public void setNoRmbPrice(Double noRmbPrice) { - this.noRmbPrice = noRmbPrice; + public void setMaterialRmb(BigDecimal materialRmb) { + this.materialRmb = materialRmb; } - public Double getNoRmbSum() { - return noRmbSum; + public BigDecimal getMaterialNoRmb() { + return materialNoRmb; } - public void setNoRmbSum(Double noRmbSum) { - this.noRmbSum = noRmbSum; + public void setMaterialNoRmb(BigDecimal materialNoRmb) { + this.materialNoRmb = materialNoRmb; } - public Double getRmbPrice() { - return rmbPrice; + public BigDecimal getMaterialNoUsd() { + return materialNoUsd; } - public void setRmbPrice(Double rmbPrice) { - this.rmbPrice = rmbPrice; + public void setMaterialNoUsd(BigDecimal materialNoUsd) { + this.materialNoUsd = materialNoUsd; } - public Double getRmbTaxSum() { - return rmbTaxSum; + public BigDecimal getMaterialUsd() { + return materialUsd; } - public void setRmbTaxSum(Double rmbTaxSum) { - this.rmbTaxSum = rmbTaxSum; + public void setMaterialUsd(BigDecimal materialUsd) { + this.materialUsd = materialUsd; } - public Double getNoUsdPrice() { - return noUsdPrice; + public BigDecimal getMaterialUsdSum() { + return materialUsdSum; } - public void setNoUsdPrice(Double noUsdPrice) { - this.noUsdPrice = noUsdPrice; + public void setMaterialUsdSum(BigDecimal materialUsdSum) { + this.materialUsdSum = materialUsdSum; } - public Double getNoUsdSum() { - return noUsdSum; + public BigDecimal getMaterialNoUsdSum() { + return materialNoUsdSum; } - public void setNoUsdSum(Double noUsdSum) { - this.noUsdSum = noUsdSum; + public void setMaterialNoUsdSum(BigDecimal materialNoUsdSum) { + this.materialNoUsdSum = materialNoUsdSum; } - public Double getUsdPrice() { - return usdPrice; + public BigDecimal getMaterialNoRmbSum() { + return materialNoRmbSum; } - public void setUsdPrice(Double usdPrice) { - this.usdPrice = usdPrice; + public void setMaterialNoRmbSum(BigDecimal materialNoRmbSum) { + this.materialNoRmbSum = materialNoRmbSum; } - public String getUsdTaxSum() { - return usdTaxSum; + public BigDecimal getMaterialRmbSum() { + return materialRmbSum; } - public void setUsdTaxSum(String usdTaxSum) { - this.usdTaxSum = usdTaxSum; + public void setMaterialRmbSum(BigDecimal materialRmbSum) { + this.materialRmbSum = materialRmbSum; } public String getBusinessMembers() { @@ -370,20 +408,22 @@ public class SysSalesOrderChild extends BaseEntity { .add("materialType", materialType) .add("processMethod", processMethod) .add("brand", brand) + .add("unit", unit) .add("photoUrl", photoUrl) .add("describe", describe) .add("countTax", countTax) .add("usdTax", usdTax) .add("materialSum", materialSum) .add("enterpriseSum", enterpriseSum) - .add("noRmbPrice", noRmbPrice) - .add("noRmbSum", noRmbSum) - .add("rmbPrice", rmbPrice) - .add("rmbTaxSum", rmbTaxSum) - .add("noUsdPrice", noUsdPrice) - .add("noUsdSum", noUsdSum) - .add("usdPrice", usdPrice) - .add("usdTaxSum", usdTaxSum) + .add("materialSole", materialSole) + .add("materialRmb", materialRmb) + .add("materialNoRmb", materialNoRmb) + .add("materialNoUsd", materialNoUsd) + .add("materialUsd", materialUsd) + .add("materialUsdSum", materialUsdSum) + .add("materialNoUsdSum", materialNoUsdSum) + .add("materialNoRmbSum", materialNoRmbSum) + .add("materialRmbSum", materialRmbSum) .add("businessMembers", businessMembers) .add("confirmTax", confirmTax) .add("taxRate", taxRate) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java index 37849544..ea988ca2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java @@ -70,7 +70,6 @@ public interface ISysSalesOrderService @Transactional(rollbackFor = Exception.class) ProcessInstance cancelSysCustomerById(Long id); - @Transactional(rollbackFor = Exception.class) ProcessInstance restoreSysCustomerById(Long id); @Transactional(rollbackFor = Exception.class) ProcessInstance submitApply(SysSalesOrder sysSalesOrder); 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 9000fb27..8565e473 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 @@ -89,7 +89,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { if (sysUser2!=null){ customerQuoteVo.setApplyUserName(sysUser2.getUserName()); } - String instanceId = sysCustomerQuoteVo.getInstanceId(); + String instanceId = customerQuoteVo.getInstanceId(); // 当前环节 if (StringUtils.isNotBlank(instanceId)) { List taskList = taskService.createTaskQuery() @@ -99,7 +99,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { if (!CollectionUtils.isEmpty(taskList)) { TaskEntityImpl task = (TaskEntityImpl) taskList.get(0); String taskId = task.getId(); - sysCustomerQuoteVo.setTaskId(taskId); + customerQuoteVo.setTaskId(taskId); // 设置待办用户 List todoUserList = todoItemMapper.selectUndealTodoUserList(taskId); if(!CollectionUtils.isEmpty(taskList)){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index 82e925ab..97e10998 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -15,10 +15,7 @@ import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper; import com.ruoyi.system.domain.*; import com.ruoyi.system.mapper.SysSalesOrderMapper; import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.service.ISysAttachFileService; -import com.ruoyi.system.service.ISysAttachService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysSalesOrderService; +import com.ruoyi.system.service.*; import org.activiti.engine.TaskService; import org.activiti.engine.impl.persistence.entity.TaskEntityImpl; import org.activiti.engine.runtime.ProcessInstance; @@ -70,6 +67,9 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Autowired private ISysRoleService roleService; + @Autowired + private ISysSalesOrderChildService sysSalesOrderChildService; + /** * 查询销售订单 * @@ -164,6 +164,16 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){ String loginName = ShiroUtils.getLoginName(); sysSalesOrder.setCreateBy(loginName); + int s = sysSalesOrder.getSysSalesOrderChildList().size(); + if (s == 0){ + return 0; + } + for (int i = 0; i < s ;i++) { + SysSalesOrderChild sysSalesOrderChild = sysSalesOrder.getSysSalesOrderChildList().get(i); + sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode()); + sysSalesOrderChild.setCreateBy(loginName); + sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild); + } return sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder); } @@ -177,9 +187,32 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Override public int updateSysSalesOrder(SysSalesOrder sysSalesOrder) { - String loginName = ShiroUtils.getLoginName(); - sysSalesOrder.setUpdateBy(loginName); - sysSalesOrder.setUpdateTime(DateUtils.getNowDate()); + sysSalesOrder.setAuditStatus("0"); + SysUser user = ShiroUtils.getSysUser(); + // 启动流程 + String applyTitle = user.getUserName()+"发起了修改销售订单审批-"+ DateUtils.dateTimeNow(); + String instanceType = "cancel"; + ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,sysSalesOrder, user); + String processInstanceId = processInstance.getProcessInstanceId(); + // 作废实例id + sysSalesOrder.setCancelInstanceId(processInstanceId); + // 存在提交完就流程结束的情况 + boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); + if(processIsFinish){ + // 审核状态-审核通过 + sysSalesOrder.setAuditStatus("1"); + // 使用状态-已作废 + sysSalesOrder.setUseStatus("2"); + }; + List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); + for (SysSalesOrderChild sysSalesOrderChild:sysSalesOrderChildList) { + if (sysSalesOrderChild.getId() != null && sysSalesOrderChild.getId() != 0){ + sysSalesOrderChildService.updateSysSalesOrderChild(sysSalesOrderChild); + }else{ + sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode()); + sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild); + } + } return sysSalesOrderMapper.updateSysSalesOrder(sysSalesOrder); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 62038d22..fd6891c3 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -135,11 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" established_time,s.invoicing_customer_name,s.invoicing_company_name,s.invoice_code,s.deposit_bank,s.bank_account,s. common_currency,s.confirm_tax,s.tax_rate,s.integrity_rating,s.registered_capital,s.payment_terms,s.customs_code,s. customer_contact_id,s.customer_contact,s.customer_office,s.contact_number,s.customer_email,s.customer_fax,s. - delivery_address_id,s.delivery_customer_person,s.delivery_customer_phone,s. - delivery_address,s.delivery_customer_postal,s.delivery_customer_fax,s.business_members, - s.identifying_people,s.first_add_time,s.update_info_time,s.audit_status,s.use_status,s.update_by, - s.instance_id, s.nstance_type, - p.dict_value as instance_type_name, + delivery_address_id,s.delivery_customer_person,s.delivery_customer_phone,s.delivery_address, + s.delivery_customer_postal,s.delivery_customer_fax,s.business_members,s.identifying_people,s.first_add_time, + s.update_info_time,s.audit_status,s.use_status,s.update_by,s.instance_id, s.instance_type,p.dict_value as instance_type_name, s.submit_instance_id, s.cancel_instance_id, s.restore_instance_id, s.apply_title, s.apply_user, s.apply_time from sys_customer as s left join( diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml index 9fc6a0ba..c90e9aa5 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml @@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pricingDate, enterprise, enterpriseSum, - common_currency, + common_currency, confirm_fax, rmbTax, usdTax, @@ -146,11 +146,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{pricingDate}, #{enterprise}, #{enterpriseSum}, - #{commonCurrency}, + #{commonCurrency}, #{confirmFax}, #{rmbTax}, #{usdTax}, - #{noRmb}, + #{noRmb}, #{noRmbSum}, #{rmb}, #{rmbSum}, @@ -186,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pricingDate = #{pricingDate}, enterprise = #{enterprise}, enterpriseSum = #{enterpriseSum}, - common_currency = #{common_currency}, + common_currency = #{commonCurrency}, confirm_fax = #{confirmFax}, rmbTax = #{rmbTax}, usdTax = #{usdTax}, diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml index d04c2160..affa5625 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml @@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -30,14 +32,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - + + + + + @@ -65,29 +73,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select sales_order_id, use_status, audit_status, make_status, delivery_status, - close_status, sales_order_code, sales_order_number, sales_order_type,enterprise_code, - enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice, rmbTaxSum, - noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time, - delivery_conditions, delivery_method, delivery_address, order_receiving_mode, - customer_contact, contact_number, customer_fax, business_members, confirm_tax, tax_rate, - total_amount, billing_time, modification_time,standby_one, standby_two, first_add_time, - update_info_time, file_upload, create_by, create_time, update_by, update_time, remark, - out_bound_quantity, un_bound_quantity, trade_clause, instance_id, instance_type, - submit_instance_id, cancel_instance_id, restore_instance_id, apply_title, apply_user, apply_time - from sys_sales_order + select + sales_order_id, use_status, audit_status, make_status, delivery_status,close_status, + sales_order_code, sales_order_number, sales_order_type,enterprise_code,customer_purser, + common_currency,enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice, + rmbTaxSum,noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time, + delivery_conditions, delivery_method, delivery_address,delivery_phone,customer_delivery, + order_receiving_mode,customer_contact, contact_number,contact_email, contact_post, + customer_fax, business_members, confirm_tax, tax_rate,usd_tax,invoice,total_amount, + modification_time,standby_one,standby_two, first_add_time, update_info_time, file_upload, + create_by, create_time, update_by, update_time,trade_clause, remark, out_bound_quantity, + un_bound_quantity, instance_id, instance_type,submit_instance_id, cancel_instance_id, + restore_instance_id, apply_title,apply_user, apply_time + from sys_sales_order @@ -122,118 +138,185 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sales_order_code, sales_order_number, + sales_order_type, enterprise_code, enterprise_name, + customer_purser, + common_currency, + material_sum, + enterprise_sum, + noRmbPrice, + noRmbSum, + rmbPrice, + rmbTaxSum, + noUsdPrice, + noUsdSum, + usdPrice, + usdTaxSum, + confirm_tax, + tax_rate, + usd_tax, + invoice, payment_terms, delivery_time, - #{deliveryAddress}, delivery_conditions, - delivery_method, + delivery_method , + delivery_phone, + delivery_address, + customer_delivery, + order_receiving_mode, + order_receiving_time, customer_contact, + contact_email, + contact_post, contact_number, - business_members, customer_fax, - delivery_address, - order_receiving_time, - order_receiving_mode, - confirm_tax, - tax_rate, - total_amount, + business_members, + total_amount, modification_time, + trade_clause, standby_one, standby_two, file_upload, - create_by, remark, out_bound_quantity, - un_bound_quantity, + un_bound_quantity trade_clause, - instance_id, + use_status, + audit_status, + make_status, + delivery_status, + close_status, instance_type, - submit_instance_id, - cancel_instance_id, - restore_instance_id, - apply_title, + instance_id, apply_user, apply_time, + apply_title, first_add_time,create_time #{salesOrderCode}, #{salesOrderNumber}, + #{salesOrderType}, #{enterpriseCode}, #{enterpriseName}, + #{customerPurser}, + #{commonCurrency}, + #{materialSum}, + #{enterpriseSum}, + #{noRmbPrice}, + #{noRmbSum}, + #{rmbPrice}, + #{rmbTaxSum}, + #{noUsdPrice}, + #{noUsdSum}, + #{usdPrice}, + #{usdTaxSum}, + #{confirmTax}, + #{taxRate}, + #{usdTax}, + #{invoice}, #{paymentTerms}, #{deliveryTime}, - #{deliveryStatus}, #{deliveryConditions}, #{deliveryMethod}, + #{deliveryPhone}, + #{deliveryAddress}, + #{customerDelivery}, + #{orderReceivingMode}, + #{orderReceivingTime}, #{customerContact}, + #{contactEmail}, + #{contactPost}, #{contactNumber}, - #{businessMembers}, #{customerFax}, - #{deliveryAddress}, - #{orderReceivingTime}, - #{orderReceivingMode}, - #{confirmTax}, - #{taxRate}, - #{totalAmount}, + #{businessMembers}, + #{totalAmount}, #{modificationTime}, + #{tradeClause}, #{standbyOne}, #{standbyTwo}, #{fileUpload}, - #{createBy}, #{remark}, - #{outBoundQuantity}, - #{unBoundQuantity}, + #{unBoundQuantity}, + #{unBoundQuantity} #{tradeClause}, - #{instanceId}, + #{useStatus}, + #{auditStatus}, + #{makeStatus}, + #{deliveryStatus}, + #{closeStatus}, #{instanceType}, - #{submitInstanceId}, - #{cancelInstanceId}, - #{restoreInstanceId}, - #{applyTitle}, + #{instanceId}, #{applyUser}, #{applyTime}, + #{applyTitle}, now(),now() update sys_sales_order - sales_order_code = #{salesOrderCode}, + sales_order_code = #{salesOrderCode}, sales_order_number = #{salesOrderNumber}, - appointment_number = #{appointmentNumber}, + sales_order_type = #{salesOrderType}, + customer_purser = #{customerPurser}, enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, + enterprise_name =#{enterpriseName}, + material_sum = #{materialSum}, + enterprise_sum = #{enterpriseSum}, + common_currency = #{commonCurrency}, + noRmbPrice = #{noRmbPrice}, + noRmbSum = #{noRmbSum}, + rmbPrice = #{rmbPrice}, + rmbTaxSum = #{rmbTaxSum}, + noUsdPrice = #{noUsdPrice}, + noUsdSum = #{noUsdSum}, + usdPrice = #{usdPrice}, + usdTaxSum = #{usdTaxSum}, + confirm_tax = #{confirmTax}, + tax_rate = #{taxRate}, + usd_tax = #{usdTax}, + invoice = #{invoice}, payment_terms = #{paymentTerms}, - delivery_conditions = #{deliveryConditions}, delivery_time = #{deliveryTime}, - delivery_address = #{deliveryAddress}, + delivery_conditions = #{deliveryConditions}, delivery_method = #{deliveryMethod}, + delivery_phone = #{deliveryPhone}, + delivery_address = #{deliveryAddress}, + customer_delivery = #{customerDelivery}, order_receiving_mode = #{orderReceivingMode}, + order_receiving_time =#{orderReceivingTime}, customer_contact = #{customerContact}, + contact_email = #{contactEmail}, + contact_post = #{contactPost}, contact_number = #{contactNumber}, + csutomer_fax = #{customerFax}, business_members = #{businessMembers}, - customer_fax = #{customerFax}, - delivery_address = #{deliveryAddress}, - order_receiving_time = #{orderReceivingTime}, - credit_limit = #{creditLimit}, - unpaid_amount = #{unpaidAmount}, - confirm_tax = #{confirmTax}, - tax_rate = #{taxRate}, - total_amount = #{totalAmount}, + total_amount = #{totalAmount}, modification_time = #{modificationTime}, + tarde_clause = #{tradeClause}, standby_one = #{standbyOne}, standby_two = #{standbyTwo}, file_upload = #{fileUpload}, - update_by = #{updateBy}, remark = #{remark}, - out_bound_quantity = #{outBoundQuantity}, - un_bound_quantity = #{unBoundQuantity} + un_bound_quantity = #{unBoundQuantity}, + un_bound_quantity =#{unBoundQuantity} trade_clause = #{tradeClause}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - update_time = #{updateTime} + use_status = #{useStatus}, + audit_status = #{auditStatus}, + make_status = #{makeStatus}, + delivery_status = #{deliveryStatus}, + close_status = #{closeStatus}, + instance_type = #{instanceType}, + instance_id = #{instanceId}, + submit_instance_id = #{submitInstanceId}, + cancel_instance_id = #{cancelInstanceId}, + restore_instance_id = #{restoreInstanceId}, + apply_user = #{applyUser}, + apply_time = #{applyTime}, + apply_title = #{applyTitle}, + update_time = now() where sales_order_id = #{salesOrderId} diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html index 54cb025b..d1409ba7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html @@ -20,24 +20,6 @@ -
diff --git a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html index 908de78e..25dd5f77 100644 --- a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html +++ b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html @@ -39,15 +39,6 @@ 添加 -
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index b236050b..3eb30076 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -352,8 +352,7 @@ var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; var useStatusDatas = [[${@dict.getType('useStatus')}]]; var userName = [[${@permission.getPrincipalProperty('userName')}]]; - var currentUser = [[${currentUser}]]; - var loginName = currentUser.loginName; + var loginName = [[${@permission.getPrincipalProperty('loginName')}]]; var prefix = ctx + "system/customer"; // 联系人 var prefix1 = ctx + "system/contacts" diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html index 690e4d91..4ccb94ba 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html @@ -286,6 +286,7 @@
+ diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html index 032d0d86..35245e90 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html @@ -292,6 +292,7 @@ + diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html index fddfd817..195b7f82 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html @@ -292,6 +292,7 @@ + diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskGozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html similarity index 99% rename from ruoyi-admin/src/main/resources/templates/system/customer/taskGozjVerify.html rename to ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html index 956d838d..5d6d2b9b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskGozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html @@ -292,6 +292,7 @@ + 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 f5ce4a7a..5b418e3d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -49,7 +49,7 @@
- +
@@ -65,7 +65,7 @@
- +
@@ -345,14 +345,14 @@ ], onEditableSave:function(field, row, oldValue, $el){ var commonCurrency1 = $("#commonCurrency_add option:selected").val(); - var rmb1 = $("#rmbTax").val(); + var rmb1 = $("#rmbTax_add").val(); if (rmb1 =='' || rmb1== null){ rmb1 = 0; }else{ - rmb1 = $("#rmbTax").val(); + rmb1 = $("#rmbTax_add").val(); } var rmb = Number(rmb1).toFixed(2) / 100; - var usd = $("#usdTax").val(); + var usd = $("#usdTax_add").val(); if (usd =='' || usd== null){ usd = 0; }else{ @@ -458,15 +458,15 @@ } }) layer.close(index); - var enterpriseSum = $("#enterpriseSum").val(); - $("#enterpriseSum").val((enterpriseSum==null?0:enterpriseSum) + 1); + var enterpriseSum = $("#enterpriseSum_add").val(); + $("#enterpriseSum_add").val((enterpriseSum==null?0:enterpriseSum) + 1); } function insertRow() { if ($("#customerCode").val() == null || $("#customerCode").val() == '') { $.modal.alertWarning("请先选择客户"); return; } - if ($("#rmbTax").val() == null || $("#rmbTax").val() == '') { + if ($("#rmbTax_add").val() == null || $("#rmbTax_add").val() == '') { $.modal.alertWarning("请先选择输入国内的税率"); return; } @@ -484,8 +484,8 @@ field: 'id', values: id }) - var enterpriseSum = parseInt($("#enterpriseSum").val()); - $("#enterpriseSum").val((enterpriseSum==null?0:enterpriseSum) - 1); + var enterpriseSum = parseInt($("#enterpriseSum_add").val()); + $("#enterpriseSum_add").val((enterpriseSum==null?0:enterpriseSum) - 1); } $("input[name='pricingDate']").datetimepicker({ format: "yyyy-mm-dd", diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index 80ac070e..ba9094a3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -160,7 +160,7 @@ {title: '数量合计',field: 'enterpriseSum'}, {title: '报价币种',field: 'commonCurrency', formatter: function (value, row, index) { - return $.table.selectDictLabel(currencyDatas, value); + return $.table.selectDictLabel(currencyDatas, value); }}, {title: '国内汇率',field: 'rmbTax'}, {title: '美元汇率',field: 'usdTax'}, diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html index e7378b91..8a6167c8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html @@ -87,46 +87,45 @@
-
+

计算

- - + +
- - - - + + + +
- - - - + + + +
-
-
- + +
+
+ -
-
-
-
+
+
+
+
- - +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index 91be2668..52d70432 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -66,10 +66,10 @@
-