From 55db6ddbef63ec00707082f90e5b6e3180973520 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 22 Oct 2025 11:04:22 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-22=20=E5=9B=BA=E5=AE=9A=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FixedCarrierController.java        |  4 +---
 .../fixedCarrier/dao/FixedCarrierMapper.java      | 12 ++++++++++++
 .../service/impl/FixedCarrierServiceImpl.java     | 15 ++++++++++++++-
 .../mapper/fixedCarrier/FixedCarrierMapper.xml    |  7 +++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java b/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java
index 99e3e46..b3071a6 100644
--- a/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java
+++ b/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java
@@ -101,9 +101,7 @@ public class FixedCarrierController extends AbstractController {
             } else {
                 return R.error("工厂和部门有误!");
             }
-            if (fixedCarrier.getCarrierNo() == null || fixedCarrier.getCarrierNo().isEmpty()) {
-                return R.error("载具编码不能为空");
-            }
+            // 移除carrierNo的校验，由后端自动生成
             if (fixedCarrier.getCarrierTypeCode() == null || fixedCarrier.getCarrierTypeCode().isEmpty()) {
                 return R.error("载具类型编码不能为空");
             }
diff --git a/src/main/java/com/gaotao/modules/fixedCarrier/dao/FixedCarrierMapper.java b/src/main/java/com/gaotao/modules/fixedCarrier/dao/FixedCarrierMapper.java
index 1bbfba4..1a48aa6 100644
--- a/src/main/java/com/gaotao/modules/fixedCarrier/dao/FixedCarrierMapper.java
+++ b/src/main/java/com/gaotao/modules/fixedCarrier/dao/FixedCarrierMapper.java
@@ -67,6 +67,18 @@ public interface FixedCarrierMapper {
      * @return 总记录数
      */
     int queryTotal(Map<String, Object> params);
+
+    /**
+     * 获取序列号
+     *
+     * @param site 站点
+     * @param buNo BU编号
+     * @param type 类型（FC-固定载具）
+     * @return 序列号
+     */
+    String getSerialNo(@Param("site") String site,
+                       @Param("buNo") String buNo,
+                       @Param("type") String type);
 }
 
 
diff --git a/src/main/java/com/gaotao/modules/fixedCarrier/service/impl/FixedCarrierServiceImpl.java b/src/main/java/com/gaotao/modules/fixedCarrier/service/impl/FixedCarrierServiceImpl.java
index e80cc11..ef0acdf 100644
--- a/src/main/java/com/gaotao/modules/fixedCarrier/service/impl/FixedCarrierServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/fixedCarrier/service/impl/FixedCarrierServiceImpl.java
@@ -52,8 +52,21 @@ public class FixedCarrierServiceImpl implements FixedCarrierService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int save(FixedCarrier fixedCarrier) {
-        logger.info("新增固定载具，载具编码: {}", fixedCarrier.getCarrierNo());
+        logger.info("新增固定载具");
         try {
+            // 生成载具编码（标签条码）
+            String carrierNo = fixedCarrierMapper.getSerialNo(
+                    fixedCarrier.getSite(),
+                    fixedCarrier.getBuNo(),
+                    "FC"
+            );
+            if (carrierNo == null || carrierNo.isEmpty()) {
+                logger.error("生成载具编码失败");
+                throw new RuntimeException("生成载具编码失败");
+            }
+            fixedCarrier.setCarrierNo(carrierNo);
+            logger.info("生成载具编码: {}", carrierNo);
+
             // 检查是否已存在
             FixedCarrier existCarrier = fixedCarrierMapper.queryByPrimaryKey(
                     fixedCarrier.getSite(),
diff --git a/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml b/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml
index d3824ab..3e94e1f 100644
--- a/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml
+++ b/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml
@@ -186,6 +186,13 @@
         </if>
     </select>
 
+    <!-- 获取序列号 -->
+    <select id="getSerialNo" resultType="string" statementType="CALLABLE">
+        {call getSerialNo(#{site, mode=IN, jdbcType=VARCHAR},
+                         #{buNo, mode=IN, jdbcType=VARCHAR},
+                         #{type, mode=IN, jdbcType=VARCHAR})}
+    </select>
+
 </mapper>