From c25bf2c5670df5a8f1d532fb33a1ffbf26b3642f Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 5 Dec 2025 10:47:03 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=9A=E5=A6=82=E6=9E=9C=E8=AF=A5=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E5=B7=B2=E7=BB=8F=E7=A7=9F=E8=BF=87=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=9E=8B=E6=97=B6=E4=BF=9D=E5=AD=98=E6=97=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=A5=E8=BF=90=E5=8D=95=E5=B7=B2=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=85=88=E7=A7=BB=E9=99=A4=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=86=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

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 7910cbe62..681ceb51a 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
@@ -14,6 +14,7 @@ package com.xdadan.erp.emis.service.impl;
  import com.alibaba.fastjson.JSON;
  import com.alibaba.fastjson.JSONArray;
  import com.alibaba.fastjson.JSONObject;
+ import com.beust.jcommander.internal.Lists;
  import com.deepoove.poi.XWPFTemplate;
  import com.deepoove.poi.config.Configure;
  import com.deepoove.poi.data.PictureType;
@@ -3814,6 +3815,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     @Override
     public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,Boolean needUpdateAttach,Boolean isForce) throws EmisBizError {
 
+        if(!emisWaybillSave.getProductType().equals(oldEmisWaybill.getProductType())){
+            List<EmisTmsSiteBatch> batchList = emisTmsSiteBatchMapper.selectEmisTmsSiteBatchListByBillCodes(
+                    Lists.newArrayList(Collections.singleton(emisWaybillSave.getBillCode())));
+            if (CollectionUtil.isNotEmpty(batchList)) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "该单号已经录入批次，请先在组批次中剔除该运单");
+            }
+        }
         // 公共计算部分
         emisWaybillSave.setId(oldEmisWaybill.getId());