From 00f91b394a012ff9aaab62883843fd1b79053d42 Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Fri, 15 May 2026 12:16:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8F=91=E8=B4=A7bug=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=AF=BC=E5=85=A5SN=E7=A0=81bug=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oms_web/oms_vue/src/views/inventory/inner/index.vue       | 6 +++++-
 .../sip/service/impl/InventoryDeliveryServiceImpl.java    | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/oms_web/oms_vue/src/views/inventory/inner/index.vue b/oms_web/oms_vue/src/views/inventory/inner/index.vue
index 3cf29048..8747ed68 100644
--- a/oms_web/oms_vue/src/views/inventory/inner/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue
@@ -196,7 +196,7 @@
         <el-table :data="form.inventoryInfoList">
           <template v-if="!isServiceIn">
             <el-table-column type="index" label="序号"/>
-            <el-table-column label="SN码" prop="productSn" />
+            <el-table-column label="SN码" prop="productSn" width="250" />
             <el-table-column label="授权码" prop="licenseKey" />
             <el-table-column label="产品编码" prop="productCode" />
             <el-table-column label="产品型号" prop="model" />
@@ -399,6 +399,10 @@ export default {
         this.$modal.msgError("SN码最后一位必须为数字");
         return;
       }
+      if (snNumber.length > 6) {
+        snPrefix = snPrefix + snNumber.substring(0, snNumber.length - 6);
+        snNumber = snNumber.substring(snNumber.length - 6);
+      }
       let startNumber = parseInt(snNumber);
 
       let productsToAdd = [];
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
index 47062bbb..12720c41 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@@ -19,6 +19,7 @@ import com.ruoyi.sip.mapper.InventoryOuterMapper;
 import com.ruoyi.sip.service.*;
 import com.ruoyi.sip.vo.DeliveryApproveVo;
 import com.ruoyi.sip.vo.DeliveryInfoVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,6 +38,7 @@ import javax.annotation.Resource;
  * @author ruoyi
  * @date 2025-08-12
  */
+@Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
@@ -328,10 +330,12 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
     public void generateServiceBillsWhenAllDelivered(String orderCode) {
         ProjectOrderInfo orderInfo = projectOrderInfoService.selectProjectOrderInfoByOrderCode(orderCode);
         if (ObjectUtils.isEmpty(orderInfo)) {
-            throw new ServiceException("无对应订单信息");
+            log.warn("无对应订单信息");
+            return;
         }
         if (!ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode().equals(orderInfo.getDeliveryStatus())) {
-            throw new ServiceException("当前订单未全部发货");
+            log.warn("当前订单未全部发货");
+            return;
         }
         List<ProjectProductInfo> serviceProductInfos = CollUtil.isEmpty(orderInfo.getMaintenanceProjectProductInfoList())
                 ? Collections.emptyList()