From a82f94642966062aff8f070dbec07c3a77c32bc0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Thu, 27 Oct 2022 23:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/stockSelect/single.vue   |  6 ++-
 src/views/mes/wm/issue/index.vue        |  3 ++
 src/views/mes/wm/productrecpt/index.vue | 60 ++++++-------------------
 src/views/mes/wm/productrecpt/line.vue  | 14 +++++-
 src/views/mes/wm/rtissue/index.vue      |  3 ++
 5 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/src/components/stockSelect/single.vue b/src/components/stockSelect/single.vue
index 964cdb6..94add94 100644
--- a/src/components/stockSelect/single.vue
+++ b/src/components/stockSelect/single.vue
@@ -192,8 +192,8 @@ export default {
         pageSize: 10,
         itemTypeId: null,
         itemTypeName: null,
-        itemId: null,
-        itemCode: null,
+        itemId: this.itemId,
+        itemCode: this.itemCode,
         itemName: null,
         specification: null,
         unitOfMeasure: null,
@@ -232,6 +232,8 @@ export default {
     areaId: null,
     areaCode: null,
     workorderId: null,
+    itemId: null,
+    itemCode: null
   },
   created() {
     this.getList();
diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index 642380f..6f93f0f 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -335,6 +335,9 @@ export default {
         ],
         issueDate: [
           { required: true, message: "请指定领出日期", trigger: "blur" }
+        ],
+        workorderCode: [
+        { required: true, message: "请指定生产工单", trigger: "blur" }
         ]
       }
     };
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index 48d7d01..ad3a0ee 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -90,9 +90,8 @@
       <el-table-column label="入库单编号" width="130px" align="center" prop="recptCode" />
       <el-table-column label="入库单名称" width="150px" align="center" prop="recptName" :show-overflow-tooltip="true"/>
       <el-table-column label="生产工单编码" width="150px" align="center" prop="workorderCode" />
-      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
-      <el-table-column label="库区名称" align="center" prop="locationName" />
-      <el-table-column label="库位名称" align="center" prop="areaName" />
+      <el-table-column label="产品编码" align="center" prop="itemCode" />
+      <el-table-column label="产品名称" align="center" prop="itemName" />
       <el-table-column label="入库日期" align="center" prop="recptDate" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span>
@@ -167,8 +166,8 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="生产工单编号" prop="workorderCode">
-              <el-input v-model="form.workorderCode" placeholder="请输入生产工单编号" >
+            <el-form-item label="生产工单" prop="workorderCode">
+              <el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
                 <el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
               </el-input>
               <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
@@ -179,45 +178,6 @@
               <el-input v-model="form.workorderName" readonly="readonly" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="入库仓库">
-              <el-cascader v-model="warehouseInfo"
-                :options="warehouseOptions"
-                :props="warehouseProps"
-                @change="handleWarehouseChanged"
-              >                  
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="产品编码" prop="itemCode">
-              <el-input v-model="form.itemCode" readonly="readonly"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="产品名称" prop="itemName">
-              <el-input v-model="form.itemCode" readonly="readonly"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" readonly="readonly"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="客户编号" prop="clientCode">
-              <el-input v-model="form.clientCode" readonly="readonly"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户名称" prop="clientName">
-              <el-input v-model="form.clientName" readonly="readonly"/>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="入库日期" prop="recptDate">
               <el-date-picker clearable
@@ -228,7 +188,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row>       
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -239,7 +199,7 @@
       </el-form>
       <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider> 
       <el-card shadow="always" v-if="form.recptId !=null" class="box-card">
-        <Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId"></Productrecptline>
+        <Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId" :itemId="form.itemId"></Productrecptline>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
@@ -378,6 +338,12 @@ export default {
         locationId: null,
         locationCode: null,
         locationName: null,
+        itemId: null,
+        itemCode: null,
+        itemName: null,
+        unitOfMeasure: null,
+        clientCode: null,
+        clientName: null,
         areaId: null,
         areaCode: null,
         areaName: null,
@@ -470,9 +436,11 @@ export default {
     },
     onWorkorderSelected(row){
       if(row != undefined && row != null){
+        debugger;
         this.form.workorderId = row.workorderId;
         this.form.workorderCode = row.workorderCode;
         this.form.workorderName = row.workorderName;
+        this.form.itemId = row.productId;
         this.form.itemCode = row.productCode;
         this.form.itemName = row.productName;
         this.form.unitOfMeasure = row.unitOfMeasure;
diff --git a/src/views/mes/wm/productrecpt/line.vue b/src/views/mes/wm/productrecpt/line.vue
index 516f9ac..362b6b7 100644
--- a/src/views/mes/wm/productrecpt/line.vue
+++ b/src/views/mes/wm/productrecpt/line.vue
@@ -88,7 +88,7 @@
               <el-input v-model="form.itemCode" placeholder="请输入产品物料编码" >
                 <el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
               </el-input>
-              <StockSelect ref="stockSelect" :workorderId="workorderId" :warehouseCode="XBK_VIRTUAL" @onSelected="onStockSelected"></StockSelect>
+              <StockSelect ref="stockSelect" :workorderId="workorderId" :itemId="itemId" warehouseCode="XBK_VIRTUAL" @onSelected="onStockSelected"></StockSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -150,6 +150,7 @@
 <script>
 import { listProductrecptline, getProductrecptline, delProductrecptline, addProductrecptline, updateProductrecptline } from "@/api/mes/wm/productrecptline";
 import StockSelect from "@/components/stockSelect/single.vue"
+import {getTreeList} from "@/api/mes/wm/warehouse"
 export default {
   name: "Productrecptline",
   components:{
@@ -158,7 +159,8 @@ export default {
   props: {
     recptId: null,
     optType: null,
-    workorderId:null
+    workorderId:null,
+    itemId: null
   },
   data() {
     return {
@@ -379,6 +381,14 @@ export default {
           this.form.quantityMax = obj.quantityOnhand;
         }
     },
+    //选择默认的仓库、库区、库位
+    handleWarehouseChanged(obj){      
+      if(obj !=null){
+        this.form.warehouseId = obj[0];
+        this.form.locationId = obj[1];
+        this.form.areaId = obj[2];
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue
index 95910ee..d005315 100644
--- a/src/views/mes/wm/rtissue/index.vue
+++ b/src/views/mes/wm/rtissue/index.vue
@@ -274,6 +274,9 @@ export default {
         rtCode: [
           { required: true, message: "退料单编号不能为空", trigger: "blur" }
         ],
+        workorderCode: [
+          { required: true, message: "请选择要退料的生产工单", trigger: "blur" }
+        ]
       }
     };
   },