From db982a78c1f4a8f173c9a57c1bd43d32e7aabefd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 10 Jul 2024 07:44:16 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     |  5 ++
 .../mapper/EmisSettleSubBillMapper.xml        | 68 +++++++++----------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index eeeed257c..a8b1e906c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1001,6 +1001,11 @@ public class EmisBaseService {
              emisSettleSubBill.setCustomerCode(dt.getCustomerCode());
              emisSettleSubBill.setCustomerName(dt.getCustomerName());
 
+             emisSettleSubBill.setPayee(dt.getPayee());
+             emisSettleSubBill.setSalesmen(dt.getSalesmen());
+             emisSettleSubBill.setBlSpecialQuote(dt.getBlSpecialQuote());
+//         emisSettleSubBill.setBlSensitive();
+
              emisSettleSubBillMapper.insertEmisSettleSubBill(emisSettleSubBill);
 
              // 如果是一口价，自动生成一条运费明细，其他则根据实际来计算
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 9bb50c22e..5c6a3af8d 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -340,7 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		limit 1
 	</select>
 
-  
+
     <select id="selectEmisSettleSubBillById" parameterType="Long" resultMap="EmisSettleSubBillResult">
         select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_sub_bill a
@@ -499,9 +499,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="confirmBillByCenter" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_confirm = '1',
-            confirm_date = now(),
-            confirm_man_code = #{confirmManCode},
+            bl_confirm_center = '1',
+            confirm_center_date = now(),
+            confirm_center_man_code = #{confirmCenterManCode},
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -513,9 +513,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="cancelConfirmBillByCenter" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_confirm = '0',
-            confirm_date = null,
-            confirm_man_code =null,
+            bl_confirm_center = '0',
+            confirm_center_date = null,
+            confirm_center_man_code =null,
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -527,10 +527,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="confirmNoBillByCenter" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_confirm = '2',
-            confirm_date = now(),
-            confirm_man_code = #{confirmManCode},
-            confirm_note = #{confirmNote},
+            bl_confirm_center = '2',
+            confirm_center_date = now(),
+            confirm_center_man_code = #{confirmCenterManCode},
+            confirm_center_note = #{confirmCenterNote},
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -542,10 +542,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="setBillErrorByCenter" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_confirm = '3',
-            confirm_date = now(),
-            confirm_man_code = #{confirmManCode},
-            confirm_note = #{confirmNote},
+            bl_confirm_center = '3',
+            confirm_center_date = now(),
+            confirm_center_man_code = #{confirmCenterManCode},
+            confirm_center_note = #{confirmCenterNote},
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -557,10 +557,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="confirmBillBySite" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_site_confirm = '1',
-            site_confirm_date = now(),
-            confirm_site = #{confirmSite},
-            site_confirm_man_code = #{siteConfirmManCode},
+            bl_confirm_site = '1',
+            confirm_site_date = now(),
+            confirm_site_code = #{confirmSiteCode},
+            confirm_site_man_code = #{confirmSiteManCode},
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -572,11 +572,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="cancelConfirmBillBySite" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_site_confirm = '0',
-            site_confirm_date = null,
-            site_confirm_man_code =null,
-            confirm_site = null,
-            site_confirm_note = null,
+            bl_confirm_site = '0',
+            confirm_site_date = null,
+            confirm_site_man_code =null,
+            confirm_site_code = null,
+            confirm_site_note = null,
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -588,11 +588,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="confirmNoBillBySite" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_site_confirm = '2',
-            site_confirm_date = now(),
-            site_confirm_man_code = #{siteConfirmManCode},
-            confirm_site = #{confirmSite},
-            site_confirm_note = #{siteConfirmNote},
+            bl_confirm_site = '2',
+            confirm_site_date = now(),
+            confirm_site_man_code = #{confirmSiteManCode},
+            confirm_site_code = #{confirmSiteCode},
+            confirm_site_note = #{confirmSiteNote},
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -604,11 +604,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="setBillErrorBySite" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            bl_site_confirm = '3',
-            site_confirm_date = now(),
-            site_confirm_man_code = #{siteConfirmManCode},
-            confirm_site = #{confirmSite},
-            site_confirm_note = #{siteConfirmNote},
+            bl_confirm_site = '3',
+            confirm_site_date = now(),
+            confirm_site_man_code = #{confirmSiteManCode},
+            confirm_site_code = #{confirmSiteCode},
+            confirm_site_note = #{confirmSiteNote},
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>