From 4a25d5e8d8ba778d4460435af101ceac957398de Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 10 Jul 2024 23:11:59 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 65 +++++++++++++++++++
 .../service/impl/EmisWaybillServiceImpl.java  | 30 ---------
 2 files changed, 65 insertions(+), 30 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 92077a287..681afcbdb 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
@@ -1045,6 +1045,71 @@ public class EmisBaseService {
              emisWaybillMapper.updateHasDoBill(dt);
 
 
+         // 判断网点余额-运单金额 是否足够，如果不够则不允许下单
+         EmisSiteAccount emisSiteAccount=getSiteAccountBySiteCode(dt.getSendSiteCode());
+         if(emisSiteAccount!=null){
+             // 扣减寄件网点账户额度
+             EmisSiteSettleRecord emisSiteSettleRecord=new EmisSiteSettleRecord();
+             emisSiteSettleRecord.setAccCode(emisSiteAccount.getAccCode());
+             emisSiteSettleRecord.setBillCode(dt.getBillCode());
+             emisSiteSettleRecord.setRecPayType("2"); // 应付
+             emisSiteSettleRecord.setSettleType("003");// 运输费用
+             emisSiteSettleRecord.setSettleName("运输费");
+             emisSiteSettleRecord.setCurMoney(dt.getFreight());
+             emisSiteSettleRecord.setCurConfirmMoney(dt.getFreight());
+             emisSiteSettleRecord.setChangeType("2"); // 减少
+             emisSiteSettleRecord.setCurrency("CNY");
+
+             // 计算日期
+             emisSiteSettleRecord.setChangeDate(new Date());
+
+             emisSiteSettleRecord.setSiteCode(dt.getSendSiteCode());
+             emisSiteSettleRecord.setSiteName(dt.getSendSiteName());
+             emisSiteSettleRecord.setDataFrom("job");
+             emisSiteSettleRecord.setOperataDate(new Date());
+             emisSiteSettleRecord.setFinanceDate(new Date());
+             emisSiteSettleRecord.setBlCenter("1");
+             emisSiteSettleRecord.setCenterCode(dt.getSendCenterCode());
+    //        emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode());
+             emisSiteSettleRecord.setBlChargeFee("1");
+             emisSiteSettleRecord.setCustomerCode(dt.getCustomerCode());
+             addSiteSettleRecord(emisSiteSettleRecord);
+
+
+             // 增加财务中心的收入
+
+             // 财务中心
+             EmisSite centerSite=getSiteByCode(dt.getSendCenterCode());
+
+             EmisSiteSettleRecord centerRecord=new EmisSiteSettleRecord();
+             centerRecord.setAccCode(centerSite.getSiteCode()+"001");
+             centerRecord.setBillCode(dt.getBillCode());
+             centerRecord.setRecPayType("1"); // 应收
+             centerRecord.setSettleType("003");// 运输费用
+             centerRecord.setSettleName("运输费");
+             centerRecord.setCurMoney(dt.getFreight());
+             centerRecord.setCurConfirmMoney(dt.getFreight());
+             centerRecord.setChangeType("1"); // 增加
+             centerRecord.setCurrency("CNY");
+
+             // 计算日期
+             centerRecord.setChangeDate(new Date());
+
+             centerRecord.setSiteCode(centerSite.getSiteCode());
+             centerRecord.setSiteName(centerSite.getSiteName());
+             centerRecord.setDataFrom("job");
+             centerRecord.setOperataDate(new Date());
+             centerRecord.setFinanceDate(new Date());
+             centerRecord.setBlCenter("1");
+             centerRecord.setCenterCode(centerSite.getParentSiteCode());
+             //        emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode());
+             centerRecord.setBlChargeFee("1");
+             centerRecord.setCustomerCode(dt.getCustomerCode());
+             addSiteSettleRecord(centerRecord);
+
+         }
+
+
          log.error("===>End 运单出账");
      }
 
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 bf96b62ba..c43497ee7 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
@@ -1011,37 +1011,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         //补齐数据
         emisWaybillMapper.insertEmisWaybill(emisWaybillSave);
 
-        // 新增运单结算信息
-        // 增加结算账户额度，插入明细数据
-        EmisSiteSettleRecord emisSiteSettleRecord=new EmisSiteSettleRecord();
-        emisSiteSettleRecord.setAccCode(emisSiteAccount.getAccCode());
-        emisSiteSettleRecord.setBillCode(emisWaybillSave.getBillCode());
-        emisSiteSettleRecord.setRecPayType("2"); // 应付
-        emisSiteSettleRecord.setSettleType("003");// 运输费用
-        emisSiteSettleRecord.setSettleName("运输费");
-        emisSiteSettleRecord.setCurMoney(emisWaybillSave.getFreight());
-        emisSiteSettleRecord.setCurConfirmMoney(emisWaybillSave.getFreight());
-        emisSiteSettleRecord.setChangeType("2"); // 减少
-        emisSiteSettleRecord.setCurrency("CNY");
 
-        // 计算日期
-        emisSiteSettleRecord.setChangeDate(new Date());
-
-        emisSiteSettleRecord.setSiteCode(emisWaybillSave.getSendSiteCode());
-        emisSiteSettleRecord.setSiteName(emisWaybillSave.getSendSiteName());
-        emisSiteSettleRecord.setDataFrom(WaybillHelper.getDataFrom());
-        emisSiteSettleRecord.setOperataDate(new Date());
-        emisSiteSettleRecord.setFinanceDate(new Date());
-        emisSiteSettleRecord.setBlCenter("1");
-        emisSiteSettleRecord.setCenterCode(emisWaybillSave.getSendCenterCode());
-//        emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode());
-        emisSiteSettleRecord.setBlChargeFee("1");
-
-
-        // 客户代码
-        emisSiteSettleRecord.setCustomerCode(emisWaybillSave.getCustomerCode());
-
-        addSiteSettleRecord(emisSiteSettleRecord);
 
         // 扣减子单
         emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty());