From 864cc3510754b5accb4fdb1d789b42722735d856 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 1 Apr 2025 10:41:37 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E9=9C=80=E8=A6=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=BD=95=E5=85=A5=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=9F=A5=E7=9C=8B=E5=93=AA=E4=BA=9B=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E6=98=AF=E5=B7=B2=E7=BB=8F=E8=BF=9B=E8=A1=8C=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E5=BD=95=E5=85=A5=E7=9A=84=EF=BC=8C=E5=93=AA=E4=BA=9B?= =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E6=98=AF=E6=9C=AA=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=BD=95=E5=85=A5=E7=9A=84=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java | 3 +++ .../erp/emis/mapper/EmisTmsSiteBatchMapper.java | 8 ++++++++ .../emis/service/impl/EmisTmsCostFeeServiceImpl.java | 4 ++++ .../main/resources/mapper/EmisTmsSiteBatchMapper.xml | 11 ++++++++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java index 614550056..9fa781163 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java @@ -110,6 +110,9 @@ public class EmisTmsSiteBatch extends BaseEntity private String startSiteName; private String nextSiteName; + /* 货物批次是否录入，0：未录入，1：已录入，默认为0 */ + private String blEntering; + private List batchDtlList; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java index a1d07b331..e499bd041 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java @@ -83,4 +83,12 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper // 打提成标识 public int updateHasDoProfit(String batchNo); + + /** + * 更新录入状态 0：未录入，1：已录入 + * + * @param batchNo 批次号 + * @return 结果 + */ + public int updateEnteringStatus(String batchNo); } 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 00b618f6c..f0bfa6b36 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 @@ -64,6 +64,9 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService @Autowired private EmisExchangeRateMapper emisExchangeRateMapper; + @Autowired + private EmisTmsSiteBatchMapper emisTmsSiteBatchMapper; + /** * 查询TMS运输成本账单 * @param id TMS运输成本账单主键 @@ -180,6 +183,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService } emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee); + emisTmsSiteBatchMapper.updateEnteringStatus(emisTmsCostFee.getBatchNo()); // 计算分摊费用 // reCalcSplitCostFee(costNo); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml index 685574230..2bad2a697 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml @@ -34,6 +34,7 @@ + @@ -49,7 +50,7 @@ - select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch + select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering from emis_tms_site_batch