From 404269b400de3b9b3f02223d40cec9f689269f18 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Wed, 4 Jun 2025 17:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InMydoJobController.java       |  2 +-
 ruoyi-ui/src/api/job/inmydoJob.js             | 17 +++++++
 ruoyi-ui/src/views/in/job/index.vue           | 19 ++++++--
 ruoyi-ui/src/views/in/receive/add/index.vue   |  2 +-
 ruoyi-ui/src/views/in/receive/index.vue       | 45 ++++++++++++-------
 5 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
index e1042c6..acc374c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
@@ -127,7 +127,7 @@ public class InMydoJobController extends BaseController
      * 手动完成任务表
      */
     @PreAuthorize("@ss.hasPermi('job:mydoJob:manualCompleted')")
-    @Log(title = "任务表", businessType = BusinessType.DELETE)
+    @Log(title = "任务表", businessType = BusinessType.OTHER)
     @PostMapping("/manualCompleted")
     public AjaxResult manualCompleted(@RequestBody MydoJob mydoJob)
     {
diff --git a/ruoyi-ui/src/api/job/inmydoJob.js b/ruoyi-ui/src/api/job/inmydoJob.js
index d33c2ab..734b412 100644
--- a/ruoyi-ui/src/api/job/inmydoJob.js
+++ b/ruoyi-ui/src/api/job/inmydoJob.js
@@ -42,3 +42,20 @@ export function delMydoJob(jobId) {
     method: 'delete'
   })
 }
+// 新增任务表
+export function manualInvalidation(data) {
+  return request({
+    url: '/job/inmydoJob/manualInvalidation',
+    method: 'post',
+    data: data
+  })
+}
+// 新增任务表
+export function manualCompleted(data) {
+  return request({
+    url: '/job/inmydoJob/manualCompleted',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index ff70309..2783450 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -215,7 +215,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleCompletedManually({type: 'invalid'})"
-          v-hasPermi="['job:mydoJob:CompletedManually']"
+          v-hasPermi="['job:mydoJob:manualInvalidation']"
         >手动作废</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -225,7 +225,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleCompletedManually({type: 'completed'})"
-          v-hasPermi="['job:mydoJob:CompletedManually']"
+          v-hasPermi="['job:mydoJob:manualCompleted']"
         >手动完成</el-button>
       </el-col>
 <!--      <el-col :span="1.5">
@@ -352,7 +352,7 @@
 </template>
 
 <script>
-import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
+import { listMydoJob,manualInvalidation,manualCompleted, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
 
 export default {
@@ -525,10 +525,23 @@ export default {
         this.$modal.msgError("请选择要操作的数据");
         return;
       }
+      if (jobIds.length > 1) {
+        this.$modal.msgError("请选择一条任务");
+        return;
+      }
+      var data = {
+        "jobId":  jobIds[0],
+      }
       if (row.type === 'invalid'){
         //手动作废
+        manualInvalidation(data).then(response => {
+          this.$modal.msgSuccess("操作成功");
+        })
       }else if (row.type === 'completed'){
         //手动完成
+        manualCompleted(data).then(response => {
+          this.$modal.msgSuccess("操作成功");
+        })
       }
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/in/receive/add/index.vue b/ruoyi-ui/src/views/in/receive/add/index.vue
index 437204c..aa7a034 100644
--- a/ruoyi-ui/src/views/in/receive/add/index.vue
+++ b/ruoyi-ui/src/views/in/receive/add/index.vue
@@ -49,7 +49,7 @@
         <span>{{ $t('receiveStockinAdd.InboundMaterials') }}</span>
         <el-row>
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAddProduct" v-hasPermi="['bas:BasProduct:list']">
+            <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAddProduct" v-hasPermi="['receive:stockin:add']">
               {{ $t('receiveStockinAdd.AddMaterials') }}</el-button>
           </el-col>
           <el-col :span="1.5">
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index 2d5ef9e..c521b16 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -271,7 +271,7 @@
           size="mini"
           :detailDisabled="single"
           @click="handleQualityInspection"
-          v-hasPermi="['receive:stockin:edit']"
+          v-hasPermi="['receive:stockInDetail:qualityInspection']"
         >质检
         </el-button>
       </el-col>
@@ -283,7 +283,7 @@
           size="mini"
           :detailDisabled="multiple"
           @click="handleStockinDetailDelete"
-          v-hasPermi="['receive:stockin:remove']"
+          v-hasPermi="['receive:stockInDetail:remove']"
         >删除
         </el-button>
       </el-col>
@@ -303,7 +303,6 @@
       <el-table-column label="计划数量" width="120" align="center">
         <template slot-scope="scope">
           <el-input-number
-            v-dialog-drag-width="100"
             v-model="scope.row.quantity"
             :min="1"
             controls-position="right"
@@ -342,7 +341,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleQualityInspection(scope.row)"
-            v-hasPermi="['receive:stockInDetail:edit']"
+            v-hasPermi="['receive:stockInDetail:qualityInspection']"
           >质检
           </el-button>
           <el-button
@@ -358,11 +357,11 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+      v-show="detailTotal>0"
+      :total="detailTotal"
+      :page.sync="queryDetailParams.pageNum"
+      :limit.sync="queryDetailParams.pageSize"
+      @pagination="getDetailList"
     />
 
   </div>
@@ -399,6 +398,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      detailTotal: 0,
       // 收货单据表格数据
       stockinList: [],
       stockInDetailList: [],
@@ -581,27 +581,38 @@ export default {
     },
     //质检功能
     handleQualityInspection(row) {
-
       const stockinDetailIds = row.stockinDetailId || this.detailIds
+      
+      if (!stockinDetailIds || (Array.isArray(stockinDetailIds) && stockinDetailIds.length === 0)) {
+        this.$modal.msgError("请选择需要质检的记录");
+        return;
+      }
 
       let selectedDetails = [];
       // 如果是点击批量质检按钮，获取所有选中行的数据
       selectedDetails = this.stockInDetailList.filter(item =>
-      stockinDetailIds.includes(item.stockinDetailId)
-        ).map(item => ({
-          stockinDetailId: item.stockinDetailId,
-          quantity: item.quantity,
-          stockinId: item.stockinId
-        }));
+        stockinDetailIds.includes(item.stockinDetailId)
+      ).map(item => ({
+        stockinDetailId: item.stockinDetailId,
+        quantity: item.quantity,
+        stockinId: item.stockinId
+      }));
+
+      if (selectedDetails.length === 0) {
+        this.$modal.msgError("未找到需要质检的记录");
+        return;
+      }
 
       let data = {
         list: selectedDetails,
         stockinId: selectedDetails[0].stockinId
       };
-      //console.log(data);
+      
       qualityInspection(data).then(response => {
         this.getDetailList(data.stockinId)
         this.$modal.msgSuccess("质检成功");
+      }).catch(error => {
+        this.$modal.msgError("质检失败：" + error.message);
       });
     },/**
      * 创建入库单