From 3a4e6325579f2032f19609068b2541f55b0688c5 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 9 Jun 2025 18:43:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F-=E6=8F=90?=
=?UTF-8?q?=E6=88=90=E7=AE=A1=E7=90=86-=E8=BF=90=E5=8D=95=E6=8F=90?=
=?UTF-8?q?=E6=88=90=E6=98=8E=E7=BB=86=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=94=AF=E6=8C=81=E6=8C=89=E6=94=AF?=
=?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F=E6=9F=A5=E8=AF=A2=20committer:=20he?=
=?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java | 2 ++
emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml | 1 +
2 files changed, 3 insertions(+)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java
index 1d4c92393..89711dd10 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java
@@ -84,6 +84,8 @@ public class EmisCommissionDtl extends BaseEntity
private String confirmSiteNote;
/* 确认网点代码 */
private String confirmSiteCode;
+ /* 支付方式 */
+ private String paymentType;
// 扩展参数
// 关联运单信息
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
index 76a270da9..7280c9a3f 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
@@ -163,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.create_time = #{createTime}
and a.update_by like concat('%', #{updateBy}, '%')
and a.update_time = #{updateTime}
+ and b.payment_type = #{paymentType}
and a.create_site like concat('%', #{createSite}, '%')
and a.update_site like concat('%', #{updateSite}, '%')
From 04bd49b254e01045b593a17bdadcb66a9ac4ca4a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 10 Jun 2025 14:43:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?demand:=20=E5=AF=B9=E6=8E=A5=E5=A4=96?=
=?UTF-8?q?=E9=83=A8=E4=B8=8B=E5=8D=95=E6=8E=A5=E5=8F=A3=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E5=8F=B7=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=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/mapper/EmisWaybillMapper.java | 8 ++++++++
.../xdadan/erp/emis/service/IEmisWaybillService.java | 9 +++++++++
.../erp/emis/service/impl/EmisWaybillServiceImpl.java | 11 +++++++++--
.../src/main/resources/mapper/EmisWaybillMapper.xml | 11 ++++++++++-
4 files changed, 36 insertions(+), 3 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 d899cf8a6..406885b55 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
@@ -288,4 +288,12 @@ public interface EmisWaybillMapper extends BaseMapper
* @return 运单列表
*/
List selectWaybillListBySiteBatchStatus(@Param("offset") int offset, @Param("pageSize") int pageSize);
+
+ /**
+ * 根据客户单号查运单
+ *
+ * @param custOrderId
+ * @return
+ */
+ EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index f015eebf3..7e95ea237 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -48,6 +48,15 @@ public interface IEmisWaybillService extends IDataAuditService
public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);
+ /**
+ * 根据客户订单号查询
+ *
+ * @param custOrderId
+ * @return
+ */
+ public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
+
+
/**
* 查询运单列表列表
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 718d20453..e741cca8f 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
@@ -169,6 +169,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
return emisWaybillMapper.selectEmisWaybillByOrderSn(orderSn);
}
+ @Override
+ public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId)
+ {
+ return emisWaybillMapper.selectEmisWaybillByCustOrderId(custOrderId);
+ }
+
/**
* 查询运单列表列表
@@ -4708,7 +4714,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
// 2.2 检查订单是否已存在
- EmisWaybill existWaybill = selectEmisWaybillByOrderSn(orderNo);
+ EmisWaybill existWaybill = this.selectEmisWaybillByCustOrderId(orderNo);
if (existWaybill != null) {
resultList.add(buildFailResult(orderNo, "订单号已存在"));
continue;
@@ -4765,7 +4771,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
EmisWaybill waybill = new EmisWaybill();
resetWaybillData(waybill);
waybill.setBillCode(waybillNo);
- waybill.setOrderSn(orderNo);
+ waybill.setOrderSn(WaybillHelper.genOrderSn());
+ waybill.setCustOrderId(orderNo);
waybill.setTransLineType(transLineType);
waybill.setProductType(productType);
// 清关方式 1:快递清关,2:自提清关,3:一般贸易清关
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3c4ebe458..75171053b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -507,7 +507,16 @@
-
+
+
+
+
+