From 435cb64d6986aadb1a835453ddb3c3b823327d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sat, 6 May 2023 16:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B4=A8=E6=91=86=E6=94=BE=E6=8C=89?=
 =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/invPlace.js                 | 16 +++++++
 src/views/inventory/InvOrderPlaceModify.vue   | 44 ++++++++++++-------
 src/views/inventory/InvProductPlaceModify.vue |  1 -
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/api/inventory/invPlace.js b/src/api/inventory/invPlace.js
index 668f65e3..b53863bd 100644
--- a/src/api/inventory/invPlace.js
+++ b/src/api/inventory/invPlace.js
@@ -16,6 +16,14 @@ export function bindInvSpace(data) {
   });
 }
 
+export function bindInvOrderSpace(data) {
+  return axios({
+    url: "/spms/inv/product/bindInvOrderSpace",
+    method: "post",
+    data: data
+  });
+}
+
 export function checkCodeSpace(data) {
   return axios({
     url: "/spms/inv/product/checkCodeSpace",
@@ -32,6 +40,14 @@ export function getInvProductInfo(params) {
   });
 }
 
+export function getInvProductOrderInfo(params) {
+  return axios({
+    url: "/spms/inv/product/getInvProductOrderInfo",
+    method: "get",
+    params: params
+  });
+}
+
 export function getInvPlaceOrderList(params) {
   return axios({
     url: "/spms/inv/product/getInvPlaceOrderList",
diff --git a/src/views/inventory/InvOrderPlaceModify.vue b/src/views/inventory/InvOrderPlaceModify.vue
index 3425dd07..905630f8 100644
--- a/src/views/inventory/InvOrderPlaceModify.vue
+++ b/src/views/inventory/InvOrderPlaceModify.vue
@@ -2,7 +2,7 @@
   <div>
     <el-form :model="formData" label-width="100px">
       <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
-        <el-button size="mini" type="primary" @click.native="selectOrder()">选入单据</el-button>
+<!--        <el-button size="mini" type="primary" @click.native="selectOrder()">选入单据</el-button>-->
         <el-button size="mini" type="primary" @click.native="saveData()">提交</el-button>
         <el-button size="mini" type="primary" @click.native="closePlaceDialog(2)">关闭</el-button>
       </el-button-group>
@@ -27,7 +27,7 @@
         </el-col>
 
         <el-col :span="10">
-          <el-form-item class="query-form-item" label="当前货位:">
+          <el-form-item class="query-form-item" label="上架货位:">
             <el-autocomplete
               v-model="formData.invSpaceName"
               :fetch-suggestions="querySearchAsync"
@@ -79,8 +79,7 @@
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
         <el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
-        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150"
-                         show-tooltip-when-overflow></el-table-column>
+        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="150"></el-table-column>
       </el-table>
@@ -110,7 +109,13 @@
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
 import {isBlank} from "@/utils/strUtil";
-import {bindInvSpace, getInvProductInfo} from "@/api/inventory/invPlace";
+import {
+  bindInvOrderSpace,
+  bindInvSpace,
+  getInvPlaceOrderDetailList,
+  getInvProductInfo,
+  getInvProductOrderInfo
+} from "@/api/inventory/invPlace";
 import invPlaceSelectOrder from "@/views/inventory/InvPlaceSelectOrder.vue";
 
 export default {
@@ -130,6 +135,7 @@ export default {
         orderId: null,
       },
       list: [],
+      orderId: null,
       codeArray: [],
       invList: [],
       spaceList: [],
@@ -168,11 +174,10 @@ export default {
         let params = {
           invCode: this.formData.invCode,
           invSpaceCode: this.formData.invSpaceCode,
-          orderId: this.currentOrderId,
-          type: 2, //按单上架
-          codeArray: this.codeArray
+          orderId: this.orderId,
+          oid: this.formData.orderId
         };
-        bindInvSpace(params).then((res) => {
+        bindInvOrderSpace(params).then((res) => {
           if (res.code === 20000) {
             this.$message.success("上架成功");
             this.clearFormData();
@@ -265,7 +270,10 @@ export default {
         this.$message.error('当前仓库不能为空');
         return;
       }
-
+      if (isBlank(this.formData.invSpaceCode)) {
+        this.$message.error('上架货位不能为空');
+        return;
+      }
       if (isBlank(this.formData.orderId)){
         this.$message.error('请输入查询单号');
         return;
@@ -279,16 +287,20 @@ export default {
       this.list = [];
       this.currentOrderId = orderId;
       let params = {
+        orderId: this.orderId,
         invCode: this.formData.invCode,
-        orderId: this.currentOrderId
+        invSpaceCode: this.formData.invSpaceCode,
+        oId: this.currentOrderId
       };
-      getInvProductInfo(params).then((res) => {
-        if (res.data !== null) {
-          res.data.forEach((item) => {
-            this.list.push(item);
+      getInvProductOrderInfo(params).then((res) => {
+        debugger
+        if (res.code == 20000) {
+          this.orderId=res.data;
+          getInvPlaceOrderDetailList({orderId:this.orderId}).then((res) => {
+            this.list=res.data.list;
           });
         } else {
-          this.$message.warning("未查询到产品信息");
+          this.$message.warning(res.message);
         }
       })
     },
diff --git a/src/views/inventory/InvProductPlaceModify.vue b/src/views/inventory/InvProductPlaceModify.vue
index b2a94ed6..063ea580 100644
--- a/src/views/inventory/InvProductPlaceModify.vue
+++ b/src/views/inventory/InvProductPlaceModify.vue
@@ -252,7 +252,6 @@ export default {
       };
       getInvProductInfo(params).then((res) => {
         if (res.code == 20000) {
-          debugger
           this.orderId=res.data;
           getInvPlaceOrderDetailList({orderId:this.orderId}).then((res) => {
             this.list=res.data.list;