From 36e2e496d891d7e27f5db7c016d1410cc08c4d8c Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 12 Nov 2025 13:53:26 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20tms-=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E6=97=B6=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=9E=8Bcode=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisTransProductServiceImpl.java     | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
index 905f71de3..75d9ab82e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
@@ -67,10 +67,36 @@ public class EmisTransProductServiceImpl implements IEmisTransProductService
     public int insertEmisTransProduct(EmisTransProduct emisTransProduct)
     {
         // 获取线路编号
-        QueryWrapper<EmisTransProduct> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("trans_line_code",emisTransProduct.getTransLineCode());
-        Long count = emisTransProductMapper.selectCount(queryWrapper);
-        String prodCode=emisTransProduct.getTransLineCode()+"-"+ StringUtils.leftPad(String.valueOf(count),4,"0");
+        QueryWrapper<EmisTransProduct> queryWrapper=new QueryWrapper<>();
+        queryWrapper.likeRight("prod_code",emisTransProduct.getTransLineCode()+"-");
+        queryWrapper.select("prod_code");
+        queryWrapper.orderByDesc("prod_code");
+        queryWrapper.last("LIMIT 1");
+        List<EmisTransProduct> productList = emisTransProductMapper.selectList(queryWrapper);
+        
+        String prodCode;
+        if (productList == null || productList.isEmpty()) {
+            // 如果查询结果为空，使用0000
+            prodCode = emisTransProduct.getTransLineCode()+"-"+"0000";
+        } else {
+            // 获取最大的prod_code，提取数字部分加1
+            String maxProdCode = productList.get(0).getProdCode();
+            String prefix = emisTransProduct.getTransLineCode()+"-";
+            if (maxProdCode != null && maxProdCode.startsWith(prefix)) {
+                String numberPart = maxProdCode.substring(prefix.length());
+                try {
+                    int maxNumber = Integer.parseInt(numberPart);
+                    int newNumber = maxNumber + 1;
+                    prodCode = prefix + StringUtils.leftPad(String.valueOf(newNumber), 4, "0");
+                } catch (NumberFormatException e) {
+                    // 如果解析失败，使用0000
+                    prodCode = emisTransProduct.getTransLineCode()+"-"+"0000";
+                }
+            } else {
+                // 如果格式不匹配，使用0000
+                prodCode = emisTransProduct.getTransLineCode()+"-"+"0000";
+            }
+        }
         emisTransProduct.setProdCode(prodCode);
 
         emisTransProduct.preInsert();