From d5b8b0ca689773c0ab8a2f11ceb117709abe0d11 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Tue, 16 Dec 2025 18:42:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(inventory):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=B8=BA?=
 =?UTF-8?q?POST=E8=AF=B7=E6=B1=82=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将库存信息列表接口从GET改为POST请求
- 更新前端调用方式，使用data传递参数
- 优化后端空列表判断逻辑，避免无效查询
- 修复Vue组件中按钮事件参数传递问题
- 调整退回到货状态变更后的回调逻辑
- 更新本地开发环境后端接口地址配置
- 优化MyBatis XML中集合判空条件表达式
---
 oms_web/oms_vue/src/api/inventory/delivery.js               | 4 ++--
 .../src/views/inventory/outer/components/OuterForm.vue      | 6 ++++--
 oms_web/oms_vue/src/views/inventory/outer/index.vue         | 2 +-
 oms_web/oms_vue/vue.config.js                               | 2 +-
 .../sip/controller/vue/VueInventoryInfoController.java      | 4 ++--
 .../sip/service/impl/InventoryDeliveryServiceImpl.java      | 3 +++
 .../main/resources/mapper/inventory/InventoryInfoMapper.xml | 2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/oms_web/oms_vue/src/api/inventory/delivery.js b/oms_web/oms_vue/src/api/inventory/delivery.js
index b43ced26..386017ad 100644
--- a/oms_web/oms_vue/src/api/inventory/delivery.js
+++ b/oms_web/oms_vue/src/api/inventory/delivery.js
@@ -74,8 +74,8 @@ export function exportDeliveryDetail(id) {
 export function listProductSn(query) {
   return request({
     url: '/inventory/info/vue/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue
index 638830bd..4b2ae40e 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue
@@ -82,7 +82,7 @@
     <delivery-detail :delivery-id="deliveryId" :visible.sync="viewOpen" />
 
     <div slot="footer" class="dialog-footer">
-      <el-button v-if="showReturn" type="danger" @click="handleStatusChange(this.form, '4')">退 回</el-button>
+      <el-button v-if="showReturn" type="danger" @click="handleStatusChange(form, '4')">退 回</el-button>
       <el-button  @click="handleCancel">关 闭</el-button>
     </div>
   </el-dialog>
@@ -117,6 +117,7 @@ export default {
         getOuter(id).then(response => {
           this.visible = true;
           this.form = response.data.inventoryOuter;
+          console.log(this.form)
           this.productList = response.data.productVoList || [];
           this.deliveryList = response.data.deliveryList || [];
           this.showReturn=this.deliveryList.length<=0;
@@ -192,7 +193,8 @@ export default {
         return changeOuterStatus(row.id, status, row.orderCode);
       }).then(() => {
         this.$message.success(`${actionText}成功`);
-        this.getList();
+        this.visible=false;
+        this.$emit('returnSuccess');
       }).catch(() => {});
     }
   }
diff --git a/oms_web/oms_vue/src/views/inventory/outer/index.vue b/oms_web/oms_vue/src/views/inventory/outer/index.vue
index fe3a8136..fd182bb0 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/index.vue
@@ -72,7 +72,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
 
     <!-- 新增/编辑弹窗 -->
-    <outer-form ref="form" @success="getList"></outer-form>
+    <outer-form ref="form" @returnSuccess="getList" @success="getList"></outer-form>
 
     <!-- 详情抽屉 -->
     <outer-details ref="details"></outer-details>
diff --git a/oms_web/oms_vue/vue.config.js b/oms_web/oms_vue/vue.config.js
index a87f08b0..5d29444a 100644
--- a/oms_web/oms_vue/vue.config.js
+++ b/oms_web/oms_vue/vue.config.js
@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || 'UNISSENSE-OMS' // 网页标题
 
-const baseUrl = 'http://localhost:28080' // 后端接口
+const baseUrl = 'http://localhost:28081' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java
index c5986a14..1c4b884e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java
@@ -71,9 +71,9 @@ public class VueInventoryInfoController extends BaseController {
         List<ProductInfo> list = productInfoService.listInventory(info);
         return getDataTable(list);
     }
-    @GetMapping("/list")
+    @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(InventoryInfo inventoryInfo)
+    public TableDataInfo list(@RequestBody InventoryInfo inventoryInfo)
     {
 
         if (!inventoryAuthService.authAll()) {
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 93079cac..4df26d17 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
@@ -241,6 +241,9 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
     public List<DeliveryInfoVo> getNumberInfo(ApiDataQueryDto dto) {
         List<DeliveryInfoVo> resultList = inventoryDeliveryMapper.listSn(dto);
         List<String> orderCodeList = resultList.stream().map(DeliveryInfoVo::getOrderCode).collect(Collectors.toList());
+        if (CollUtil.isEmpty(orderCodeList)){
+            return Collections.emptyList();
+        }
         // 根据订单ID查询合同信息
         List<ProjectProductInfo> projectProductInfos = projectProductInfoService.selectProjectProductInfoListByOrderCode(orderCodeList);
 
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
index a3757aec..3bb6171e 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
             <if test="productSn != null  and productSn != ''">and t1.product_sn = #{productSn}</if>
-            <if test="productSnList != null  and productSnList != ''">and t1.product_sn in
+            <if test="productSnList != null  and productSnList.size>0">and t1.product_sn in
             <foreach item="item" index="index" collection="productSnList" separator="," open="(" close=")">
                 #{item}
             </foreach>

From d3832d0ceb3af3dc06dfa2d5b96c115cbcf93bd7 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Thu, 18 Dec 2025 19:12:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(inventory):=20=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=92=8C=E7=9B=B8=E5=85=B3=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=8A=9F=E8=83=BD=E4=B8=8E=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个组件中添加 `:close-on-click-modal="false"` 属性以防止误触关闭
- 设置 `el-drawer` 的 `:wrapper-closable="false"` 来增强用户体验
- 为 GenerateDeliveryForm 中的表格增加 row-key 和 reserve-selection 以支持选择状态保留
- 添加 isInitialLoad 标志优化 SN 列表初始化加载逻辑
- 更新 delivery.js 接口请求头以支持 multipart/form-data 类型数据传输
- 修改 Vue 配置中的后端接口地址从 28081 到 28080 端口
- Java 后端控制器方法参数调整并加入防重复发货注释提醒
- 强化前端产品信息校验逻辑，确保提交前完成所有必填字段
- 统一处理弹窗及抽屉类组件的行为一致性，提升交互体验
---
 oms_web/oms_vue/src/api/inventory/delivery.js |  1 +
 .../oms_vue/src/views/base/vendor/index.vue   |  2 +-
 .../src/views/inventory/delivery/Detail.vue   |  2 +-
 .../src/views/inventory/delivery/index.vue    |  2 +-
 .../inventory/execution/CheckoutDialog.vue    |  2 +-
 .../inventory/execution/OuterDetailDialog.vue |  2 +-
 .../src/views/inventory/execution/index.vue   |  4 ++--
 .../src/views/inventory/info/index.vue        |  6 +++---
 .../src/views/inventory/inner/index.vue       |  4 ++--
 .../outer/components/GenerateDeliveryForm.vue | 17 +++++++++++------
 .../outer/components/OuterDetails.vue         |  2 +-
 .../inventory/outer/components/OuterForm.vue  |  2 +-
 .../project/info/ProjectDetailDrawer.vue      |  3 ++-
 .../src/views/project/info/ProjectForm.vue    | 19 +++++++++++++++++++
 .../src/views/project/order/OrderDetail.vue   |  7 ++++++-
 .../views/project/order/OrderDetailDrawer.vue |  2 +-
 .../oms_vue/src/views/project/order/index.vue |  2 +-
 .../components/PurchaseOrderSelectDialog.vue  |  2 +-
 .../oms_vue/src/views/purchaseorder/index.vue |  3 ++-
 .../oms_vue/src/views/system/agent/index.vue  |  2 +-
 .../src/views/system/agent/selectAgent.vue    |  2 +-
 .../src/views/system/customer/index.vue       |  2 +-
 .../views/system/customer/selectCustomer.vue  |  2 +-
 .../src/views/system/partner/index.vue        |  2 +-
 .../views/system/partner/selectPartner.vue    |  2 +-
 .../src/views/system/product/index.vue        |  2 +-
 .../views/system/product/selectProduct.vue    |  2 +-
 .../src/views/warehouse/info/index.vue        |  4 ++--
 .../vue/VueInventoryInfoController.java       |  2 +-
 .../impl/InventoryDeliveryServiceImpl.java    |  2 ++
 30 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/oms_web/oms_vue/src/api/inventory/delivery.js b/oms_web/oms_vue/src/api/inventory/delivery.js
index 386017ad..13ef853b 100644
--- a/oms_web/oms_vue/src/api/inventory/delivery.js
+++ b/oms_web/oms_vue/src/api/inventory/delivery.js
@@ -75,6 +75,7 @@ export function listProductSn(query) {
   return request({
     url: '/inventory/info/vue/list',
     method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
     data: query
   })
 }
diff --git a/oms_web/oms_vue/src/views/base/vendor/index.vue b/oms_web/oms_vue/src/views/base/vendor/index.vue
index 85110c9d..b2a1686f 100644
--- a/oms_web/oms_vue/src/views/base/vendor/index.vue
+++ b/oms_web/oms_vue/src/views/base/vendor/index.vue
@@ -138,7 +138,7 @@
     />
 
     <!-- 添加或修改制造商信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="70%"  :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="200px"  style="max-height: 70vh;overflow-y: auto;padding: 10px">
         <el-row>
             <el-col :span="12">
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 475334b8..35483689 100644
--- a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
+++ b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-drawer title="发货单详情" :visible.sync="visible" direction="rtl" size="60%" @close="handleClose" append-to-body>
+  <el-drawer title="发货单详情" :wrapper-closable="false" :visible.sync="visible" direction="rtl" size="60%" @close="handleClose" append-to-body>
     <div class="app-container">
       <el-form :model="detail" label-width="100px" disabled>
         <div
diff --git a/oms_web/oms_vue/src/views/inventory/delivery/index.vue b/oms_web/oms_vue/src/views/inventory/delivery/index.vue
index a1e75a8d..c573ee20 100644
--- a/oms_web/oms_vue/src/views/inventory/delivery/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/delivery/index.vue
@@ -81,7 +81,7 @@
                 @pagination="getList"/>
 
     <!-- 新增/修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
diff --git a/oms_web/oms_vue/src/views/inventory/execution/CheckoutDialog.vue b/oms_web/oms_vue/src/views/inventory/execution/CheckoutDialog.vue
index 17c06bc5..2804d5d8 100644
--- a/oms_web/oms_vue/src/views/inventory/execution/CheckoutDialog.vue
+++ b/oms_web/oms_vue/src/views/inventory/execution/CheckoutDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body @close="cancel" class="checkout-dialog">
+  <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="80%" append-to-body @close="cancel" class="checkout-dialog">
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
diff --git a/oms_web/oms_vue/src/views/inventory/execution/OuterDetailDialog.vue b/oms_web/oms_vue/src/views/inventory/execution/OuterDetailDialog.vue
index a4df8f0d..cc129f36 100644
--- a/oms_web/oms_vue/src/views/inventory/execution/OuterDetailDialog.vue
+++ b/oms_web/oms_vue/src/views/inventory/execution/OuterDetailDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-drawer :title="title" :visible.sync="open" size="70%" append-to-body @close="cancel">
+  <el-drawer  :wrapper-closable="false" :title="title" :visible.sync="open" size="70%" append-to-body @close="cancel">
     <el-form ref="form" :model="form" label-width="140px">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue
index a57013ce..90e293cd 100644
--- a/oms_web/oms_vue/src/views/inventory/execution/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue
@@ -160,7 +160,7 @@
     />
 
     <!-- 编辑订单执行对话框 -->
-    <el-dialog title="编辑订单执行" :visible.sync="editDialogVisible" width="70vw" append-to-body destroy-on-close>
+    <el-dialog title="编辑订单执行"  :close-on-click-modal="false" :visible.sync="editDialogVisible" width="70vw" append-to-body destroy-on-close>
       <edit
         v-if="editDialogVisible"
         :order-id="currentEditOrderId"
@@ -173,7 +173,7 @@
     </el-dialog>
 
     <!-- 签收文件上传对话框 -->
-    <el-dialog title="上传签收文件" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog   :close-on-click-modal="false" title="上传签收文件" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
diff --git a/oms_web/oms_vue/src/views/inventory/info/index.vue b/oms_web/oms_vue/src/views/inventory/info/index.vue
index 5f0044e0..4e9cc4d6 100644
--- a/oms_web/oms_vue/src/views/inventory/info/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/info/index.vue
@@ -74,7 +74,7 @@
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 新增/修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog   :close-on-click-modal="false" :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
@@ -196,12 +196,12 @@
     </el-drawer>
 
     <!-- 入库记录对话框 -->
-    <el-dialog title="入库记录" :visible.sync="innerLogVisible" width="70%" append-to-body>
+    <el-dialog  :close-on-click-modal="false" title="入库记录" :visible.sync="innerLogVisible" width="70%" append-to-body>
       <inner-log v-if="innerLogVisible" :product-code="currentLogProductCode" :warehouse-id="currentLogWarehouseId" />
     </el-dialog>
 
     <!-- 出库记录对话框 -->
-    <el-dialog title="出库记录" :visible.sync="outerLogVisible" width="70%" append-to-body>
+    <el-dialog  :close-on-click-modal="false" title="出库记录" :visible.sync="outerLogVisible" width="70%" append-to-body>
       <outer-log v-if="outerLogVisible" :product-code="currentLogProductCode" :warehouse-id="currentLogWarehouseId" />
     </el-dialog>
 
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 de141546..ab486a84 100644
--- a/oms_web/oms_vue/src/views/inventory/inner/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue
@@ -127,7 +127,7 @@
     <order-select-dialog :visible.sync="orderSelectVisible" @select="handleOrderSelect"/>
 
     <!-- 新增/修改 Dialog -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body :close-on-click-modal="false">
+    <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="80%" append-to-body >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" style="max-height: 70vh;overflow-y: auto">
         <el-row>
           <el-col :span="24"><h3>入库信息</h3></el-col>
@@ -224,7 +224,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="snTitle" :visible.sync="snOpen">
+    <el-dialog  :close-on-click-modal="false" :title="snTitle" :visible.sync="snOpen">
       <el-row>
         <el-col :span="8"><span>{{ snLabel }}</span><span style="color: red">*</span></el-col>
         <el-col :span="16">
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 688a3049..49843736 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
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="生成发货单" :visible.sync="visible" width="85%" top="5vh" append-to-body @close="handleCancel">
+  <el-dialog title="生成发货单"  :close-on-click-modal="false" :visible.sync="visible" width="85%" top="5vh" append-to-body @close="handleCancel">
     <div class="required-delivery-time">
       要求发货时间: {{ requiredDeliveryTime }}
     </div>
@@ -59,8 +59,8 @@
       </el-col>
     </el-row>
 
-    <el-table ref="snTable" :data="snList" @selection-change="handleSelectionChange" height="400px">
-      <el-table-column type="selection" width="55" align="center" />
+    <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="productCode" />
       <el-table-column label="产品型号" prop="model" />
@@ -121,6 +121,7 @@ export default {
         warehouseId: undefined,
       },
       isImported: false, // Flag to track if data is from import
+      isInitialLoad: false,
       purchaseOrderSelectVisible: false,
       queryProductType: ['1', '2', '99'],
       price: null,
@@ -147,6 +148,7 @@ export default {
       this.queryParams.warehouseId = productRow.warehouseId;
       this.queryParams.pageSize = productRow.quantity - productRow.deliveryGenerateQuantity - productRow.deliveryConfirmQuantity;
 
+      this.isInitialLoad = true;
       this.getSnList();
       this.visible = true;
     },
@@ -154,11 +156,14 @@ export default {
       listProductSn(this.queryParams).then(response => {
         this.snList = response.rows;
         this.total = response.total;
-        this.$nextTick(() => {
+        if (this.isInitialLoad) {
+          this.$nextTick(() => {
             if (this.$refs.snTable) {
-                this.$refs.snTable.toggleAllSelection();
+              this.$refs.snTable.toggleAllSelection();
             }
-        });
+          });
+          this.isInitialLoad = false;
+        }
       });
     },
     handleSelectionChange(selection) {
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/OuterDetails.vue b/oms_web/oms_vue/src/views/inventory/outer/components/OuterDetails.vue
index c83725ea..4d07e6a2 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/OuterDetails.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/OuterDetails.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-drawer :visible.sync="drawerVisible" title="出库单详情" direction="rtl" size="70%">
+  <el-drawer :visible.sync="drawerVisible" :wrapper-closable="false" title="出库单详情" direction="rtl" size="70%">
     <div style="padding: 20px;">
       <el-descriptions :column="2" border>
         <el-descriptions-item label="出库单号">{{ details.outerCode }}</el-descriptions-item>
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue
index 4b2ae40e..b562f358 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="visible" width="80%" append-to-body @close="handleCancel">
+  <el-dialog :title="title" :visible.sync="visible"  :close-on-click-modal="false" width="80%" append-to-body @close="handleCancel">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
       <!-- 基础信息 -->
       <div class="section-title" style="justify-content: center">基础信息</div>
diff --git a/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue b/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue
index dcb8a926..cc5d85e9 100644
--- a/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue
@@ -5,6 +5,7 @@
     direction="rtl"
     size="70%"
     @close="handleClose"
+    :wrapper-closable="false"
     :with-header="true"
   >
     <div class="drawer-container">
@@ -467,4 +468,4 @@ export default {
 .el-drawer__header {
     margin-bottom: 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/oms_web/oms_vue/src/views/project/info/ProjectForm.vue b/oms_web/oms_vue/src/views/project/info/ProjectForm.vue
index e3bb39a0..a9efd0d8 100644
--- a/oms_web/oms_vue/src/views/project/info/ProjectForm.vue
+++ b/oms_web/oms_vue/src/views/project/info/ProjectForm.vue
@@ -371,6 +371,7 @@ import SelectCustomer from "../../system/customer/selectCustomer.vue";
 import SelectPartner from "../../system/partner/selectPartner.vue";
 import SelectUser from "@/views/system/user/selectUser";
 import ProductConfig from "./ProductConfig.vue";
+import {isNaN} from "@riophae/vue-treeselect/src/utils";
 
 export default {
   name: "ProjectForm",
@@ -648,8 +649,26 @@ export default {
 
           if (this.form.productConfig) {
             this.form.softwareProjectProductInfoList = this.form.productConfig.softwareProjectProductInfoList || [];
+            let ts = this.form.softwareProjectProductInfoList.filter(item=> item.productBomCode=='');
+            if (ts.length>0){
+              this.$modal.msgWarning("请完善产品配置信息");
+              return
+
+            }
             this.form.hardwareProjectProductInfoList = this.form.productConfig.hardwareProjectProductInfoList || [];
+            let hp = this.form.hardwareProjectProductInfoList.filter(item=> item.productBomCode=='');
+            if (hp.length>0){
+              this.$modal.msgWarning("请完善产品配置信息");
+              return
+
+            }
             this.form.maintenanceProjectProductInfoList = this.form.productConfig.maintenanceProjectProductInfoList || [];
+            let mp = this.form.maintenanceProjectProductInfoList.filter(item=> item.productBomCode=='');
+            if (mp.length>0){
+              this.$modal.msgWarning("请完善产品配置信息");
+              return
+
+            }
           }
 
           if (this.form.id != null) {
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
index 77fbb06b..8e794da2 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 添加或修改订单管理对话框 -->
-    <el-dialog :title="dialogTitle" :visible.sync="internalVisible" width="1400px" append-to-body @close="handleClose">
+    <el-dialog  :close-on-click-modal="false" :title="dialogTitle" :visible.sync="internalVisible" width="1400px" append-to-body @close="handleClose">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="isOrderApprovedOrInReview">
         <el-tabs v-model="activeTab">
           <el-tab-pane label="基础信息" name="basic">
@@ -465,6 +465,11 @@ export default {
         this.$modal.msgError("折扣不能大于100%");
         return;
       }
+      const checkProduct=(list)=>list.every(item => item.productBomCode!=='')
+      if (!checkProduct(this.form.softwareProjectProductInfoList) || !checkProduct(this.form.hardwareProjectProductInfoList) || !checkProduct(this.form.maintenanceProjectProductInfoList)) {
+        this.$modal.msgError("请完善产品信息");
+        return;
+      }
       this.form.orderStatus = '0';
       this._performSubmit();
     },
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue b/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue
index d7b31f26..b617ce0a 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 订单详情抽屉 -->
-    <el-drawer :title="title" :visible.sync="internalVisible" direction="rtl" size="70%" @close="handleClose">
+    <el-drawer :title="title" :wrapper-closable="false" :visible.sync="internalVisible" direction="rtl" size="70%" @close="handleClose">
       <div style="padding: 20px;">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="true">
           <el-tabs v-model="activeTab">
diff --git a/oms_web/oms_vue/src/views/project/order/index.vue b/oms_web/oms_vue/src/views/project/order/index.vue
index 130eb270..ecff0c7b 100644
--- a/oms_web/oms_vue/src/views/project/order/index.vue
+++ b/oms_web/oms_vue/src/views/project/order/index.vue
@@ -329,7 +329,7 @@ export default {
     /** 查看审批历史 */
     viewApproveLog(row) {
       // this.$router.push({ path: '/project/order/approveLog/' + row.id });
-      this.msgWarning("查看审批历史功能待实现");
+      this.$modal.msgWarning("查看审批历史功能待实现");
     }
   }
 };
diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue
index 505819be..831f3e88 100644
--- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue
+++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="visible" width="80%" append-to-body @close="handleClose">
+  <el-dialog :title="title"   :close-on-click-modal="false" :visible.sync="visible" width="80%" append-to-body @close="handleClose">
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
         <el-form-item label="采购单号" prop="purchaseNo">
diff --git a/oms_web/oms_vue/src/views/purchaseorder/index.vue b/oms_web/oms_vue/src/views/purchaseorder/index.vue
index be002d10..04a62f58 100644
--- a/oms_web/oms_vue/src/views/purchaseorder/index.vue
+++ b/oms_web/oms_vue/src/views/purchaseorder/index.vue
@@ -189,7 +189,7 @@
     />
 
     <!-- 添加或修改采购单主表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80vw" append-to-body >
+    <el-dialog :title="title"  :close-on-click-modal="false" :visible.sync="open" width="80vw" append-to-body >
       <purchase-order-detail ref="purchaseOrderDetail" :order-data="currentOrderData"
                              @close="open = false"
                              @success="getList">
@@ -204,6 +204,7 @@
     <!-- 流程类型选择对话框 -->
     <el-dialog
       title="选择流程类型"
+      :close-on-click-modal="false"
       :visible.sync="openFlowTypeDialog"
       width="30%"
       append-to-body
diff --git a/oms_web/oms_vue/src/views/system/agent/index.vue b/oms_web/oms_vue/src/views/system/agent/index.vue
index 678820ba..2f08f3e7 100644
--- a/oms_web/oms_vue/src/views/system/agent/index.vue
+++ b/oms_web/oms_vue/src/views/system/agent/index.vue
@@ -118,7 +118,7 @@
     />
 
     <!-- 添加或修改办事处信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title"  :close-on-click-modal="false" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
diff --git a/oms_web/oms_vue/src/views/system/agent/selectAgent.vue b/oms_web/oms_vue/src/views/system/agent/selectAgent.vue
index 2ac96f8e..6935a291 100644
--- a/oms_web/oms_vue/src/views/system/agent/selectAgent.vue
+++ b/oms_web/oms_vue/src/views/system/agent/selectAgent.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择代表处" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
+  <el-dialog title="选择代表处" :visible.sync="visible"  :close-on-click-modal="false" width="800px" append-to-body @close="handleClose">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="代表处名称" prop="agentName">
         <el-input
diff --git a/oms_web/oms_vue/src/views/system/customer/index.vue b/oms_web/oms_vue/src/views/system/customer/index.vue
index 655effed..2f0fc107 100644
--- a/oms_web/oms_vue/src/views/system/customer/index.vue
+++ b/oms_web/oms_vue/src/views/system/customer/index.vue
@@ -155,7 +155,7 @@
     />
 
     <!-- 添加或修改客户信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px"  :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
diff --git a/oms_web/oms_vue/src/views/system/customer/selectCustomer.vue b/oms_web/oms_vue/src/views/system/customer/selectCustomer.vue
index 394b476e..82ef7171 100644
--- a/oms_web/oms_vue/src/views/system/customer/selectCustomer.vue
+++ b/oms_web/oms_vue/src/views/system/customer/selectCustomer.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择客户" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
+  <el-dialog title="选择客户"  :close-on-click-modal="false" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="客户名称" prop="customerName">
         <el-input
diff --git a/oms_web/oms_vue/src/views/system/partner/index.vue b/oms_web/oms_vue/src/views/system/partner/index.vue
index d26eb53c..b5ac7847 100644
--- a/oms_web/oms_vue/src/views/system/partner/index.vue
+++ b/oms_web/oms_vue/src/views/system/partner/index.vue
@@ -140,7 +140,7 @@
     />
 
     <!-- 添加或修改代理商管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open"  :close-on-click-modal="false" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
             <el-col :span="12">
diff --git a/oms_web/oms_vue/src/views/system/partner/selectPartner.vue b/oms_web/oms_vue/src/views/system/partner/selectPartner.vue
index 3e9dc91a..a37f7156 100644
--- a/oms_web/oms_vue/src/views/system/partner/selectPartner.vue
+++ b/oms_web/oms_vue/src/views/system/partner/selectPartner.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择进货商" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
+  <el-dialog title="选择进货商"  :close-on-click-modal="false" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="进货商名称" prop="partnerName">
         <el-input
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 6f80cd35..4236fecf 100644
--- a/oms_web/oms_vue/src/views/system/product/index.vue
+++ b/oms_web/oms_vue/src/views/system/product/index.vue
@@ -121,7 +121,7 @@
     />
 
     <!-- 添加或修改产品管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title"  :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
             <el-col :span="12">
diff --git a/oms_web/oms_vue/src/views/system/product/selectProduct.vue b/oms_web/oms_vue/src/views/system/product/selectProduct.vue
index 800ed946..502ef95a 100644
--- a/oms_web/oms_vue/src/views/system/product/selectProduct.vue
+++ b/oms_web/oms_vue/src/views/system/product/selectProduct.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择产品" :visible.sync="visible" width="60%" append-to-body @close="handleClose">
+  <el-dialog title="选择产品"   :close-on-click-modal="false" :visible.sync="visible" width="60%" append-to-body @close="handleClose">
   <div style="max-height: 60vh; overflow-y: auto;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="产品编码" prop="productCode">
diff --git a/oms_web/oms_vue/src/views/warehouse/info/index.vue b/oms_web/oms_vue/src/views/warehouse/info/index.vue
index ece53512..04ac5f0e 100644
--- a/oms_web/oms_vue/src/views/warehouse/info/index.vue
+++ b/oms_web/oms_vue/src/views/warehouse/info/index.vue
@@ -142,7 +142,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -152,7 +152,7 @@
     />
 
     <!-- 添加或修改仓库基础信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title"  :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="仓库名称" prop="warehouseName">
           <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java
index 1c4b884e..9a8756ab 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryInfoController.java
@@ -73,7 +73,7 @@ public class VueInventoryInfoController extends BaseController {
     }
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@RequestBody InventoryInfo inventoryInfo)
+    public TableDataInfo list( InventoryInfo inventoryInfo)
     {
 
         if (!inventoryAuthService.authAll()) {
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 4df26d17..c467ed51 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
@@ -136,6 +136,8 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
         inventoryOuterDetail.setId(inventoryDelivery.getDetailId());
         inventoryOuterDetail.setWarehouseId(inventoryDelivery.getWarehouseId());
         inventoryOuterDetailMapper.updateInventoryOuterDetail(inventoryOuterDetail);
+
+        //todo  限制只能发一次货  防止重复发货
         int i = inventoryDeliveryMapper.insertInventoryDelivery(inventoryDelivery);
         if (CollUtil.isNotEmpty(detailList)){
             for (OmsInventoryDeliveryDetail detail : detailList) {

From 71095c9f3b7eab34ba77d9b9b67502c8f1013fa5 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Fri, 19 Dec 2025 18:39:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(inventory):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=E5=8F=8A?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改采购订单选择逻辑，简化判断条件
- 优化库存导入时SN表格的选择状态控制
- 更新库存内部服务中对特定厂商的判断逻辑
- 引入配置服务支持订单审批金额控制
- 新增延迟加载注解解决循环依赖问题
- 实现领导审批跳过逻辑并兼容历史数据
- 修复流程变量拷贝时的数据类型转换问题
---
 .../outer/components/GenerateDeliveryForm.vue |  3 +-
 .../impl/OmsInventoryInnerServiceImpl.java    |  4 +-
 .../impl/ProjectOrderInfoServiceImpl.java     | 41 +++++++++++++++++--
 3 files changed, 42 insertions(+), 6 deletions(-)

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 49843736..fc3f54e6 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
@@ -182,7 +182,7 @@ export default {
       });
     },
     handleSelectPurchaseBeforeImport() {
-      if (((this.productData.orderType || '1') === '1' ) && !(this.outerData.vendorName.startsWith('新华三') && this.productData.productType==='2')) {
+      if (((this.productData.orderType || '1') === '1' ) && !this.outerData.vendorName.startsWith('新华三') ) {
         this.purchaseOrderSelectVisible = true;
       }else{
         this.handleImport()
@@ -228,6 +228,7 @@ export default {
         this.isImported = true;
         this.$nextTick(() => {
           if (this.$refs.snTable) {
+            this.$refs.snTable.clearSelection();
             this.$refs.snTable.toggleAllSelection();
             this.selectedSnList = this.snList;
           }
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 b7878e4b..e3f1caba 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
@@ -272,7 +272,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
             throw new ServiceException("产品编码对应产品未找到");
         }
         Map<String, OmsWarehouseInfo> warehouseInfoMap=Collections.emptyMap();
-        if ("2".equalsIgnoreCase(orderType) || (("2".equalsIgnoreCase(productInfos.get(0).getType()) && productInfos.get(0).getVendorName().startsWith("新华三"))) ){
+        if ("2".equalsIgnoreCase(orderType) || (productInfos.get(0).getVendorName().startsWith("新华三")) ){
                     List<String> warehouseNameList = inventoryInfoExcelDtoList.stream().map(InventoryInfoExcelDto::getWarehouseName).distinct().collect(Collectors.toList());
         if (warehouseNameList.size() > 1){
             throw new ServiceException("导入清单只能有一个仓库");
@@ -293,7 +293,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
             info.setModel(productInfos.get(0).getModel());
             info.setProductDesc(productInfos.get(0).getDescription());
             info.setInnerPrice(item.getInnerPrice());
-            if ("2".equalsIgnoreCase(orderType)|| (("2".equalsIgnoreCase(productInfos.get(0).getType()) && productInfos.get(0).getVendorName().startsWith("新华三"))) ){
+            if ("2".equalsIgnoreCase(orderType)|| ((productInfos.get(0).getVendorName().startsWith("新华三"))) ){
                 OmsWarehouseInfo omsWarehouseInfo = finalWarehouseInfoMap.get(item.getWarehouseName());
                 info.setWarehouseId(omsWarehouseInfo.getId());
                 info.setWarehouseName(omsWarehouseInfo.getWarehouseName());
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 5f86ddcc..1265ec5f 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -42,6 +42,7 @@ import com.ruoyi.sip.flowable.domain.Todo;
 import com.ruoyi.sip.dto.HomepageQueryDto;
 import com.ruoyi.sip.dto.OrderExcelNumStaticsDto;
 import com.ruoyi.sip.dto.StatisticsDetailDto;
+import com.ruoyi.sip.flowable.service.IBuApproveConfigService;
 import com.ruoyi.sip.mapper.OmsStockInfoMapper;
 import com.ruoyi.sip.mapper.ProjectInfoMapper;
 import com.ruoyi.sip.service.*;
@@ -50,6 +51,7 @@ import com.ruoyi.sip.flowable.service.TodoCommonTemplate;
 import com.ruoyi.sip.flowable.service.TodoService;
 import com.ruoyi.common.utils.mail.TemplateMailUtil;
 import com.ruoyi.sip.vo.OrderInfoVo;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -61,6 +63,7 @@ import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sip.mapper.ProjectOrderInfoMapper;
 import com.ruoyi.common.core.text.Convert;
@@ -131,6 +134,13 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     private Integer endHour;
     @Value("${unis.mail.businessRoleId:103}")
     private String businessRoleId;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    @Lazy
+    private IBuApproveConfigService approveConfigService;
     /**
      * 查询订单管理
      *
@@ -430,12 +440,15 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
 
             String orderFlowKey = ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType()) ?
                     orderOnlineFlowKey : orderOfflineFlowKey;
+            String amountConfig = configService.selectConfigByKey("order.approve.amount.config");
+            BigDecimal amountConfigNumber = new BigDecimal(amountConfig);
             //启动流程
             todoService.startProcess(getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType()), new HashMap<String, Object>() {{
                 put("processTemplate", projectOrderInfo.getProcessTemplate());
                 put("processType", projectOrderInfo.getProcessType());
                 put("applyUserName", ShiroUtils.getSysUser().getUserName());
                 put("applyUser", ShiroUtils.getUserId());
+                put("skipLeader",projectOrderInfo.getShipmentAmount().compareTo(amountConfigNumber)<0);
                 put("partnerUser",partnerInfos.get(0).getSystemUserId());
                 put("extendField1", projectOrderInfo.getVersionCode());
             }}, orderFlowKey);
@@ -1174,7 +1187,26 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
                 handleBusinessApproval(businessKey);
             } else if ("省代".equals(taskName)) {
                 handlePartnerApproval(businessKey);
-            } else if ("公司领导".equals(taskName)) {
+            } else if ("领导1".equals(taskName) && todo.getApplyTime().compareTo(DateUtils.parseDate("2025-12-19"))>0){
+                ProjectOrderInfo orderInfo = selectProjectOrderInfoByOrderCode(businessKey);
+                String amountConfig = configService.selectConfigByKey("order.approve.amount.config");
+                BigDecimal amountConfigNumber = new BigDecimal(amountConfig);
+                if (orderInfo.getShipmentAmount().compareTo(amountConfigNumber)<0){
+                    handleCompanyLeaderApproval(businessKey);
+                    //查询对应的数据  插入已办数据
+                    List<Long> approveUserList = approveConfigService.listByProcessKeyAndTaskName(todo.getProcessKey(), "公司领导");
+                        for (Long l : approveUserList) {
+                            todoService.completed(new HashMap<>(), todo.getTaskId(), businessKey);
+                            todo.setApproveUser(l.toString());
+                            todo.setTaskName("公司领导");
+                            todo.setApproveUserName(userService.selectUserById(l).getUserName());
+                            todo.setApproveOpinion("默认审批");
+                            todo.setNextAllApproveUserName(null);
+                            todo.setAllApproveUserName(null);
+                            todoService.insertTodoCompleted(Arrays.asList(todo));
+                        }
+                }
+            }else if ("公司领导".equals(taskName)) {
 
                 //黄雪秋处理  流程状态更改
                 if (ShiroUtils.getUserId().equals(118L)) {
@@ -1559,8 +1591,11 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
         query.setProcessKeyList(Arrays.asList(orderOnlineFlowKey,orderOfflineFlowKey));
         List<Todo> list = todoService.selectTodoList(query);
         for (Todo todo1 : list) {
-
-            todo1.setVariables(new HashMap<>(todo.getVariables()));
+            Map<String, Object> temp = new HashMap<>();
+            for (Map.Entry<String, Object> entry : todo.getVariables().entrySet()) {
+                temp.put(entry.getKey(), new String(entry.getValue().toString()));
+            }
+            todo1.setVariables(temp);
             approveOrder(todo1);
         }
     }