From 0f05e1d72a26fa5ccd68a7c4577406e70b0e6e12 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 17 Jun 2025 08:38:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=B9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/web/emis/EmisCommonController.java | 2 -- .../xdadan/erp/emis/domain/EmisSupplier.java | 2 ++ .../impl/EmisSettleBillServiceImpl.java | 29 ++++++++++++++++--- .../EmisWaybillAjustApplyServiceImpl.java | 7 ++--- .../resources/mapper/EmisSupplierMapper.xml | 20 +++++++++---- 5 files changed, 45 insertions(+), 15 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 226e2a98d..5f52231f5 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -845,8 +845,6 @@ public class EmisCommonController extends EmisBaseController } - - /** * 定时扫描运单货物组批次是否正确录入 * @return diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSupplier.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSupplier.java index 74d65f449..20da64fd1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSupplier.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSupplier.java @@ -65,6 +65,8 @@ public class EmisSupplier extends BaseEntity private String district; /* 地址 */ private String address; + /* 关联费用类型 */ + private String feeItemRel; /* 公司电话 */ private String tel; /* 电子邮件 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index a24ec861d..f38976d5c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -40,6 +40,7 @@ import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.excelCellStrategy.CellStyleStrategy; import com.xdadan.erp.emis.utils.WaybillHelper; import jodd.util.StringUtil; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -176,6 +177,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS * @param emisSettleBill 结算总账单 * @return 结果 */ + @SneakyThrows @Transactional @Override public int insertEmisSettleBill(EmisSettleBill emisSettleBill) throws EmisBizError { @@ -292,14 +294,33 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS settleDay=monthUser.getSettleDay(); } - // 现金账期从寄件开始10天 + // 月结账单日根据配置来 emisSettleBill.setCreditPeriodType("1"); emisSettleBill.setCreditPeriod(creditPeriod); emisSettleBill.setSettleDay(settleDay); - Date billMonthDate = DateUtils.parseDate(emisSettleBill.getBillMonth() + "-"+settleDay); - Date paymentDueDate = DateUtils.addMonths(billMonthDate,1); - paymentDueDate= DateUtils.addDays(paymentDueDate,creditPeriod.intValue()); + Date paymentDueDate = null; + /* + bug:1610 调整 + 周结账期14天TMS系统配置的是7天，例如1号至7号，8号出账单，最后回款日14号（T+6,T为出账日）回款100%提成，超期未回无提成； + 半月结账期30天TMS系统配置的是15天，例如1号至15号，16号出账单，最后回款日30号（T+14,T为出账日）回款100%提成；超期未回无提成； + */ + if(creditPeriod.intValue()==7){ + // 获取今日零点 T+6,T为出账日 + String currDayStr=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()); + Date currDayDate=DateUtils.parseDate(currDayStr,DateUtils.YYYY_MM_DD); + paymentDueDate = DateUtils.addDays(currDayDate,7); + } + else if(creditPeriod.intValue()==15){ + String currDayStr=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()); + Date currDayDate=DateUtils.parseDate(currDayStr,DateUtils.YYYY_MM_DD); + paymentDueDate = DateUtils.addDays(currDayDate,15); + } + else{ + Date billMonthDate = DateUtils.parseDate(emisSettleBill.getBillMonth() + "-"+settleDay); + paymentDueDate = DateUtils.addMonths(billMonthDate,1); + paymentDueDate= DateUtils.addDays(paymentDueDate,creditPeriod.intValue()); + } // 最后付款时间 emisSettleBill.setPaymentDueDate(paymentDueDate); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index 8c7d9d273..caecac910 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -238,6 +238,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements emisWaybillAjustApply.setBlCenterConfirmed("1"); emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode()); + // 财务中心费用审核：数据部人员通过岗位登记的费用申请：修改项目“运费调整”，财务审批通过后数据直接修改不用再进行层层审核； + emisWaybillAjustApply.getApplyType() + // 获取账单状态，若账单处于非未确认状态，不允许审核 List emisSettleSubBillList=getSettleSubBillListByBillCode(emisWaybillAjustApply.getBillCode()); if(!CollectionUtils.isEmpty(emisSettleSubBillList)){ @@ -286,12 +289,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements } } - } } - - - } // 运单更新 diff --git a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml index 094648f30..af9e6c6b3 100644 --- a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml @@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, code, name, name_en, settled_type, trans_type, biz_site, biz_site_name, company_name, company_type, licence_no, country, province, city, district, address, tel, email, contact, phone, status, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_supplier + select id, code, name, name_en, settled_type, trans_type, biz_site, biz_site_name, company_name, company_type, licence_no, country, province, city, district, address, fee_item_rel, tel, email, contact, phone, status, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_supplier - + insert into emis_supplier @@ -146,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" city, district, address, + fee_item_rel, tel, email, contact, @@ -159,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{code}, #{name}, @@ -176,6 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{city}, #{district}, #{address}, + #{feeItemRel}, #{tel}, #{email}, #{contact}, @@ -189,12 +197,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + update emis_supplier + code = #{code}, name = #{name}, name_en = #{nameEn}, settled_type = #{settledType}, @@ -209,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" city = #{city}, district = #{district}, address = #{address}, + fee_item_rel = #{feeItemRel}, tel = #{tel}, email = #{email}, contact = #{contact},