From 7407ae3eeda7d9f6cddc4880507c4190bfe66b56 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 30 Apr 2024 12:43:36 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWaybillServiceImpl.java  |  5 ++
 .../resources/mapper/EmisWaybillMapper.xml    | 56 -------------------
 2 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 64046a60c..ad2960294 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -231,6 +231,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             //补齐数据
             emisWaybillSave.preInsert();
+
             String orderSn = WaybillHelper.genOrderSn();
 
             // 订单号
@@ -239,6 +240,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             // 登记网点
             emisWaybillSave.setRegisterSiteCode(getCurrentUser().getOwnerSiteCode());
             emisWaybillSave.setRegisterManCode(getCurrentUser().getEmpCode());
+            emisWaybillSave.setRegisterDate(new Date());
 
             // 发件网点
             emisWaybillSave.setSendSiteCode(getCurrentUser().getOwnerSiteCode());
@@ -252,6 +254,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setOrderStatus("0");
             emisWaybillSave.setWaybillStatus("0");
 
+            // 下单时间
+//            emisWaybillSave.setOrderDate(new Date());
+
             emisWaybillSave.setOrderType("1");
 
             // 获取泡重比
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 997cfa532..1f6ff3e31 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -682,22 +682,8 @@
     <update id="updateEmisWaybill" parameterType="EmisWaybill">
         update emis_waybill
         <trim prefix="SET" suffixOverrides=",">
-            <if test="orderSn != null and orderSn != ''">order_sn = #{orderSn},</if>
             <if test="custOrderId != null and custOrderId != ''">cust_order_id = #{custOrderId},</if>
-            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
             <if test="billCodeSub != null and billCodeSub != ''">bill_code_sub = #{billCodeSub},</if>
-            <if test="orderStatus != null and orderStatus != ''">order_status = #{orderStatus},</if>
-            <if test="waybillStatus != null and waybillStatus != ''">waybill_status = #{waybillStatus},</if>
-            <if test="orderType != null and orderType != ''">order_type = #{orderType},</if>
-            <if test="orderDate != null">order_date = #{orderDate},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
-            <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
-            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code = #{receiveCustomerCode},</if>
-            <if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name = #{receiveCustomerName},</if>
-            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code = #{thirdCustomerCode},</if>
-            <if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name = #{thirdCustomerName},</if>
-            <if test="openId != null and openId != ''">open_id = #{openId},</if>
             <if test="receiveName != null and receiveName != ''">receive_name = #{receiveName},</if>
             <if test="receiveCompany != null and receiveCompany != ''">receive_company = #{receiveCompany},</if>
             <if test="receiveMobile != null and receiveMobile != ''">receive_mobile = #{receiveMobile},</if>
@@ -767,8 +753,6 @@
             <if test="feeWeight != null">fee_weight = #{feeWeight},</if>
             <if test="freight != null">freight = #{freight},</if>
             <if test="blOverLong != null and blOverLong != ''">bl_over_long = #{blOverLong},</if>
-            <if test="blBill != null and blBill != ''">bl_bill = #{blBill},</if>
-            <if test="blBillText != null and blBillText != ''">bl_bill_text = #{blBillText},</if>
             <if test="blOverWeight != null and blOverWeight != ''">bl_over_weight = #{blOverWeight},</if>
             <if test="overWeightNumber != null and overWeightNumber != ''">over_weight_number = #{overWeightNumber},</if>
             <if test="feeRemaker != null and feeRemaker != ''">fee_remaker = #{feeRemaker},</if>
@@ -782,31 +766,7 @@
             <if test="insureRemark != null and insureRemark != ''">insure_remark = #{insureRemark},</if>
             <if test="insureSiteCode != null and insureSiteCode != ''">insure_site_code = #{insureSiteCode},</if>
             <if test="insureDate != null and insureDate != ''">insure_date = #{insureDate},</if>
-            <if test="blPrint != null and blPrint != ''">bl_print = #{blPrint},</if>
-            <if test="printManCode != null and printManCode != ''">print_man_code = #{printManCode},</if>
-            <if test="printSite != null and printSite != ''">print_site = #{printSite},</if>
-            <if test="printDate != null and printDate != ''">print_date = #{printDate},</if>
-            <if test="printCount != null and printCount != ''">print_count = #{printCount},</if>
-            <if test="blDispFd != null and blDispFd != ''">bl_disp_fd = #{blDispFd},</if>
-            <if test="transferCode != null and transferCode != ''">transfer_code = #{transferCode},</if>
-            <if test="transferBillcode != null and transferBillcode != ''">transfer_billcode = #{transferBillcode},</if>
-            <if test="dispFdDate != null">disp_fd_date = #{dispFdDate},</if>
-            <if test="dispFdReason != null and dispFdReason != ''">disp_fd_reason = #{dispFdReason},</if>
-            <if test="currentSiteCode != null and currentSiteCode != ''">current_site_code = #{currentSiteCode},</if>
-            <if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
-            <if test="lastSiteCode != null and lastSiteCode != ''">last_site_code = #{lastSiteCode},</if>
-            <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code = #{registerSiteCode},</if>
-            <if test="registerDate != null">register_date = #{registerDate},</if>
-            <if test="registerManCode != null and registerManCode != ''">register_man_code = #{registerManCode},</if>
             <if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">take_piece_employee_code = #{takePieceEmployeeCode},</if>
-            <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code = #{sendSiteCode},</if>
-            <if test="sendDate != null">send_date = #{sendDate},</if>
-            <if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code = #{dispatchManCode},</if>
-            <if test="dispatchDate != null and dispatchDate != ''">dispatch_date = #{dispatchDate},</if>
-            <if test="dispatchSiteCode != null and dispatchSiteCode != ''">dispatch_site_code = #{dispatchSiteCode},</if>
-            <if test="produceBillDate != null">produce_bill_date = #{produceBillDate},</if>
-            <if test="produceBillSiteCode != null and produceBillSiteCode != ''">produce_bill_site_code = #{produceBillSiteCode},</if>
-            <if test="produceBillManCode != null and produceBillManCode != ''">produce_bill_man_code = #{produceBillManCode},</if>
             <if test="destinationCode != null and destinationCode != ''">destination_code = #{destinationCode},</if>
             <if test="destinationProvince != null and destinationProvince != ''">destination_province = #{destinationProvince},</if>
             <if test="destinationCity != null and destinationCity != ''">destination_city = #{destinationCity},</if>
@@ -817,27 +777,11 @@
             <if test="payee != null and payee != ''">payee = #{payee},</if>
             <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
             <if test="operateEmployeeCode != null and operateEmployeeCode != ''">operate_employee_code = #{operateEmployeeCode},</if>
-            <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question = #{blIsQuestion},</if>
-            <if test="problemType != null and problemType != ''">problem_type = #{problemType},</if>
-            <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>
-            <if test="problemDelayDays != null">problem_delay_days = #{problemDelayDays},</if>
             <if test="blMessage != null and blMessage != ''">bl_message = #{blMessage},</if>
             <if test="blAcceptMessage != null and blAcceptMessage != ''">bl_accept_message = #{blAcceptMessage},</if>
-            <if test="blGenSubbill != null and blGenSubbill != ''">bl_gen_subbill = #{blGenSubbill},</if>
-            <if test="signMan != null and signMan != ''">sign_man = #{signMan},</if>
-            <if test="signManCode != null and signManCode != ''">sign_man_code = #{signManCode},</if>
-            <if test="signSiteCode != null and signSiteCode != ''">sign_site_code = #{signSiteCode},</if>
-            <if test="signDate != null and signDate != ''">sign_date = #{signDate},</if>
-            <if test="billPicSendRmk != null and billPicSendRmk != ''">bill_pic_send_rmk = #{billPicSendRmk},</if>
-            <if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">bill_pic_dispatch_rmk = #{billPicDispatchRmk},</if>
-            <if test="timezoneOffset != null and timezoneOffset != ''">timezone_offset = #{timezoneOffset},</if>
-            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
-            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
-            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where id = #{id}