aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-06-30 23:29:54 +08:00
parent 5e89650007
commit bd972aec66
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
View File

@ -181,6 +181,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
// 打提成标识 // 打提成标识
public int updateHasDoProfit(String billCode); public int updateHasDoProfit(String billCode);
// 打成本标识
public int updateHasDoCostFee(String billCode);
// 取消出账标识 // 取消出账标识
public int cancelHasDoProfit(String billCode); public int cancelHasDoProfit(String billCode);

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -490,16 +490,13 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
mutiOrderList.get(i), mutiOrderList.get(i),
latch, latch,
"MultiDoBillThread==>"+i); "MultiDoBillThread==>"+i);
Thread doThread = new Thread(doRunnable, "Calc Cost Fee MultiDoBillThread-"+i); Thread doThread = new Thread(doRunnable, "Calc CostFee MultiDoBillThread-"+i);
doThread.start(); doThread.start();
} }
try { try {
latch.await(300, TimeUnit.SECONDS); latch.await(300, TimeUnit.SECONDS);
// 线程结束后计算所有员工提成 // 线程结束后计算所有员工提成
// reCalcEmpProfitSumMoney(null,null);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
}finally { }finally {
@ -533,6 +530,8 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
for (EmisWaybill waybill : dataList) { for (EmisWaybill waybill : dataList) {
try { try {
reCalcCostFeeByBillCode(waybill.getBillCode()); reCalcCostFeeByBillCode(waybill.getBillCode());
// 运单打上已计算
emisWaybillMapper.updateHasDoCostFee(waybill.getBillCode());
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
} }

12
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -2714,9 +2714,10 @@
</select> </select>
<!-- 查询待计算成本运单 --> <!-- 查询待计算成本运单 -->
<select id="selectWaitDoCostList" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectWaitDoCostList" parameterType="EmisWaybill" resultType="EmisWaybill">
SELECT SELECT
bill_code id,
bill_code as billCode
FROM FROM
emis_waybill a emis_waybill a
WHERE WHERE
@ -3592,6 +3593,13 @@
where bill_code=#{billCode} where bill_code=#{billCode}
</update> </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 id="cancelHasDoProfit" parameterType="String">
update emis_waybill set update emis_waybill set