From bd972aec66fce711124120f1fa92ade18ac18c7a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Jun 2025 23:29:54 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/mapper/EmisWaybillMapper.java    |  3 +++
 .../emis/service/impl/EmisTmsCostFeeServiceImpl.java |  7 +++----
 .../src/main/resources/mapper/EmisWaybillMapper.xml  | 12 ++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index 6b338c67c..2f4308120 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -181,6 +181,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     // 打提成标识
     public int updateHasDoProfit(String billCode);
 
+    // 打成本标识
+    public int updateHasDoCostFee(String billCode);
+
     // 取消出账标识
     public int cancelHasDoProfit(String billCode);
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
index fe2d28178..78b8cfd3f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
@@ -490,16 +490,13 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
                         mutiOrderList.get(i),
                         latch,
                         "MultiDoBillThread==>"+i);
-                Thread doThread = new Thread(doRunnable, "Calc Cost Fee MultiDoBillThread-"+i);
+                Thread doThread = new Thread(doRunnable, "Calc CostFee MultiDoBillThread-"+i);
                 doThread.start();
             }
 
             try {
                 latch.await(300, TimeUnit.SECONDS);
-
                 // 线程结束后计算所有员工提成
-//                reCalcEmpProfitSumMoney(null,null);
-
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }finally {
@@ -533,6 +530,8 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
             for (EmisWaybill waybill : dataList) {
                 try {
                     reCalcCostFeeByBillCode(waybill.getBillCode());
+                    // 运单打上已计算
+                    emisWaybillMapper.updateHasDoCostFee(waybill.getBillCode());
                 }catch (Exception ex){
                     ex.printStackTrace();
                 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 39b8be549..a5df9681a 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2714,9 +2714,10 @@
     </select>
 
     <!--  查询待计算成本运单  -->
-    <select id="selectWaitDoCostList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
+    <select id="selectWaitDoCostList" parameterType="EmisWaybill" resultType="EmisWaybill">
         SELECT
-        bill_code
+        id,
+        bill_code as billCode
         FROM
         emis_waybill a
         WHERE
@@ -3592,6 +3593,13 @@
         where bill_code=#{billCode}
     </update>
 
+    <!--  打成本计算标识 -->
+    <update id="updateHasDoCostFee" parameterType="String">
+        update emis_waybill set
+        bl_calc_cost = '1'
+        where bill_code=#{billCode}
+    </update>
+
     <!--  取消提成标识  -->
     <update id="cancelHasDoProfit" parameterType="String">
         update emis_waybill set