From 0c7eeda82c0f125058435fec85e499dab5eb6253 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Tue, 6 Dec 2022 19:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/transfer.js          |  8 +++++
 src/views/mes/wm/transfer/index.vue | 48 ++++++++++++++++++++++++++++-
 src/views/mes/wm/transfer/line.vue  | 14 ++++-----
 3 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/src/api/mes/wm/transfer.js b/src/api/mes/wm/transfer.js
index 5c4537a..a21e593 100644
--- a/src/api/mes/wm/transfer.js
+++ b/src/api/mes/wm/transfer.js
@@ -42,3 +42,11 @@ export function delTransfer(transferId) {
     method: 'delete'
   })
 }
+
+//执行转移
+export function execute(transferId){
+  return request({
+    url: '/mes/wm/transfer/'+transferId,
+    method: 'put'
+  })
+}
diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue
index d596ef4..c8a7d27 100644
--- a/src/views/mes/wm/transfer/index.vue
+++ b/src/views/mes/wm/transfer/index.vue
@@ -116,6 +116,30 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-video-play"
+            v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'INNER')"            
+            @click="handleExecute(scope.row)"
+            v-hasPermi="['mes:wm:transfer:edit']"
+          >执行转移</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-video-play"
+            v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'OUTER')"            
+            @click="handleTransOut(scope.row)"
+            v-hasPermi="['mes:wm:transfer:edit']"
+          >执行移出</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-video-play"
+            v-if="(scope.row.status =='CONFIRMED' && scope.row.transferType == 'OUTER')"            
+            @click="handleExecute(scope.row)"
+            v-hasPermi="['mes:wm:transfer:edit']"
+          >执行移入</el-button>
           <el-button
             size="mini"
             type="text"
@@ -262,7 +286,7 @@
 </template>
 
 <script>
-import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer } from "@/api/mes/wm/transfer";
+import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer, execute} from "@/api/mes/wm/transfer";
 import {listWarehouse} from "@/api/mes/wm/warehouse"; 
 import {genCode} from "@/api/system/autocode/rule";
 import Transferline from "./line.vue";
@@ -446,6 +470,18 @@ export default {
         }
       });
     },
+    handleTransOut(row){
+      const transferId = row.transferId
+      getTransfer(transferId).then(response => {
+        this.form = response.data; 
+        this.form.status = 'CONFIRMED';
+        updateTransfer(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const transferIds = row.transferId || this.ids;
@@ -456,6 +492,16 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    //执行转移
+    handleExecute(row){
+      const transferIds = row.transferId || this.ids;
+      this.$modal.confirm('确认执行转移？').then(function() {
+        return execute(transferIds)//执行转移
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("转移成功");
+      }).catch(() => {});
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('wm/transfer/export', {
diff --git a/src/views/mes/wm/transfer/line.vue b/src/views/mes/wm/transfer/line.vue
index 8cd6246..2a2132a 100644
--- a/src/views/mes/wm/transfer/line.vue
+++ b/src/views/mes/wm/transfer/line.vue
@@ -87,43 +87,43 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品物料名称" prop="itemName">
-              <el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
+              <el-input v-model="form.itemName" readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
+              <el-input v-model="form.unitOfMeasure" readonly="readonly" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="规格型号" prop="specification">
-              <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.specification" type="textarea" readonly="readonly" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="批次号" prop="batchCode">
-              <el-input v-model="form.batchCode" placeholder="请输入批次号" />
+              <el-input v-model="form.batchCode" readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="供应商名称" prop="vendorName">
-              <el-input v-model="form.vendorName" placeholder="请输入供应商名称" />
+              <el-input v-model="form.vendorName" readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="生产工单" prop="workorderCode">
-              <el-input v-model="form.workorderCode" placeholder="请输入生产工单编号" />
+              <el-input v-model="form.workorderCode" readonly="readonly" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="移出仓库" prop="fromWarehouse">
-              <el-input v-model="fromWarehouse"/>
+              <el-input v-model="fromWarehouse" readonly="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">