From 4fbdc0d23da4d1ea00fbf301fe5e8ffc887fb295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 15 Nov 2024 10:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/check.vue               |  4 ++--
 pages/management/in-storage_new.vue      |  3 ++-
 pages/management/receive-confirm_new.vue |  2 --
 utils/getData2.js                        | 30 ++++++++----------------
 utils/mork2.js                           | 23 ++++++++++++++++++
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/pages/management/check.vue b/pages/management/check.vue
index 5a6da6a..5d291e5 100644
--- a/pages/management/check.vue
+++ b/pages/management/check.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<nav-bar title="移库"></nav-bar>
+		<nav-bar title="盘点"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-row zd-col-14">
@@ -12,7 +12,7 @@
 				<button class="confirm-button" @tap="toSearch">查询</button>
 			</view>
 		</view>
-		<view class="zd-row jcflexstart table-title_wraper">移库</view>
+		<view class="zd-row jcflexstart table-title_wraper">盘点</view>
 		<view class="grid-wrap">
 			<view class="zdrow-wrap">
 				<view class="zd-row sticky zd-th-wraper">
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index 8afcdba..fb2f5d2 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -507,7 +507,8 @@
 					return
 				}
 				try {
-					let res = await easOutInBillUpdate(this.crType, this.checkData)
+					let str = this.checkData.join(',')
+					let res = await easOutInBillUpdate(this.crType, str)
 					if (res.code === 1) {
 						this.disabled1 = false
 						this.checkData = []
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index 14ea1d6..ad1d85b 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -78,7 +78,6 @@
 										<th>收货数量</th>
 										<th>收货仓库编码</th>
 										<th>收货仓库名称</th>
-										<th>收货库位名称</th>
 										<th>件数</th>
 										<th>更多</th>
 									</tr>
@@ -108,7 +107,6 @@
 											</view>
 										</td>
 										<td>{{el.ckmc}}</td>
-										<td>{{el.kwmc}}</td>
 										<td>{{el.num}}</td>
 										<td @tap.stop="getDetails(4,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
 									</tr>
diff --git a/utils/getData2.js b/utils/getData2.js
index 396ea5c..b5c0762 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -45,10 +45,10 @@ export const easOutInBillDetailPage = (djid, page, size) => request({
 	}
 })
 // 3.审核出入库单据
-export const easOutInBillUpdate = (type, arr) => request({
+export const easOutInBillUpdate = (type, djid) => request({
 	url:'api/easOutInBill/audit',
 	type: type,
-	data: arr
+	data: {type: type, djid: djid}
 })
 // 4.查询出单据明细库位
 export const queryInventoryInfo = (arr) => request({
@@ -107,7 +107,7 @@ export const updateAssignDtl = (arr) => request({
 })
 // 分配库位查看详情
 export const inWarehouseAssignLocation = (arr, type) => request({
-	url:'api/easOutInBillDetail/inWarehouseAssignLocation',
+	url:'api/stIvtStockAssignDtl/warehouseAssignLocation',
 	data: {details: arr, type: type}
 })
 // 分配库位查看详情确认
@@ -117,7 +117,7 @@ export const addAssignDtl = (arr) => request({
 })
 // 库存提交
 export const inWarehouseCommit = (arr, type) => request({
-	url:'api/easOutInBillDetail/inWarehouseCommit',
+	url:'api/easOutInBillDetail/warehouseCommit',
 	data: {details: arr, type: type}
 })
 
@@ -256,17 +256,12 @@ export const receiptBillDetailSetStor = (ckbm, details) => request({
  */
 // 移库-主表格
 export const stIvtMoveinvMovePage = (fuzzy, ckbm, page, size) => request({
-	url:'api/stIvtMoveinv/movePage',
-	data: {
-		fuzzy: fuzzy,
-		ckbm: ckbm,
-		page: page,
-		size: size
-	}
+	url:'api/stIvtMoveinv/movePage?fuzzy=' + fuzzy + '&ckbm=' + ckbm + '&page=' + page + '&size=' + size,
+	method: 'GET'
 })
 // 移库-副表格
 export const moveDtlByMoveId = (id) => request({
-	url:'api/stIvtMoveinvdtl/moveDtlByMoveId/' + id,
+	url:'api/stIvtMoveinvdtl/moveDtlByMoveId?id=' + id,
 	method: 'GET'
 })
 // 移库-修改数量和移出库位
@@ -285,17 +280,12 @@ export const stIvtMoveinvConfirmMove = (arr) => request({
  */
 // 盘点-主表格
 export const stIvtCheckdtlCheckPage = (fuzzy, ckbm, page, size) => request({
-	url:'api/stIvtCheckdtl/checkPage',
-	data: {
-		fuzzy: fuzzy,
-		ckbm: ckbm,
-		page: page,
-		size: size
-	}
+	url:'api/stIvtCheckdtl/checkPage?fuzzy=' + fuzzy + '&ckbm=' + ckbm + '&page=' + page + '&size=' + size,
+	method: 'GET'
 })
 // 盘点-副表格
 export const checkDtlByCheckCode = (id) => request({
-	url:'api/stIvtCheckdtl/checkDtlByCheckCode/' + id,
+	url:'api/stIvtCheckdtl/checkDtlByCheckCode?check_code=' + id,
 	method: 'GET'
 })
 // 盘点-修改盘点数量
diff --git a/utils/mork2.js b/utils/mork2.js
index 0376f50..e7027d1 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -2351,4 +2351,27 @@ export const allocationBillDetail = () => {
 	    "desc": "查询成功"
 	}
 		return res
+}
+export const stIvtCheckdtlCheckPage = () => {
+	let res = {
+	    "pageNum": 1,
+	    "pageSize": 10,
+	    "totalPage": 109,
+	    "totalElements": 1084,
+	    "result": [
+	        {
+	            "id": "0201",
+	            "material_code": "btAAAAW8Wd5QCrde",
+				"qty": "1"
+	        },
+	        {
+	            "id": "0202",
+	            "material_code": "btAAAAW8WdpQCrde",
+				"qty": "1"
+	        }
+	    ],
+	    "code": 1,
+	    "desc": "查询成功"
+	}
+		return res
 }
\ No newline at end of file