From 9ca05cd5eb3d54ba740b8e7a9fe46aa6acb4d71c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 19 Jun 2025 09:16:22 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=97=AE=E9=A2=98160=EF=BC=9A?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=86=85=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98=E5=88=97=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8F=AF=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E4=BF=9D=E5=AD=98=E3=80=82=E6=9D=83=E9=99=90=E4=B8=BA?=
 =?UTF-8?q?=E5=BA=93=E7=AE=A1=E5=91=98=E6=9D=83=E9=99=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MesBaseMaterialInfoController.java        | 14 +++
 .../service/IMesBaseMaterialInfoService.java  |  8 ++
 .../impl/MesBaseMaterialInfoServiceImpl.java  | 17 ++++
 hw-ui/src/api/mes/materialinfo.js             |  9 ++
 hw-ui/src/views/mes/materialinfo/index.vue    | 96 ++++++++++++++++++-
 5 files changed, 140 insertions(+), 4 deletions(-)

diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java
index c8a5f42c..39fa8de3 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java
@@ -184,4 +184,18 @@ public class MesBaseMaterialInfoController extends BaseController
         return toAjax(mesBaseMaterialInfoService.stockAlarm());
     }
 
+    /**
+     * 批量更新物料安全库存数量
+     * @param mesBaseMaterialInfoList
+     * @return
+     */
+    @RequiresPermissions("mes:materialinfo:batchEdit")
+    @Log(title = "物料信息", businessType = BusinessType.UPDATE)
+    @PostMapping("batchUpdateSafeStock")
+    public AjaxResult batchUpdateSafeStock(@RequestBody List<MesBaseMaterialInfo> mesBaseMaterialInfoList)
+    {
+        return toAjax(mesBaseMaterialInfoService.batchUpdateSafeStock(mesBaseMaterialInfoList));
+    }
+
+
 }
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseMaterialInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseMaterialInfoService.java
index 0e36af7a..119e8c72 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseMaterialInfoService.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseMaterialInfoService.java
@@ -93,4 +93,12 @@ public interface IMesBaseMaterialInfoService
      * 库存告警计算
      */
     public int stockAlarm();
+
+    /**
+     * 批量更新物料安全库存数量
+     * @param mesBaseMaterialInfoList
+     * @return
+     */
+    public int batchUpdateSafeStock(List<MesBaseMaterialInfo> mesBaseMaterialInfoList);
+
 }
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java
index 1fe18622..2bfd46df 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java
@@ -284,4 +284,21 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi
         }
 
     }
+
+    /**
+     * 批量更新物料安全库存数量
+     * @param mesBaseMaterialInfoList
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int batchUpdateSafeStock(List<MesBaseMaterialInfo> mesBaseMaterialInfoList) {
+        for (MesBaseMaterialInfo mesBaseMaterialInfo : mesBaseMaterialInfoList) {
+            mesBaseMaterialInfo.setUpdateTime(DateUtils.getNowDate());
+            mesBaseMaterialInfo.setUpdateBy(SecurityUtils.getLoginUser() == null ?
+                    SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getNickname());
+            mesBaseMaterialInfoMapper.updateMesBaseMaterialInfo(mesBaseMaterialInfo);
+        }
+        return 1;
+    }
 }
diff --git a/hw-ui/src/api/mes/materialinfo.js b/hw-ui/src/api/mes/materialinfo.js
index bf0b3337..9d5f51d5 100644
--- a/hw-ui/src/api/mes/materialinfo.js
+++ b/hw-ui/src/api/mes/materialinfo.js
@@ -52,3 +52,12 @@ export function getMaterialTypes(query) {
     params: query
   })
 }
+
+// 批量更新安全库存
+export function batchUpdateSafeStock(data) {
+  return request({
+    url: '/mes/materialinfo/batchUpdateSafeStock',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/hw-ui/src/views/mes/materialinfo/index.vue b/hw-ui/src/views/mes/materialinfo/index.vue
index 298c0a1e..43e70bea 100644
--- a/hw-ui/src/views/mes/materialinfo/index.vue
+++ b/hw-ui/src/views/mes/materialinfo/index.vue
@@ -182,6 +182,17 @@
         >同步
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-check"
+          size="mini"
+          @click="handleBatchSave"
+          v-hasPermi="['mes:materialinfo:batchEdit']"
+        >批量保存
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -229,7 +240,19 @@
         </template>
       </el-table-column>
       <el-table-column label="批次数量" align="center" prop="batchAmount"/>
-      <el-table-column label="安全库存数量" align="center" prop="safeStockAmount"/>
+      <el-table-column label="安全库存数量" align="center" prop="safeStockAmount" width="120" v-if="checkPermi(['mes:materialinfo:batchEdit'])">
+        <template slot-scope="scope">
+          <el-input-number
+            v-model="scope.row.safeStockAmount"
+            :min="0"
+            :max="999999999"
+            size="mini"
+            style="width: 110px"
+            @change="handleSafeStockChange(scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="安全库存数量" align="center" prop="safeStockAmount" width="120" v-if="!checkPermi(['mes:materialinfo:batchEdit'])"/>
       <el-table-column label="库存数量" align="center" prop="availableAmount" >
         <template slot-scope="scope">
           <span :style="setCellClassName(scope.row)">
@@ -446,12 +469,14 @@ import {
   delMaterialinfo,
   addMaterialinfo,
   updateMaterialinfo,
-  getMaterialTypes
+  getMaterialTypes,
+  batchUpdateSafeStock
 } from "@/api/mes/materialinfo";
 import {listBaseMaterialType} from "@//api/mes/baseMaterialType";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {runJob} from "@/api/monitor/job";
+import { checkPermi } from "@/utils/permission";
 
 export default {
   name: "Materialinfo",
@@ -533,11 +558,14 @@ export default {
       MATERIAL_CLASSFICATION:{
         ERP:'1',
         VIRTUAL:'2'
-      }
+      },
+      // 跟踪已修改的安全库存数据
+      modifiedSafeStockData: []
     };
   },
   created() {
     this.getList();
+    this.checkEditPermission();
   },
   methods: {
     /** 查询物料信息列表 */
@@ -715,8 +743,68 @@ export default {
         return 'color: #f56c6c';
       }
       return '';
-    }
+    },
+
+    handleSafeStockChange(row) {
+      // 记录修改的安全库存数据
+      const existingIndex = this.modifiedSafeStockData.findIndex(item => item.materialId === row.materialId);
+      if (existingIndex > -1) {
+        this.modifiedSafeStockData[existingIndex] = {
+          materialId: row.materialId,
+          safeStockAmount: row.safeStockAmount
+        };
+      } else {
+        this.modifiedSafeStockData.push({
+          materialId: row.materialId,
+          safeStockAmount: row.safeStockAmount
+        });
+      }
+    },
+
+    /** 批量保存安全库存 */
+    handleBatchSave() {
+      if (this.modifiedSafeStockData.length === 0) {
+        this.$modal.msgWarning("没有需要保存的修改");
+        return;
+      }
+
+      this.$modal.confirm('确认要保存修改的安全库存数量吗？').then(() => {
+        this.loading = true;
+        batchUpdateSafeStock(this.modifiedSafeStockData).then(response => {
+          this.$modal.msgSuccess("批量保存成功");
+          this.modifiedSafeStockData = []; // 清空修改记录
+          this.getList(); // 刷新列表
+        }).catch(() => {
+          this.loading = false;
+        });
+      }).catch(() => {});
+    },
+    checkPermi,
 
   }
 };
 </script>
+
+<style scoped>
+/* 只读状态的输入框样式 */
+.el-input-number.is-disabled {
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  color: #606266;
+}
+
+/* 只读状态的输入框内部样式 */
+.el-input-number.is-disabled .el-input__inner {
+  background-color: #f5f7fa;
+  color: #606266;
+  cursor: not-allowed;
+}
+
+/* 只读状态的增减按钮样式 */
+.el-input-number.is-disabled .el-input-number__decrease,
+.el-input-number.is-disabled .el-input-number__increase {
+  background-color: #f5f7fa;
+  color: #c0c4cc;
+  cursor: not-allowed;
+}
+</style>