出库部分

ruoyi-ui/src/api/job/OutmydoJob.js

@@ -9,3 +9,21 @@ export function listMydoJobOut(query) {
     params: query
   })
 }
+
+// 手动完成任务
+export function handFinish(jobIds) {
+  return request({
+    url: '/job/outmydoJob/OuthandFinish',
+    method: 'get',
+    params: { jobIds: jobIds }
+  })
+}
+
+// 手动作废任务
+export function hangInvalidJob(jobIds) {
+  return request({
+    url: '/job/outmydoJob/OuthandInvalidation',
+    method: 'get',
+    params: { jobIds: jobIds }
+  })
+}

ruoyi-ui/src/api/out/outStockout.js

@@ -18,13 +18,7 @@ export function getOutStockoutDetail(query) {
   }
 
 
-  // 获取仓库列表
-export function getWarehouseList() {
-  return request({
-    url: '/bas/warehouse/list',
-    method: 'get'
-  })
-}
+
 
   // 查询可出库的库存物资信息列表
   export function listProductAndStock(query) {

ruoyi-ui/src/views/job/outJobManagement.vue

@@ -19,16 +19,7 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="上线类型" prop="onLineType">
-        <el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
-          <el-option
-            v-for="dict in dict.type.on_line_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
+
       <el-form-item label="任务号" prop="taskNo">
         <el-input
           v-model="queryParams.taskNo"
@@ -53,14 +44,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门ID" prop="departmentId">
-        <el-input
-          v-model="queryParams.departmentId"
-          placeholder="请输入部门ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
+
+      -->
       <el-form-item label="托盘条码" prop="trayCode">
         <el-input
           v-model="queryParams.trayCode"
@@ -85,46 +70,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-<!--      <el-form-item label="目标巷道ID" prop="targetRoadwayId">
-        <el-input
-          v-model="queryParams.targetRoadwayId"
-          placeholder="请输入目标巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="目标货位" prop="targetCargoSpaceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.targetCargoSpaceId"-->
-<!--          placeholder="请输入目标货位ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产线ID" prop="lineId">
-        <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入产线ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车间ID" prop="workshopId">
-        <el-input
-          v-model="queryParams.workshopId"
-          placeholder="请输入车间ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优先级" prop="priority">
-        <el-input
-          v-model="queryParams.priority"
-          placeholder="请输入优先级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
 <!--      <el-form-item label="执行阶段" prop="executionPhase">-->
 <!--        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
 <!--          <el-option-->
@@ -138,7 +83,7 @@
       <el-form-item label="作业类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
           <el-option
-            v-for="dict in dict.type.in_job_type"
+            v-for="dict in dict.type.out_job_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -177,21 +122,20 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="班组ID" prop="classId">
-        <el-input
-          v-model="queryParams.classId"
-          placeholder="请输入班组ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="仓库" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库ID"
-          clearable
 
-        />
+      <el-form-item label="仓库" prop="warehouseId">
+        <el-select
+          v-model="queryParams.warehouseId"
+          placeholder="请选择仓库"
+          clearable
+        >
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
       </el-form-item>
 <!--      <el-form-item label="重分标记" prop="faultFlag">
         <el-input
@@ -331,8 +275,9 @@
 </template>
 
 <script>
-import { listMydoJobOut } from "@/api/job/OutmydoJob"
+import { listMydoJobOut,handFinish,hangInvalidJob } from "@/api/job/OutmydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "MydoJob",
@@ -353,6 +298,8 @@ export default {
       // 总条数
       total: 0,
       detailTotal: 0,
+      // 仓库选项
+      warehouseOptions: [],
       // 任务表表格数据
       mydoJobList: [],
       // 子任务表表格数据
@@ -416,8 +363,16 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseOptions();
   },
   methods: {
+    /** 获取仓库选项 */
+    getWarehouseOptions() {
+
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+      });
+    },
     /** 查询任务表列表 */
     getList() {
       this.loading = true
@@ -495,7 +450,7 @@ export default {
       this.currentRow = row;
       // 更新子表格查询参数
       this.queryDetailParams.jobId = row.jobId;
-      // 查询子表格数据
+      this.queryDetailParams.status=row.status      // 查询子表格数据
       this.getDetailList();
     },
     /** 查询子任务表列表 */
@@ -515,12 +470,30 @@ export default {
       });
     },
     //手动完成
-    OuthandFinish(row){
-      const stockinDetailIds = row.stockinDetailId || this.detailIds
+    OuthandFinish() {
+      if (this.ids.length === 0) {
+        this.$modal.msgError("请选择需要手动完成的任务");
+        return;
+      }
+      this.$modal.confirm('是否确认手动完成选中的任务？').then(() => {
+        return handFinish(this.ids.join(','));
+      }).then(() => {
+        this.$modal.msgSuccess("手动完成成功");
+        this.getList();
+      }).catch(() => {});
     },
-  //手动作废
-    OuthandInvalidation(row){
-
+    //手动作废
+    OuthandInvalidation() {
+      if (this.ids.length === 0) {
+        this.$modal.msgError("请选择需要手动作废的任务");
+        return;
+      }
+      this.$modal.confirm('是否确认手动作废选中的任务？').then(() => {
+        return hangInvalidJob(this.ids.join(','));
+      }).then(() => {
+        this.$modal.msgSuccess("手动作废成功");
+        this.getList();
+      }).catch(() => {});
     }
   }
 }

ruoyi-ui/src/views/out/addOutStockout.vue

@@ -116,8 +116,8 @@
 </template>
 
 <script>
-import { getWarehouseList,listProductAndStock,saveOutStock } from "@/api/out/outStockout";
-
+import { listProductAndStock,saveOutStock } from "@/api/out/outStockout";
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "AddOutStock",
@@ -175,20 +175,9 @@ export default {
     /** 获取仓库选项 */
     getWarehouseOptions() {
 
-        this.warehouseOptions = [
-          {
-            warehouseName: "仓库1",
-            warehouseId: "1"
-          },
-          {
-            warehouseName: "仓库2",
-            warehouseId: "2"
-          }
-        ];
-
-      // getWarehouseList().then(response => {
-      //   this.warehouseOptions = response.data;
-      // });
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+      });
     },
     /** 打开选择物资弹窗 */
     handleSelectMaterials() {