From c74854b4e223ecbe26bae43d3f69ffb6e8fa33ac Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Thu, 30 May 2024 17:12:50 +0800
Subject: [PATCH] '123'

---
 .../tool/quot/quotJswController.java          | 17 +++++++++---
 .../tool/quot/quotMaterialModel.java          | 27 +++++++++++++++++++
 .../web/controller/tool/quot/quotModel.java   | 14 +++++++++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java
index 5a7c320..605aa47 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java
@@ -22,12 +22,21 @@ public class quotJswController extends BaseController {
     @PostMapping("/updateQuot")
     public R<String> updateQuot(@RequestBody String quotJson)
     {
-        System.out.println(quotJson);
         quotModel quot = JSON.parseObject(quotJson, quotModel.class);
-        System.out.println(quot);
-
         if(StringUtils.isBlank(quot.getQuotJswCode())){
-            return R.fail("JswCode不能为空");
+            return R.fail("金思维报价单号不能为空");
+        }
+        if(StringUtils.isBlank(quot.getQuotCode())){
+            return R.fail("客户报价单号不能为空");
+        }
+        if(StringUtils.isBlank(quot.getQuotTongPrice())){
+            return R.fail("铜价不能为空");
+        }
+        if(StringUtils.isBlank(quot.getQuotLvPrice())){
+            return R.fail("铝价不能为空");
+        }
+        if(StringUtils.isBlank(quot.getQuotMatpriceDiff())){
+            return R.fail("整单料价价差率不能为空");
         }
         return R.ok();
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotMaterialModel.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotMaterialModel.java
index 3e08e26..a8b1a7d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotMaterialModel.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotMaterialModel.java
@@ -1,19 +1,46 @@
 package com.ruoyi.web.controller.tool.quot;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 
+@ApiModel(value = "quotMaterialModel", description = "报价单产品明细")
 public class quotMaterialModel {
+    @ApiModelProperty("型号")
     private String matXingh;//型号
+
+    @ApiModelProperty("规格")
     private String matGuig;//规格
+
+    @ApiModelProperty("电压")
     private String matDiany;//电压
+
+    @ApiModelProperty("标准")
     private String matStandard;//标准
+
+    @ApiModelProperty("数量")
     private BigDecimal matSl;//数量
+
+    @ApiModelProperty("单位")
     private String matDanw;//单位
+
+    @ApiModelProperty("备注")
     private String matRemark;//备注
+
+    @ApiModelProperty("料价")
     private BigDecimal matMatprice;//料价
+
+    @ApiModelProperty("红本价")
     private BigDecimal matPrice;//红本价
+
+    @ApiModelProperty("报价")
     private BigDecimal matQuotPrice;//报价
+
+    @ApiModelProperty("报价金额")
     private BigDecimal matQuotAllPrice;//报价金额
+
+    @ApiModelProperty("料价价差率")
     private String matMatpriceDiff;//料价价差率
 
     public String getMatXingh() {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotModel.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotModel.java
index 3de920c..cf48eef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotModel.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotModel.java
@@ -1,12 +1,24 @@
 package com.ruoyi.web.controller.tool.quot;
 
-import java.util.List;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+@ApiModel(value = "quotModel", description = "报价单信息")
 public class quotModel {
+    @ApiModelProperty("金思维报价单号")
     private String quotJswCode;//金思维报价单号
+
+    @ApiModelProperty("客户报价单号")
     private String quotCode;//报价单号
+
+    @ApiModelProperty("铜价")
     private String quotTongPrice;//铜价
+
+    @ApiModelProperty("铝价")
     private String quotLvPrice;//铝价
+
+    @ApiModelProperty("整单料价价差率")
     private String quotMatpriceDiff;//整单料价价差率
 
     private List<quotMaterialModel> quotMaterial;//明细