出库回流功能

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

@@ -35,13 +35,14 @@ export function hangInvalidCheckJob(data) {
   })
 }
 
-export function pointOut(stockIds,exitId) {
+export function pointOut(stockIds,exitId,type) {
   return request({
     url: '/job/outmydoJob/pointOut',
     method: 'get',
     params: {
       stockIds: stockIds.join(',') ,// 将数组转换为逗号分隔的字符串
-      exitId:exitId
+      exitId:exitId,
+      type:type
     }
   })
 }

ruoyi-ui/src/views/stock/pointOut.vue

@@ -91,6 +91,16 @@
           v-hasPermi="['job:outmydoJob:pointOut']"
         >指定货位出库 <!-- 指定货位出库 --></el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="pointOut1"
+          v-hasPermi="['job:outmydoJob:pointOut']"
+        >出来看看 <!-- 指定货位出库 --></el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -298,7 +308,9 @@ export default {
       ],
 
       // 选中的库存数据
-      selectedStockData: []
+      selectedStockData: [],
+      // 当前操作类型 1:指定货位出库 2:出来看看
+      currentOperationType: '1'
     }
   },
   created() {
@@ -421,6 +433,15 @@ export default {
     },
     /** 指定货位出库按钮操作 */
     pointOut() {
+      this.handlePointOutOperation('1');
+    },
+    /** 出来看看按钮操作 */
+    pointOut1() {
+      this.handlePointOutOperation('2');
+    },
+
+    handlePointOutOperation(type) {
+      this.currentOperationType = type;
       if (this.ids.length === 0) {
         this.$modal.msgError("请至少选择一行数据");
         return;
@@ -435,7 +456,7 @@ export default {
       if (all02) {
         this.exitDialogVisible = false
         this.exitForm.exitId = '1'
-        this.doPointOut('1')
+        this.doPointOut('1', type)
         return
       }
       this.exitDialogVisible = true
@@ -447,13 +468,13 @@ export default {
     submitPointOut() {
       this.$refs["exitForm"].validate(valid => {
         if (valid) {
-          this.doPointOut(this.exitForm.exitId)
+          this.doPointOut(this.exitForm.exitId, this.currentOperationType)
         }
       })
     },
-    doPointOut(exitId) {
+    doPointOut(exitId, type) {
       const stockIds = this.ids
-      pointOut(stockIds, exitId).then(response => {
+      pointOut(stockIds, exitId, type).then(response => {
         this.$modal.msgSuccess(response.msg);
         this.getList();
         this.exitDialogVisible = false;