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 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99?=
 =?UTF-8?q?=E4=B8=8A=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>

From 20f4737a95de6cc04ac08d8ae21a92eaba42fbb3 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 11:07:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=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    | 3 ++-
 pages/putaway/request/putawayRequestCreate.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index 0915b950..9c88cd25 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -168,7 +168,8 @@
 			},
 
 			confirm(qty) {
-				this.editItem.qty = qty;
+				// this.editItem.qty = qty;
+				this.editItem.handlQty = qty;
 				this.$emit('updateData')
 			}
 		}
diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue
index bce7f73d..5cf7c2e1 100644
--- a/pages/putaway/request/putawayRequestCreate.vue
+++ b/pages/putaway/request/putawayRequestCreate.vue
@@ -286,7 +286,7 @@
 				putawayRequestSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成采购上架申请" + res.data, )
+						this.showCommitSuccessMessage("提交成功<br>生成采购上架申请<br>" + res.data, )
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}

From 83ef84997ab52e6e7e61f3bda1a7160347e71c0e Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 14:04:06 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request2.js                               |   2 +
 mycomponents/record/recordComDetailCard.vue   |   2 +-
 pages.json                                    |   2 +-
 .../request/putawayRequestCreate.vue          | 417 +++++++++++++++++-
 static/config.json                            |   2 +-
 5 files changed, 420 insertions(+), 5 deletions(-)

diff --git a/api/request2.js b/api/request2.js
index 00653601..f1143e82 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1720,6 +1720,8 @@ export function productPutawayJobSubmit(params) {
 	});
 }
 
+ 
+
 
 
 /**
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index 9c88cd25..7ac5883d 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -169,7 +169,7 @@
 
 			confirm(qty) {
 				// this.editItem.qty = qty;
-				this.editItem.handlQty = qty;
+				this.editItem.handleQty = qty;
 				this.$emit('updateData')
 			}
 		}
diff --git a/pages.json b/pages.json
index b51d902d..207b2b99 100644
--- a/pages.json
+++ b/pages.json
@@ -318,7 +318,7 @@
 		{
 			"path": "pages/putaway/request/putawayRequestCreate",
 			"style": {
-				"navigationBarTitleText": "新增原料上架申请",
+				"navigationBarTitleText": "原料上架申请创建",
 				"enablePullDownRefresh": false
 			}
 		},
diff --git a/pages/productPutaway/request/putawayRequestCreate.vue b/pages/productPutaway/request/putawayRequestCreate.vue
index 02409e35..921823f8 100644
--- a/pages/productPutaway/request/putawayRequestCreate.vue
+++ b/pages/productPutaway/request/putawayRequestCreate.vue
@@ -1,8 +1,421 @@
 <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>
+				<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 {
+		productPutawayRequestSubmit,
+	} 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 = "ProductPutaway"
+			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));
+
+				productPutawayRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成制品上架申请<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>
-</style>
\ No newline at end of file
+<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>
diff --git a/static/config.json b/static/config.json
index 3f6576ad..5ff11180 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.176:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",

From 8f3527642a67d826b1d43f4e9249467d1d4ce0fa Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 14:42:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/coms/comDeliverRequestCreator.vue | 44 +++------------
 .../deliver/request/deliverRequestCreate.vue  | 55 +++++--------------
 pages/issue/coms/comIssueRequestPopup.vue     |  2 +-
 .../request/putawayRequestCreate.vue          |  1 +
 .../putaway/request/putawayRequestCreate.vue  |  1 +
 5 files changed, 26 insertions(+), 77 deletions(-)

diff --git a/pages/deliver/coms/comDeliverRequestCreator.vue b/pages/deliver/coms/comDeliverRequestCreator.vue
index 3fa70302..5f75ab38 100644
--- a/pages/deliver/coms/comDeliverRequestCreator.vue
+++ b/pages/deliver/coms/comDeliverRequestCreator.vue
@@ -1,61 +1,33 @@
 <template>
 	<view class="">
-
-
 		<uni-collapse ref="collapse">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
-					<view class="" style="font-size: 32rpx;">
-						<view class="" >
-							客户 : {{dataContent.customerName}} ({{dataContent.customerCode}})
-						</view>
-						
-						<view class="">
-							总数量 : {{dataContent.totalQty}} 
+					<view class="page-header" style="font-size: 32rpx;">
+						<view class="page-item">
+							{{dataContent.customerCode }} ({{dataContent.customerName}})
 						</view>
 					</view>
-					
 				</template>
-				<u-line />
 				<uni-swipe-action ref="swipeAction">
 					<view v-for="(item, index) in dataContent.subList" :key="index">
 						<uni-swipe-action-item>
-							<view class="" style="font-size: 32rpx;margin: 10rpx;">
-								<view class="">
-									物品代码 : {{item.itemCode}}
-								</view>
-								<view class="">
-									物品名称 : {{item.itemName}}
-								</view>
-								
-								<view class="uni-flex uni-row uni-center">
-									<view class="">
-										数量 : {{item.qty}} 单位 : 
-									</view>
-									<view class="">
-										<uom :uom="item.uom"></uom>
-									</view>
-									
-								</view>
-
-							</view>
+							<item-qty :dataContent="item"></item-qty>
 						</uni-swipe-action-item>
-						<u-line />
 					</view>
 				</uni-swipe-action>
-
 			</uni-collapse-item>
 		</uni-collapse>
-
-
 	</view>
 </template>
 
 <script>
 	import uom from '@/mycomponents/qty/uom.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
 	export default {
 		components: {
-			uom
+			uom,
+			itemQty
 		},
 		data() {
 			return {
@@ -69,7 +41,7 @@
 			},
 		},
 		methods: {
-			update(){
+			update() {
 				this.$nextTick(r => {
 					this.$refs.collapse.resize()
 				});
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
index fb2d7209..5a1cc358 100644
--- a/pages/deliver/request/deliverRequestCreate.vue
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -153,53 +153,28 @@
 
 				var params = this.setRequestParams()
 				console.log("提交参数", JSON.stringify(params));
-				// deliverRequestSubmit(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)
-				// })
-
-
+				deliverRequestSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成成品发货申请<br>" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
 			},
 
 			setRequestParams() {
+				let requestContent = {};
+				requestContent.customerCode = this.detailSource.customerCode;
 				var subList = []
 				this.detailSource.subList.forEach(detail => {
-					detail.soNumber = detail.package.soNumber;
-					detail.soLine = detail.package.soLine;
-					detail.remark = ""
-					// soNumber: 926926926,
-					// soLine: 926,
-					// itemCode: THILDD0A691AG,
-					// remark: ,
-					// qty: 2,
-					// uom: EA
 					subList.push(detail)
 				})
-
-				this.detailSource.subList = subList
-				this.detailSource.deliverPlanNumber = "DP20231130-0001"
-				this.detailSource.customerCode = this.detailSource.customerCode
-				this.detailSource.customerDockCode = ""
-				this.detailSource.carrierCode = ""
-				this.detailSource.transferMode = ""
-				this.detailSource.vehiclePlateNumber = ""
-				this.detailSource.remark = ""
-				this.detailSource.dueTime = ""
-				this.detailSource.departmentCode = "研发部门"
-				this.detailSource.status = 1
-				this.detailSource.autoCommit = "FALSE"
-				this.detailSource.autoAgree = "FALSE"
-				this.detailSource.autoExecute = "FALSE"
-				this.detailSource.directCreateRecord = "FALSE"
-
-				return this.detailSource;
+				requestContent.subList = subList;
+				return requestContent;
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index e20fb685..0824a730 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -260,7 +260,7 @@
 						this.numberFocus = true
 						this.uom = res.data.list[0].uom
 					} else {
-						this.showErrorMessage('未查找到物料【' +itemCode + '】', "itemCode");
+						this.showErrorMessage('未查找到物料【' + itemCode + '】', "itemCode");
 					}
 
 				}).catch(error => {
diff --git a/pages/productPutaway/request/putawayRequestCreate.vue b/pages/productPutaway/request/putawayRequestCreate.vue
index 921823f8..c82a647c 100644
--- a/pages/productPutaway/request/putawayRequestCreate.vue
+++ b/pages/productPutaway/request/putawayRequestCreate.vue
@@ -304,6 +304,7 @@
 							var subItem = {};
 							Object.assign(subItem, detail)
 							subItem.fromLocationCode = detail.locationCode;
+							subItem.qty = detail.handleQty;
 							subItem.package = null;
 							subList.push(subItem)
 						}
diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue
index 5cf7c2e1..18a8cc44 100644
--- a/pages/putaway/request/putawayRequestCreate.vue
+++ b/pages/putaway/request/putawayRequestCreate.vue
@@ -311,6 +311,7 @@
 							var subItem = {};
 							Object.assign(subItem, detail)
 							subItem.fromLocationCode = detail.locationCode;
+							subItem.qty=detail.handleQty;
 							subItem.package = null;
 							subList.push(subItem)
 						}