From 331f33d602de3e2f9eda0bdca1ff45a054023a53 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Wed, 3 Jan 2024 13:17:56 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-3=20=E6=8A=A5=E4=BB=B7=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/quotation/entity/QuotationRouting.java  |  1 +
 .../mapper/quotation/QuotationRoutingMapper.xml     | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/quotation/entity/QuotationRouting.java b/src/main/java/com/spring/modules/quotation/entity/QuotationRouting.java
index 04216718..3b063ba1 100644
--- a/src/main/java/com/spring/modules/quotation/entity/QuotationRouting.java
+++ b/src/main/java/com/spring/modules/quotation/entity/QuotationRouting.java
@@ -101,6 +101,7 @@ public class QuotationRouting {
     /**
      * 序号
      */
+    @TableField("item_no")
     private int itemNo;
     /**
      * 价格中心人工成本
diff --git a/src/main/resources/mapper/quotation/QuotationRoutingMapper.xml b/src/main/resources/mapper/quotation/QuotationRoutingMapper.xml
index 6f2b7ab6..1e38dafe 100644
--- a/src/main/resources/mapper/quotation/QuotationRoutingMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationRoutingMapper.xml
@@ -31,7 +31,10 @@
             qr.unit_quoted_cost,
             qr.remark,
             qr.output_unit,
-            qr.item_no
+            qr.item_no,
+            qr.tune_in_number,
+            qr.tune_in_level,
+            qr.operators_level
         from dbo.quotation_routing qr
         left join dbo.work_center wc on qr.machining_center_no = wc.work_center_no and qr.site = wc.site
         where
@@ -106,18 +109,18 @@
     </resultMap>
 
     <insert id="batchInstallQuotationRoutingByDetailId">
-        insert into dbo.quotation_routing (quotation_detail_id, site, quotation_routing_no, quotation_routing_desc, machining_center_no,machining_center_desc,machining_center_type,labor_center_cost,machinery_center_cost,manufacturing_center_cost, machining_setup_time, unit_output_quantity, output_unit, routing_efficiency, operators_number, unit_machinery_cost, unit_labor_cost, unit_manufacturing_cost, unit_quoted_cost, remark) VALUES
+        insert into dbo.quotation_routing (quotation_detail_id, site, quotation_routing_no, quotation_routing_desc, machining_center_no,machining_center_desc,machining_center_type,labor_center_cost,machinery_center_cost,manufacturing_center_cost, machining_setup_time, unit_output_quantity, output_unit, routing_efficiency, operators_number, unit_machinery_cost, unit_labor_cost, unit_manufacturing_cost, unit_quoted_cost, remark,item_no,tune_in_number,tune_in_level,operators_level) VALUES
         <foreach collection="list" index="index" item="item" separator=",">
             (#{quotationDetailId},#{item.site}, #{item.quotationRoutingNo}, #{item.quotationRoutingDesc}, #{item.machiningCenterNo},#{item.machiningCenterDesc},#{item.machiningCenterType},#{item.laborCenterCost},#{item.machineryCenterCost},
-            #{item.manufacturingCenterCost},#{item.machiningSetupTime}, #{item.unitOutputQuantity}, #{item.outputUnit}, #{item.routingEfficiency}, #{item.operatorsNumber}, #{item.unitMachineryCost}, #{item.unitLaborCost}, #{item.unitManufacturingCost}, #{item.unitQuotedCost}, #{item.remark})
+            #{item.manufacturingCenterCost},#{item.machiningSetupTime}, #{item.unitOutputQuantity}, #{item.outputUnit}, #{item.routingEfficiency}, #{item.operatorsNumber}, #{item.unitMachineryCost}, #{item.unitLaborCost}, #{item.unitManufacturingCost}, #{item.unitQuotedCost}, #{item.remark},#{item.itemNo},#{item.tuneInNumber},#{item.tuneInLevel},#{item.operatorsLevel})
         </foreach>
     </insert>
 
     <insert id="batchInstallRoutingByDetailId">
-        insert into dbo.quotation_routing (quotation_detail_id, site, quotation_routing_no, quotation_routing_desc, machining_center_no,machining_center_desc,machining_center_type,labor_center_cost,machinery_center_cost,manufacturing_center_cost, machining_setup_time, unit_output_quantity, output_unit, routing_efficiency, operators_number, unit_machinery_cost, unit_labor_cost, unit_manufacturing_cost, unit_quoted_cost, remark) VALUES
+        insert into dbo.quotation_routing (quotation_detail_id, site, quotation_routing_no, quotation_routing_desc, machining_center_no,machining_center_desc,machining_center_type,labor_center_cost,machinery_center_cost,manufacturing_center_cost, machining_setup_time, unit_output_quantity, output_unit, routing_efficiency, operators_number, unit_machinery_cost, unit_labor_cost, unit_manufacturing_cost, unit_quoted_cost, remark,item_no,tune_in_number,tune_in_level,operators_level) VALUES
         <foreach collection="list" index="index" item="item" separator=",">
             (#{quotationDetailId},#{item.site}, #{item.quotationRoutingNo}, #{item.quotationRoutingDesc}, #{item.machiningCenterNo},#{item.machiningCenterDesc},#{item.machiningCenterType},#{item.laborCenterCost},#{item.machineryCenterCost},
-            #{item.manufacturingCenterCost},#{item.machiningSetupTime}, #{item.unitOutputQuantity}, #{item.outputUnit}, #{item.routingEfficiency}, #{item.operatorsNumber}, #{item.unitMachineryCost}, #{item.unitLaborCost}, #{item.unitManufacturingCost}, #{item.unitQuotedCost}, #{item.remark})
+            #{item.manufacturingCenterCost},#{item.machiningSetupTime}, #{item.unitOutputQuantity}, #{item.outputUnit}, #{item.routingEfficiency}, #{item.operatorsNumber}, #{item.unitMachineryCost}, #{item.unitLaborCost}, #{item.unitManufacturingCost}, #{item.unitQuotedCost}, #{item.remark},#{item.itemNo},#{item.tuneInNumber},#{item.tuneInLevel},#{item.operatorsLevel})
         </foreach>
     </insert>
 </mapper>