From 7de119b530e4e2e2e19da2043ef8e5b1f585cbad Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 12 Dec 2025 11:02:50 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20tms-=E8=BF=90=E8=BE=93?=
=?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9?=
=?UTF-8?q?=E6=AC=A1-=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9=E7=BB=84?=
=?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=A0=A1=E9=AA=8C=E4=BB=B6=E6=95=B0=E3=80=81?=
=?UTF-8?q?=E9=87=8D=E9=87=8F=E4=BD=93=E7=A7=AF=E6=97=B6=E5=8F=AA=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E8=BF=90=E8=BE=93=E5=8F=B7=E7=9B=B8=E5=90=8C=E7=9A=84?=
=?UTF-8?q?=20=20tms-=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86-=E8=B4=A7?=
=?UTF-8?q?=E7=89=A9=E7=BB=84=E6=89=B9=E6=AC=A1-=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=89=B9=E6=AC=A1=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3-?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=90=E5=8D=95=E5=89=A9=E4=BD=99=E4=BB=B6?=
=?UTF-8?q?=E6=95=B0=E3=80=81=E9=87=8D=E9=87=8F=E3=80=81=E4=BD=93=E7=A7=AF?=
=?UTF-8?q?=E6=97=B6=E5=8F=AA=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=BE=93=E5=8F=B7?=
=?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/mapper/EmisTmsSiteBatchMapper.java | 37 ++++++++++---------
.../service/IEmisTmsSiteBatchService.java | 6 ++-
.../impl/EmisTmsSiteBatchDtlServiceImpl.java | 23 +++++++-----
.../impl/EmisTmsSiteBatchServiceImpl.java | 5 ++-
.../mapper/EmisTmsSiteBatchMapper.xml | 3 ++
5 files changed, 44 insertions(+), 30 deletions(-)
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 fead43f6e..b5a8a5d18 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
@@ -1,10 +1,10 @@
-/**
+/**
* @Project: emis
* @Title: EmisTmsSiteBatchMapper.java
* @author linfso
* @date 2024-03-01 08:54:56
* @Copyright: ShangHai Doitinfo 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 一级网点TMS组批次 Mapper 接口
* Warning : This file is generate by ai tools,don't edit!!!
*/
@@ -29,13 +29,13 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper
/**
* 主键查询
* @param id
- * @return
+ * @return
*/
public EmisTmsSiteBatch selectEmisTmsSiteBatchById(Long id);
/**
* 主键查询（包含明细和装载信息）
- *
+ *
* @param id
* @return
*/
@@ -48,8 +48,8 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper
/**
* 查询列表
- *
- * @param emisTmsSiteBatch
+ *
+ * @param emisTmsSiteBatch
* @return 集合
*/
public List selectEmisTmsSiteBatchList(EmisTmsSiteBatch emisTmsSiteBatch);
@@ -64,25 +64,25 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper
public List selectWaitDoProfitList(EmisTmsSiteBatch emisTmsSiteBatch);
/**
- * 新增
- *
+ * 新增
+ *
* @param emisTmsSiteBatch
- * @return
+ * @return
*/
public int insertEmisTmsSiteBatch(EmisTmsSiteBatch emisTmsSiteBatch);
/**
* 修改
- *
- * @param emisTmsSiteBatch
- * @return
+ *
+ * @param emisTmsSiteBatch
+ * @return
*/
@DataAuditLog(operateType= OperateType.UPDATE,serviceClass= EmisTmsSiteBatchServiceImpl.class)
public int updateEmisTmsSiteBatch(EmisTmsSiteBatch emisTmsSiteBatch);
/**
* 删除
- *
+ *
* @param id 主键
* @return 结果
*/
@@ -90,7 +90,7 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper
/**
* 批量删除
- *
+ *
* @param ids 需要删除的数据主键集合
* @return 结果
*/
@@ -119,7 +119,7 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper
/**
* 根据运单号列表查询组批次信息
- *
+ *
* @param billCodes 运单号列表
* @return 组批次信息列表
*/
@@ -130,13 +130,16 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper
*
* @param startSiteCode 起始网点编码
* @param nextSiteCode 下一网点编码
+ * @param carNo 运输号
* @param billCode 运单号
* @param id
* @return TMS组批次列表
*/
- List selectTmsSiteBatchBySiteAndBillCode(@Param("startSiteCode") String startSiteCode,
+ List selectTmsSiteBatchBySiteAndBillCode(
+ @Param("startSiteCode") String startSiteCode,
@Param("nextSiteCode") String nextSiteCode,
- @Param("billCode") String billCode, @Param("id")Long id);
+ @Param("carNo") String carNo,
+ @Param("billCode") String billCode, @Param("id") Long id);
/**
* 验重
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
index 83bdbbc98..d33f7e2c7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
@@ -46,12 +46,14 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService
*
* @param startSiteCode 起始网点编码
* @param nextSiteCode 下一网点编码
+ * @param carNo
* @param billCode 运单号
* @param id
* @return TMS组批次列表
*/
- public List selectTmsSiteBatchBySiteAndBillCode(String startSiteCode, String nextSiteCode,
- String billCode, Long id);
+ public List selectTmsSiteBatchBySiteAndBillCode(
+ String startSiteCode, String nextSiteCode,
+ String carNo, String billCode, Long id);
/**
* 查询一级网点TMS组批次列表
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
index 08bb15d76..6e028d112 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
@@ -1,10 +1,10 @@
-/**
+/**
* @Project: emis
* @Title: EmisTmsSiteBatchDtlServiceImpl.java
* @author linfso
* @date 2024-03-01 08:54:57
* @Copyright: ShangHai Duta 2022 All rights reserved.
-* @version v1.0
+* @version v1.0
* @Description: 一级网点TMS组批次明细 实体类
*/
@@ -34,7 +34,7 @@ import com.xdadan.erp.emis.service.IEmisTmsSiteBatchDtlService;
/**
* 一级网点TMS组批次明细Service业务层处理
- *
+ *
* @author linfso
* @date 2024-03-01 08:54:57
*/
@@ -57,7 +57,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
/**
* 查询一级网点TMS组批次明细
- *
+ *
* @param id 一级网点TMS组批次明细主键
* @return 一级网点TMS组批次明细
*/
@@ -68,7 +68,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
/**
* 查询一级网点TMS组批次明细列表
- *
+ *
* @param emisTmsSiteBatchDtl 一级网点TMS组批次明细
* @return 一级网点TMS组批次明细
*/
@@ -93,7 +93,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
/**
* 新增一级网点TMS组批次明细
- *
+ *
* @param emisTmsSiteBatchDtl 一级网点TMS组批次明细
* @return 结果
*/
@@ -107,7 +107,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
/**
* 修改一级网点TMS组批次明细
- *
+ *
* @param emisTmsSiteBatchDtl 一级网点TMS组批次明细
* @return 结果
*/
@@ -118,7 +118,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
/**
* 批量删除一级网点TMS组批次明细
- *
+ *
* @param ids 需要删除的一级网点TMS组批次明细主键
* @return 结果
*/
@@ -129,7 +129,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
/**
* 删除一级网点TMS组批次明细信息
- *
+ *
* @param id 一级网点TMS组批次明细主键
* @return 结果
*/
@@ -149,6 +149,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
String batchNo = emisTmsSiteBatchDtl.getBatchNo();
String startSiteCode = (String) emisTmsSiteBatchDtl.getParams().get("startSiteCode");
String nextSiteCode = (String) emisTmsSiteBatchDtl.getParams().get("nextSiteCode");
+ String carNo = (String) emisTmsSiteBatchDtl.getParams().get("carNo");
String supplierCode = (String) emisTmsSiteBatchDtl.getParams().get("supplierCode");
// 参数校验
@@ -161,6 +162,9 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
if (StringUtils.isBlank(nextSiteCode)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "下一网点编码不能为空");
}
+ if (StringUtils.isBlank(carNo)) {
+ throw new EmisBizError(EmisBizErrorType.FAIL, "运输号不能为空");
+ }
// 查询运单信息
EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
@@ -200,6 +204,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
List existingBatches = emisTmsSiteBatchMapper.selectTmsSiteBatchBySiteAndBillCode(
startSiteCode,
nextSiteCode,
+ carNo,
billCode,
null);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
index d826c64f1..200aafecc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
@@ -111,8 +111,8 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
@Override
public List selectTmsSiteBatchBySiteAndBillCode(String startSiteCode, String nextSiteCode,
- String billCode, Long id) {
- return emisTmsSiteBatchMapper.selectTmsSiteBatchBySiteAndBillCode(startSiteCode, nextSiteCode, billCode, id);
+ String carNo, String billCode, Long id) {
+ return emisTmsSiteBatchMapper.selectTmsSiteBatchBySiteAndBillCode(startSiteCode, nextSiteCode, carNo, billCode, id);
}
/**
@@ -209,6 +209,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
List existingBatches = selectTmsSiteBatchBySiteAndBillCode(
oldSiteBatch.getStartSiteCode(),
oldSiteBatch.getNextSiteCode(),
+ oldSiteBatch.getCarNo(),
itemDtl.getBillCode(), itemDtl.getId());
if (itemDtl.getId() != null) {
existingBatches = existingBatches.stream().filter(i -> !itemDtl.getBatchNo().equals(i.getBatchNo()))
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index f29693505..12b5b5821 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -577,6 +577,9 @@
left join emis_waybill w on d.bill_code = w.bill_code and w.del_flag = '0'
where b.start_site_code = #{startSiteCode}
and b.next_site_code = #{nextSiteCode}
+
+ and b.car_no = #{carNo}
+
and d.bill_code = #{billCode}
and b.del_flag = '0'
and d.del_flag = '0'