From 82c17c23694d7a28ac6946edf03941b81a07577e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 23 Dec 2024 19:43:36 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=81=E7=BC=96=E8=BE=91=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=8D=95=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=95=88?= =?UTF-8?q?=E6=9E=9C=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E6=8A=A5=E4=BB=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=AE=A1=E4=BB=B7=E5=8D=95=E4=BD=8D=E7=9A=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=87=BD=E6=95=B0=E5=92=8C=E7=9B=91=E5=90=AC=E5=87=BD?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=87=BD=E6=95=B0=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E7=BB=8F=E7=90=86=E5=92=8C=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98=E5=A7=94=E5=A4=96=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7controller=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BC=96=E8=BE=91=E6=8A=A5=E4=BB=B7service=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=92=8C=E6=8A=A5=E4=BB=B7=E5=B7=A5=E5=BA=8F=E4=BF=A1?= =?UTF-8?q?=E6=81=AFservice=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutsourceQuoteController.java | 7 +- .../impl/OutsourceQuoteServiceImpl.java | 34 +- .../mapper/system/OutsourceQuoteMapper.xml | 4 +- .../templates/system/outsource_quote/add.html | 181 +++++----- .../system/outsource_quote/edit.html | 324 ++++++++---------- .../outsource_quote/outsource_quote.html | 2 +- .../outsource_quote/taskWwjlVerify.html | 6 +- .../outsource_quote/taskWwzgVerify.html | 6 +- 8 files changed, 268 insertions(+), 296 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java index fc02749b..adaa89b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java @@ -259,12 +259,7 @@ public class OutsourceQuoteController extends BaseController public AjaxResult editSave(@RequestBody OutsourceQuoteVO outsourceQuoteVO) { List children = outsourceQuoteVO.getOutsourceQuoteChildList(); - for (OutsourceQuoteChild child:children) { - child.setOutsourceQuoteCode(outsourceQuoteVO.getOutsourceQuoteCode()); - child.setSupplierCode(outsourceQuoteVO.getSupplierQuoteCode()); - child.setSupplierName(outsourceQuoteVO.getSupplierName()); - child.setTaxRate(outsourceQuoteVO.getTaxRate()); - } + // System.out.println(children); return toAjax(outsourceQuoteService.updateOutsourceQuote(outsourceQuoteVO)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java index 1079e95d..306d2703 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; @@ -154,11 +155,18 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insertOutsourceQuote(OutsourceQuoteVO childVO) { String loginName = ShiroUtils.getLoginName(); List children = childVO.getOutsourceQuoteChildList(); for (OutsourceQuoteChild child:children) { + if(child.getChargeUnit()==null){ + throw new BusinessException("工序" + child.getOutsourceProcessNo()+"计价单位为空，请检查"); + } + if(child.getMaterialRmb()==null || child.getMaterialNormb() ==null){ + throw new BusinessException("工序" + child.getOutsourceProcessNo()+"价格为空，请检查"); + } child.setOutsourceQuoteCode(childVO.getOutsourceQuoteCode()); child.setSupplierCode(childVO.getSupplierQuoteCode()); child.setSupplierName(childVO.getSupplierName()); @@ -187,9 +195,23 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService SysUser user = ShiroUtils.getSysUser(); outsourceQuoteVO.setUpdateTime(DateUtils.getNowDate()); outsourceQuoteVO.setUpdateBy(user.getLoginName()); - outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceQuoteCode(outsourceQuoteVO.getOutsourceQuoteCode()); - insertOutsourceQuoteChild(outsourceQuoteVO); - return outsourceQuoteMapper.updateOutsourceQuote(outsourceQuoteVO); + outsourceQuoteMapper.updateOutsourceQuote(outsourceQuoteVO); + OutsourceQuoteVO quoteVO = outsourceQuoteMapper.selectOutsourceQuoteByOutsourceQuoteId(outsourceQuoteVO.getOutsourceQuoteId()); + List children = outsourceQuoteVO.getOutsourceQuoteChildList(); + if(StringUtils.isNotEmpty(children)){ + for (OutsourceQuoteChild child:children) { + if (child.getChargeUnit() == null) { + throw new BusinessException("工序" + child.getOutsourceProcessNo() + "计价单位为空，请检查"); + } + if (child.getMaterialRmb() == null || child.getMaterialNormb() == null) { + throw new BusinessException("工序" + child.getOutsourceProcessNo() + "价格为空，请检查"); + } + } + quoteVO.setOutsourceQuoteChildList(children); + outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceQuoteCode(outsourceQuoteVO.getOutsourceQuoteCode()); + insertOutsourceQuoteChild(quoteVO); + } + return 1; } // 更新审核后信息（更新子表审核状态，防止子表信息丢失 @@ -238,6 +260,12 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService for (OutsourceQuoteChild child:outsourceQuoteChildList) { child.setOutsourceProcessCode(outsourceQuote.getOutsourceQuoteCode()); child.setAuditStatus(outsourceQuote.getAuditStatus()); + child.setOutsourceQuoteCode(outsourceQuote.getOutsourceQuoteCode()); + child.setSupplierCode(outsourceQuote.getSupplierQuoteCode()); + child.setSupplierName(outsourceQuote.getSupplierName()); + child.setTaxRate(outsourceQuote.getTaxRate()); + child.setUpdateBy(ShiroUtils.getLoginName()); + child.setUpdateTime(DateUtils.getNowDate()); } outsourceQuoteMapper.batchOutsourceQuoteChild(outsourceQuoteChildList); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml index ebb9ae83..21b90e48 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml @@ -202,9 +202,9 @@ - insert into outsource_quote_child( outsource_quote_child_id, outsource_quote_code, outsource_process_code, charge_unit, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status) values + insert into outsource_quote_child(outsource_quote_code, outsource_process_code, charge_unit, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status) values - ( #{item.outsourceQuoteChildId}, #{item.outsourceQuoteCode}, #{item.outsourceProcessCode},#{item.chargeUnit}, #{item.outsourceProcessNo}, #{item.outsourceProcessName}, #{item.remark}, #{item.taxRate}, #{item.materialRmb}, #{item.materialNormb}, #{item.supplierCode}, #{item.supplierName}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.auditStatus}) + ( #{item.outsourceQuoteCode}, #{item.outsourceProcessCode},#{item.chargeUnit}, #{item.outsourceProcessNo}, #{item.outsourceProcessName}, #{item.remark}, #{item.taxRate}, #{item.materialRmb}, #{item.materialNormb}, #{item.supplierCode}, #{item.supplierName}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.auditStatus}) diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html index ca6892fa..93434479 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html @@ -3,6 +3,7 @@ + @@ -10,17 +11,15 @@
-
-

委外报价信息

+
+ +
+ +
-
-
- -
- -
-
+
+
@@ -37,36 +36,35 @@
-
-
- -
-
- - % -
+
+ +
+
+ + %
-
-
- -
-
- - -
+
+ +
+
+ +
-
-
- -
- -
+
+ +
+
+ +
+ +
+

委外报价工序信息

@@ -89,7 +87,8 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html index 059482e0..065a7cfb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html @@ -3,103 +3,98 @@ +
-

委外报价信息

-
-
- -
- -
+ +
+ +
+
-
-
- -
- - - - -
-
+
+
-
-
- -
- -
+ +
+ +
+ + + +
-
-
- -
- -
+ +
+ +
+
-
-
- -
-
- - % -
+ +
+ +
+
+ + %
-
-
- -
-
- - -
+ +
+ +
+
+ +
- - -
-
-
- -
- -
+ +
+ +
+
+ +
+ +
+

委外报价工序信息

-
-
- + +
+
+ 添加
+
- + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html index 70bed8a6..ad6d1652 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html @@ -268,7 +268,7 @@ }); function edit(outsourceQuoteId) { var url = table.options.updateUrl.replace("{id}", outsourceQuoteId); - $.modal.open("修改委外报价",url,1000,600); + $.modal.open("修改委外报价",url); } // 导出 diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwjlVerify.html index 9ac27a4d..d69992a5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwjlVerify.html @@ -59,7 +59,7 @@
-
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwzgVerify.html index 9216fdee..98ecc8a2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/taskWwzgVerify.html @@ -59,7 +59,7 @@
-
+