From 52fa7ba6c0159dc6a61f12a594a56418d3e44e24 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 10:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/record/recordComDetailCard.vue   |   8 +-
 pages.json                                    |  30 +-
 pages/putaway/request/putawayRequest.vue      |   6 +-
 .../putaway/request/putawayRequestCreate.vue  | 428 ++++++++++++++++++
 4 files changed, 458 insertions(+), 14 deletions(-)
 create mode 100644 pages/putaway/request/putawayRequestCreate.vue

diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index 393053e6..0915b950 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -16,7 +16,8 @@
 						<uni-swipe-action-item @click="swipeClick($event,detail,index)"
 							:right-options="detail.scaned?scanOptions:detailOptions">
 							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true"
-								:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="true"></balance>
+								:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation">
+							</balance>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<!-- <u-line /> -->
@@ -78,6 +79,11 @@
 				default: true
 			},
 
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
+
 			isShowItemQty: {
 				type: Boolean,
 				default: true
diff --git a/pages.json b/pages.json
index c058f1f2..b51d902d 100644
--- a/pages.json
+++ b/pages.json
@@ -18,8 +18,8 @@
 				"titleNView": {
 					// "autoBackButton": "true",
 					"buttons": [
-				
-				
+
+
 					]
 				}
 			}
@@ -43,11 +43,11 @@
 				"titleNView": {
 					// "autoBackButton": "true",
 					"buttons": [
-				
-				
+
+
 					]
 				}
-				
+
 			}
 		},
 		{
@@ -158,8 +158,8 @@
 				// }
 			}
 		},
-		
-		
+
+
 		{
 			"path": "pages/purchaseReceipt/job/receiptJob",
 			"style": {
@@ -315,7 +315,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
-
+		{
+			"path": "pages/putaway/request/putawayRequestCreate",
+			"style": {
+				"navigationBarTitleText": "新增原料上架申请",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/productionReceipt/job/productionReceiptJob",
 			"style": {
@@ -1209,7 +1215,7 @@
 			"style": {
 				"navigationBarTitleText": "制品上架申请创建",
 				"enablePullDownRefresh": false
-		
+
 			}
 		},
 
@@ -1666,7 +1672,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		{
 			"path": "pages/container/record/containerBindRecord",
 			"style": {
@@ -1710,8 +1716,8 @@
 				"titleNView": {
 					// "autoBackButton": "true",
 					"buttons": [
-				
-				
+
+
 					]
 				}
 			}
diff --git a/pages/putaway/request/putawayRequest.vue b/pages/putaway/request/putawayRequest.vue
index 37a8a6a1..3e88b1bb 100644
--- a/pages/putaway/request/putawayRequest.vue
+++ b/pages/putaway/request/putawayRequest.vue
@@ -193,8 +193,12 @@
 
 			openScanDetailPopup() {
 				uni.navigateTo({
-					url: "../record/putawayRecord?fromType=" + this.fromType
+					url: "../request/putawayRequestCreate"
 				})
+				
+				// uni.navigateTo({
+				// 	url: "../record/putawayRecord?fromType=" + this.fromType
+				// })
 			},
 
 
diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue
new file mode 100644
index 00000000..bce7f73d
--- /dev/null
+++ b/pages/putaway/request/putawayRequestCreate.vue
@@ -0,0 +1,428 @@
+<template>
+	<view class="page-wraper">
+
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<view class="header_item">
+					供应商代码 : {{supplierCode}}
+				</view>
+				<u-line />
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" :isShowToLocation='false'
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		putawayRequestSubmit,
+		putawayRecordSubmit,
+		validateItemAndLocation,
+		getPutawayRecommendLocation
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getCurrDateTime,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			comMessage,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				supplierCode: '' //供应商代码
+			};
+		},
+		onLoad(option) {
+			this.clear();
+			var typeCode = "PurchasePutaway"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				if (this.supplierCode == '') {
+					this.supplierCode = result.package.supplierCode
+				} else {
+					if (this.supplierCode != result.package.supplierCode) {
+						this.showErrorMessage('请扫描同一供应商【' + this.supplierCode + '】的物品')
+						return;
+					}
+				}
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.poNumber = pack.poNumber;
+					newDetail.poLine = pack.poLine;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.poNumber = pack.poNumber;
+						newDetail.poLine = pack.poLine;
+						// newDetail.toLocationCode = toLocation.code;
+						// newDetail.toWarehouseCode = toLocation.warehouseCode;
+						item.subList.push(newDetail);
+						// this.getRecommendLocation(balance, pack, toLocation => {
+						// 	let newDetail = createDetailInfo(balance, pack);
+						// 	newDetail.toLocationCode = toLocation.code;
+						// 	newDetail.toWarehouseCode = toLocation.warehouseCode;
+						// 	item.subList.push(newDetail);
+						// });
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty += Number(detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				putawayRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成采购上架申请" + res.data, )
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setRequestParams() {
+				let requestContent = {};
+				var creator = this.$store.state.user.id
+				requestContent.creator = creator;
+				requestContent.supplierCode = this.supplierCode;
+				requestContent.fromWarehouseCode = this.fromWarehouseCode;
+				requestContent.toWarehouseCode = this.fromWarehouseCode;
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var subItem = {};
+							Object.assign(subItem, detail)
+							subItem.fromLocationCode = detail.locationCode;
+							subItem.package = null;
+							subList.push(subItem)
+						}
+					})
+				})
+
+				requestContent.subList = subList
+				return requestContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getFromLocation(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.fromWarehouseCode = location.warehouseCode;
+				this.openScanPopup();
+			},
+
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clear();
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			clear() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>