From ce4044bf8c49a7751585daafd9bfbeec8e27cb87 Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Tue, 21 Apr 2026 17:46:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=97=B6=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms_vue/src/views/finance/payment/index.vue  |  2 ++
 .../oms_vue/src/views/finance/receive/index.vue  |  2 ++
 .../oms_vue/src/views/inventory/inner/index.vue  |  6 +++---
 .../oms_vue/src/views/system/product/index.vue   |  2 +-
 .../resources/templates/system/product/add.html  |  2 +-
 .../resources/templates/system/product/edit.html |  2 +-
 .../com/ruoyi/sip/domain/OmsPaymentBill.java     | 16 ++++++++--------
 .../impl/OmsInventoryInnerServiceImpl.java       |  4 ++++
 .../impl/OmsPurchaseOrderServiceImpl.java        |  6 ++++--
 .../mapper/sip/OmsPurchaseOrderMapper.xml        |  2 +-
 10 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/oms_web/oms_vue/src/views/finance/payment/index.vue b/oms_web/oms_vue/src/views/finance/payment/index.vue
index d05a2e6f..acd2ea16 100644
--- a/oms_web/oms_vue/src/views/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/index.vue
@@ -149,6 +149,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="paymentList" show-summary :summary-method="getSummaries">
+      <el-table-column label="项目编号" align="center" prop="projectCode" width="120" />
+      <el-table-column label="项目名称" align="center" prop="projectName" width="260" />
       <el-table-column label="采购-付款单编号" width="200" align="center" prop="paymentBillCode">
         <template slot-scope="scope">
           <a @click="handleDetail(scope.row)" class="link-type">{{ scope.row.paymentBillCode }}</a>
diff --git a/oms_web/oms_vue/src/views/finance/receive/index.vue b/oms_web/oms_vue/src/views/finance/receive/index.vue
index b7522246..d988df8c 100644
--- a/oms_web/oms_vue/src/views/finance/receive/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/index.vue
@@ -123,6 +123,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="receiveList">
+      <el-table-column label="项目编号" align="center" prop="projectCode" width="120" />
+      <el-table-column label="项目名称" align="center" prop="projectName" width="260" />
       <el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="180" />
       <el-table-column label="预计收款时间" align="center" prop="receiptTime" width="120">
         <template slot-scope="scope">
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 99854442..8d7081c0 100644
--- a/oms_web/oms_vue/src/views/inventory/inner/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue
@@ -422,7 +422,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       if (this.activeTab==='service'){
-        this.queryParams.productTypeList = ['11','22','70'];
+        this.queryParams.productTypeList = ['3','11','22','70'];
       }else{
         this.queryParams.productTypeList = ['1','2','99'];
       }
@@ -453,7 +453,7 @@ export default {
       this.reset();
       if (type==='maintenance'){
         this.isServiceIn = true;
-        this.queryProductType=['11','22','70']
+        this.queryProductType=['3','11','22','70']
       }else{
         this.isServiceIn = false;
         this.queryProductType=['1','2','99']
@@ -494,7 +494,7 @@ export default {
         const id = row.id;
         getInner(id).then(response => {
             this.form = response.data;
-            if (['11', '22'].includes(this.form.productType)) {
+            if (['3','11', '22'].includes(this.form.productType)) {
               this.detailComponent = 'ServiceDetail';
             } else {
               this.detailComponent = 'OrderDetail';
diff --git a/oms_web/oms_vue/src/views/system/product/index.vue b/oms_web/oms_vue/src/views/system/product/index.vue
index 1c48053f..9d0ca96a 100644
--- a/oms_web/oms_vue/src/views/system/product/index.vue
+++ b/oms_web/oms_vue/src/views/system/product/index.vue
@@ -250,7 +250,7 @@
         <el-form-item label="产品描述" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入产品描述" />
         </el-form-item>
-        <el-form-item v-if="form.type == '11' || form.type == '22'" label="维保年限" prop="value">
+        <el-form-item v-if="form.type == '11' || form.type == '22' || form.type == '3'" label="维保年限" prop="value">
             <el-input-number v-model="form.value" placeholder="请输入维保年限" />
         </el-form-item>
       </el-form>
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/add.html b/ruoyi-admin/src/main/resources/templates/system/product/add.html
index b98cbf8d..0a44e030 100644
--- a/ruoyi-admin/src/main/resources/templates/system/product/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/product/add.html
@@ -139,7 +139,7 @@
         });
         function changeType(){
             let type=$('[name="type"]').val()
-            if(type=='11'||type=='22'){
+            if(type=='3'||type=='11'||type=='22'){
                 $('#valueBox').show()
             }else{
                 $('#valueBox').hide()
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/edit.html b/ruoyi-admin/src/main/resources/templates/system/product/edit.html
index 7ba6c62a..4cff9f63 100644
--- a/ruoyi-admin/src/main/resources/templates/system/product/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/product/edit.html
@@ -120,7 +120,7 @@
         }
         function changeType(){
             let type=$('[name="type"]').val()
-            if(type=='11'||type=='22'){
+            if(type=='3'||type=='11'||type=='22'){
                 $('#valueBox').show()
             }else{
                 $('#valueBox').hide()
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
index def6ee54..31ff59c1 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
@@ -26,6 +26,14 @@ public class OmsPaymentBill extends BaseEntity
     /** 主键ID */
     private Long id;
 
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectCode;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
     /** 付款单编号 */
     @Excel(name = "付款单编号")
     private String paymentBillCode;
@@ -65,14 +73,6 @@ public class OmsPaymentBill extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
-    /** 项目编号 */
-    @Excel(name = "项目编号")
-    private String projectCode;
-
-    /** 项目名称 */
-    @Excel(name = "项目名称")
-    private String projectName;
-
     /** 预付单剩余额度 */
 //    @Excel(name = "预付单剩余额度")
     private BigDecimal preResidueAmount;
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 5661e6f7..e271a6ad 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
@@ -190,6 +190,8 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
         });
         inventoryInfoService.saveBatch(inventoryInfoList);
         productInfoService.updateAvailableCount(omsInventoryInner.getQuantity(),omsInventoryInner.getProductCode());
+        //修改对应的采购订单
+        purchaseOrderService.innerWarehouse(omsInventoryInner.getItemId(),omsInventoryInner.getQuantity());
         return omsInventoryInnerMapper.insertOmsInventoryInner(omsInventoryInner);
     }
 
@@ -211,6 +213,8 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
     @Override
     public int updateOmsInventoryInner(OmsInventoryInner omsInventoryInner) {
         omsInventoryInner.setUpdateTime(DateUtils.getNowDate());
+        //修改对应的采购订单
+        purchaseOrderService.innerWarehouse(omsInventoryInner.getItemId(),omsInventoryInner.getQuantity());
         return omsInventoryInnerMapper.updateOmsInventoryInner(omsInventoryInner);
     }
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
index 60d9b197..b600527d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
@@ -368,12 +368,14 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
             BigDecimal totalQuantity = entry.getValue().stream()
                     .map(OmsPurchaseOrderItem::getQuantity)
                     .filter(Objects::nonNull)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    .reduce(BigDecimal.ZERO, BigDecimal::add)
+                    .max(BigDecimal.ZERO);
 
             BigDecimal totalInnerQuantity = entry.getValue().stream()
                     .map(OmsPurchaseOrderItem::getInnerQuantity)
                     .filter(Objects::nonNull)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    .reduce(BigDecimal.ZERO, BigDecimal::add)
+                    .max(BigDecimal.ZERO);
 
             // 根据规则判断状态
             int status;
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
index b132df40..08cd74c2 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
@@ -472,7 +472,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" index="index" separator=";">
             update oms_purchase_order_item t1
             left join oms_purchase_order t2 on t1.purchase_id = t2.id
-            set t1.inner_quantity = t1.inner_quantity- #{item.innerQuantity}
+            set t1.inner_quantity = (case when t1.inner_quantity- #{item.innerQuantity} &lt; 0 then 0 else t1.inner_quantity- #{item.innerQuantity} end)
              where t1.product_code = #{item.productCode} and t2.purchase_no=#{item.purchaseNo}
         </foreach>
     </update>