From 4c986cb5ba1a5931db78ef46d83f42294eb3e26d Mon Sep 17 00:00:00 2001 From: JIAL <2287346125@qq.com> Date: Wed, 13 Mar 2024 11:22:04 +0800 Subject: [PATCH] 2 --- .../main/resources/mapper/quote/QuoteMapper.xml | 14 +++++++------- ruoyi-ui/src/views/quotePage/quote/index.vue | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml b/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml index dffbb8b..31d8dd5 100644 --- a/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.material_id AS uid, a.material_xingh AS model,a.material_guig AS specification,a.material_diany AS voltLevel, a.material_dw AS measureUnit,c.type_name AS prodCategory, b.price matCostPrice, d.factory_total_ratio/100 manuCost,d.factory_pj_ratio/100 wdFSurcharge, - cc.红本价格 AS redBookPrice,cc.红本价格*0.8 rbFacPrice, dd.成本价格 AS redBookCost + cc.material_rb_price AS redBookPrice,cc.material_rb_price*0.8 rbFacPrice, dd.material_cb_price AS redBookCost from c_material a left join (select a.cost_material_id,sum((isnull(a.cost_cl_qty,0)+isnull(a.cost_cl_qty_2,0))*b.material_price) price from c_material_cost a @@ -59,12 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join c_material_type_factory c on a.material_type_id = c.type_no left join c_material_type e on e.type_no = c.type_no left join c_factory d on d.factory_no = c.factory_id - left join(select 型号,规格,电压等级,红本价格 from c_rb_product_price - )as cc on cc.型号=a.material_xingh and cc.规格 = a.material_guig - and cc.电压等级 = a.material_diany - left join(select 型号,规格,电压等级,成本价格 from c_rb_productbase_price - )as dd on dd.型号=a.material_xingh and dd.规格 = a.material_guig - and dd.电压等级= a.material_diany + left join(select material_xingh,material_guig,material_diany,convert(decimal(18,2),material_rb_price ) material_rb_price from c_rb_product_price + )as cc on cc.material_xingh=a.material_xingh and cc.material_guig = a.material_guig + and cc.material_diany = a.material_diany + left join(select material_xingh,material_guig,material_diany,convert(decimal(18,2),material_cb_price) material_cb_price from c_rb_productbase_price + )as dd on dd.material_xingh=a.material_xingh and dd.material_guig = a.material_guig + and dd.material_diany= a.material_diany a.material_state='0' and e.type_state ='0' and a.material_xingh like concat('', #{precMaterialName}, '%') diff --git a/ruoyi-ui/src/views/quotePage/quote/index.vue b/ruoyi-ui/src/views/quotePage/quote/index.vue index 7275117..9090ce6 100644 --- a/ruoyi-ui/src/views/quotePage/quote/index.vue +++ b/ruoyi-ui/src/views/quotePage/quote/index.vue @@ -381,7 +381,7 @@ prop="wdFSurcharge" label="盘具运费">