From b274c5e4af74fd4820aba202b220c8d793092fc9 Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Wed, 22 Apr 2026 15:46:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=88=E6=9D=83=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms_vue/src/views/inventory/delivery/Detail.vue  |  1 +
 .../views/inventory/inner/components/OrderDetail.vue |  1 +
 oms_web/oms_vue/src/views/inventory/inner/index.vue  |  5 +++++
 .../outer/components/GenerateDeliveryForm.vue        |  1 +
 .../ruoyi/sip/controller/DataProcessController.java  |  6 ++++++
 .../java/com/ruoyi/sip/domain/InventoryInfo.java     |  1 +
 .../sip/dto/inventory/InventoryInfoExcelDto.java     |  2 ++
 .../sip/dto/warehouse/WarehouseInnerExcelDto.java    |  2 ++
 .../sip/service/impl/InventoryInfoServiceImpl.java   |  1 +
 .../service/impl/OmsInventoryInnerServiceImpl.java   |  1 +
 .../sip/service/impl/OmsPayableBillServiceImpl.java  |  8 --------
 .../mapper/inventory/InventoryInfoMapper.xml         | 12 +++++++++---
 12 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
index 07d275ae..581bc004 100644
--- a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
+++ b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
@@ -70,6 +70,7 @@
       <h4>关联SN码列表</h4>
       <el-table v-loading="snLoading" :data="snList">
         <el-table-column label="SN码" align="center" prop="productSn"/>
+        <el-table-column label="授权码" align="center" prop="licenseKey"/>
         <el-table-column label="产品编码" align="center" prop="productCode"/>
         <el-table-column label="产品型号" align="center" prop="model"/>
         <el-table-column label="描述" align="center" prop="productDesc"/>
diff --git a/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue b/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue
index 08212921..6f08f376 100644
--- a/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue
+++ b/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue
@@ -29,6 +29,7 @@
       </el-row>
       <el-table :data="form.inventoryInfoList">
         <el-table-column label="SN码" prop="productSn" />
+        <el-table-column label="授权码" prop="licenseKey" />
         <el-table-column label="产品编码" prop="productCode" />
         <el-table-column label="产品型号" prop="model" />
         <el-table-column label="产品描述" prop="productDesc" width="200" show-overflow-tooltip/>
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 8d7081c0..3cf29048 100644
--- a/oms_web/oms_vue/src/views/inventory/inner/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue
@@ -197,6 +197,7 @@
           <template v-if="!isServiceIn">
             <el-table-column type="index" label="序号"/>
             <el-table-column label="SN码" prop="productSn" />
+            <el-table-column label="授权码" prop="licenseKey" />
             <el-table-column label="产品编码" prop="productCode" />
             <el-table-column label="产品型号" prop="model" />
             <el-table-column label="产品描述" prop="productDesc" width="200" show-overflow-tooltip/>
@@ -377,6 +378,7 @@ export default {
     submitSn() {
       if (this.snRow) {
         this.snRow.productSn = this.inputSn;
+        this.snRow.licenseKey = this.snRow.licenseKey || '';
         this.snOpen = false;
         return;
       }
@@ -406,6 +408,7 @@ export default {
         let currentSn = snPrefix + formattedNumber;
         productsToAdd.push({
           productSn: currentSn,
+          licenseKey: '',
           productCode: this.form.productCode,
           model: this.form.productModel,
           productDesc: this.form.productDesc,
@@ -603,6 +606,7 @@ export default {
               item.warehouseName=this.form.warehouseName;
               item.innerPrice=this.form.price;
               item.taxRate=this.form.taxRate;
+              item.licenseKey = item.licenseKey || '';
             })
             this.$modal.msgSuccess("导入成功");
         } else {
@@ -715,6 +719,7 @@ export default {
                     let currentSn = snPrefix + formattedNumber;
                     productsToAdd.push({
                         productSn: currentSn,
+                        licenseKey: '',
                         productCode: this.productForm.productCode,
                         model: this.productForm.model,
                         productDesc: this.productForm.productDesc,
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
index d03f1f81..ac1080c9 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
@@ -69,6 +69,7 @@
     <el-table ref="snTable" :data="snList" @selection-change="handleSelectionChange" height="400px" row-key="productSn">
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
       <el-table-column label="SN码" prop="productSn" />
+      <el-table-column label="授权码" prop="licenseKey" />
       <el-table-column label="产品编码" prop="productCode" />
       <el-table-column label="产品型号" prop="model" />
       <el-table-column label="描述" prop="productDesc" />
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
index 9bdbd33f..df5aef44 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
@@ -1,6 +1,8 @@
 package com.ruoyi.sip.controller;
 
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sip.domain.*;
 import com.ruoyi.sip.dto.inventory.OmsPurchaseOrderItemDto;
@@ -34,6 +36,7 @@ import java.util.stream.Collectors;
 /**
  * 数据处理控制器
  */
+@Anonymous
 @RestController
 @RequestMapping("/sip/dataProcess")
 public class DataProcessController {
@@ -62,6 +65,9 @@ public class DataProcessController {
     //入库单生成应付单
     @GetMapping("/inventoryInnerGeneratePayableBill")
     void inventoryInnerGeneratePayableBill(@RequestParam("innerId") Long innerId) {
+        if (innerId == null) {
+            throw new ServiceException("innerId不能为空");
+        }
         bindShiroUser(1L, "admin", "平台管理员");
         OmsInventoryInner omsInventoryInner = omsInventoryInnerMapper.selectOmsInventoryInnerById(innerId);
         List<InventoryInfo> inventoryInfoList = inventoryInfoMapper.selectInventoryInfoByInnerCodeList(Arrays.asList(omsInventoryInner.getInnerCode()));
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java
index 43f69b1f..7739cb01 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java
@@ -36,6 +36,7 @@ public class InventoryInfo extends BaseEntity
     /** 产品序列号 */
     @Excel(name = "产品序列号")
     private String productSn;
+    private String licenseKey;
     private List<String> productSnList;
 
     /** 库存状态(0 入库   1出库) */
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/inventory/InventoryInfoExcelDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/inventory/InventoryInfoExcelDto.java
index 3c374da5..d7fac585 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/inventory/InventoryInfoExcelDto.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/inventory/InventoryInfoExcelDto.java
@@ -23,6 +23,8 @@ import java.math.BigDecimal;
 public class InventoryInfoExcelDto {
     @Excel(name = "SN码")
     private String productSn;
+    @Excel(name = "授权码")
+    private String licenseKey;
     @Excel(name = "产品编码")
     private String productCode;
     @Excel(name = "产品型号")
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/warehouse/WarehouseInnerExcelDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/warehouse/WarehouseInnerExcelDto.java
index 126cf360..0c8c36c4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/warehouse/WarehouseInnerExcelDto.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/warehouse/WarehouseInnerExcelDto.java
@@ -27,6 +27,8 @@ public class WarehouseInnerExcelDto {
     private String index;
     @Excel(name = "SN码")
     private String productSn;
+    @Excel(name = "授权码")
+    private String licenseKey;
     @Excel(name="产品编码")
     private String productCode;
     @Excel(name="入库价(含税)")
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryInfoServiceImpl.java
index cabada9b..b9f89fc4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryInfoServiceImpl.java
@@ -143,6 +143,7 @@ public class InventoryInfoServiceImpl implements IInventoryInfoService {
             inventoryInfo.setInventoryStatus(InventoryInfo.InventoryStatusEnum.INNER.getCode());
             inventoryInfo.setProductCode(excel.getProductCode());
             inventoryInfo.setProductSn(excel.getProductSn());
+            inventoryInfo.setLicenseKey(excel.getLicenseKey());
 //            if (excel.getInnerPrice()==null){
 //                throw new ServiceException("入库价未填写,导入失败");
 //            }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
index e271a6ad..8273744f 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
@@ -318,6 +318,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
             InventoryInfo info = new InventoryInfo();
             info.setInventoryStatus(InventoryInfo.InventoryStatusEnum.INNER.getCode());
             info.setProductSn(item.getProductSn());
+            info.setLicenseKey(item.getLicenseKey());
             info.setProductCode(productCode);
             info.setModel(productInfos.get(0).getModel());
             info.setProductDesc(productInfos.get(0).getDescription());
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
index 3e52d2ed..2e9f9659 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
@@ -103,12 +103,10 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
     @Transactional
     public int insertOmsPayableBill(OmsPayableBill omsPayableBill, Integer payConfigDay) {
         //生成采购应付单编号
-
         omsPayableBill.setUnpaidPaymentAmount(omsPayableBill.getTotalPriceWithTax());
         omsPayableBill.setUnreceivedTicketAmount(omsPayableBill.getTotalPriceWithTax());
         omsPayableBill.setPaidPaymentAmount(BigDecimal.ZERO);
         omsPayableBill.setReceivedTicketAmount(BigDecimal.ZERO);
-
         omsPayableBill.setPayableBillCode(generatePayableBillCode());
         omsPayableBill.setCreateTime(DateUtils.getNowDate());
         omsPayableBill.setCreateBy(ShiroUtils.getUserId().toString());
@@ -138,13 +136,7 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
             omsPayableBill.setLastTicketPlanId(omsPayableTicketPlan.getId());
 
             updateOmsPayableBill(omsPayableBill);
-
-
-
-
-
         }
-
         return rows;
     }
 
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
index e0cbaaef..a6a2513a 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="productCode"    column="product_code"    />
         <result property="productSn"    column="product_sn"    />
+        <result property="licenseKey"    column="license_key"    />
         <result property="inventoryStatus"    column="inventory_status"    />
         <result property="innerCode"    column="inner_code"    />
         <result property="outerCode"    column="outer_code"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInventoryInfoVo">
-        select t1.id, t1.product_code, t1.product_sn, t1.inventory_status, t1.inner_code, t1.outer_code, t1.warehouse_id, t1.inner_price,t1.tax_rate,
+        select t1.id, t1.product_code, t1.product_sn, t1.license_key, t1.inventory_status, t1.inner_code, t1.outer_code, t1.warehouse_id, t1.inner_price,t1.tax_rate,
                t1.outer_price, t1.create_by, t1.create_time, t1.update_by, t1.update_time ,
                t2.warehouse_name,t3.description as 'product_desc',t3.model,t3.type as product_type
         from oms_inventory_info t1
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
             </if>
+            <if test="licenseKey != null and licenseKey != ''">and t1.license_key = #{licenseKey}</if>
             <if test="inventoryStatus != null  and inventoryStatus != ''">and t1.inventory_status = #{inventoryStatus}
             </if>
             <if test="innerCode != null  and innerCode != ''">and t1.inner_code = #{innerCode}</if>
@@ -132,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="productCode != null">product_code,</if>
             <if test="productSn != null">product_sn,</if>
+            <if test="licenseKey != null">license_key,</if>
             <if test="inventoryStatus != null">inventory_status,</if>
             <if test="innerCode != null">inner_code,</if>
             <if test="outerCode != null">outer_code,</if>
@@ -146,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productCode != null">#{productCode},</if>
             <if test="productSn != null">#{productSn},</if>
+            <if test="licenseKey != null">#{licenseKey},</if>
             <if test="inventoryStatus != null">#{inventoryStatus},</if>
             <if test="innerCode != null">#{innerCode},</if>
             <if test="outerCode != null">#{outerCode},</if>
@@ -159,13 +163,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
     <insert id="saveBatch">
-        insert into oms_inventory_info (product_code, product_sn, inventory_status, inner_code, outer_code
+        insert into oms_inventory_info (product_code, product_sn, license_key, inventory_status, inner_code, outer_code
         , warehouse_id, inner_price, outer_price, create_by, create_time, update_by, update_time,payable_bill_code,tax_rate) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.productCode}, #{item.productSn}, #{item.inventoryStatus}, #{item.innerCode}, #{item.outerCode}
+            (#{item.productCode}, #{item.productSn}, #{item.licenseKey}, #{item.inventoryStatus}, #{item.innerCode}, #{item.outerCode}
             , #{item.warehouseId}, #{item.innerPrice}, #{item.outerPrice}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime},#{item.payableBillCode},#{item.taxRate})
         </foreach>
         ON DUPLICATE KEY UPDATE
+        license_key = VALUES(license_key),
         inventory_status = VALUES(inventory_status),
         outer_code = VALUES(outer_code),
         outer_price = VALUES(outer_price),
@@ -178,6 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="productCode != null">product_code = #{productCode},</if>
             <if test="productSn != null">product_sn = #{productSn},</if>
+            <if test="licenseKey != null">license_key = #{licenseKey},</if>
             <if test="inventoryStatus != null">inventory_status = #{inventoryStatus},</if>
             <if test="innerCode != null">inner_code = #{innerCode},</if>
             <if test="outerCode != null">outer_code = #{outerCode},</if>