From ac9d1b045891022c8088cfbaa021e6711c66d459 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 15 Mar 2024 11:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/detail.js                          |  10 +-
 src/mycomponents/package/packageList.vue      |   2 +-
 src/pages.json                                |   7 +
 src/pages/issue/request/issueScanRequest.vue  | 144 ++++++++++++++++++
 .../purchaseReceipt/job/receiptDetail.vue     |  23 +--
 5 files changed, 170 insertions(+), 16 deletions(-)
 create mode 100644 src/pages/issue/request/issueScanRequest.vue

diff --git a/src/common/detail.js b/src/common/detail.js
index 4fd36866..9cfb545f 100644
--- a/src/common/detail.js
+++ b/src/common/detail.js
@@ -118,10 +118,12 @@ export function calcTreeHandleQty(detailSource) {
 		
 		for (let detail of item.subList) {
 			if (detail != undefined && detail.scaned) {
-				detail.handleQty = new Decimal(0).toNumber();
-				for (let pack of detail.packList){
-					if(pack!=undefined&&pack.scaned){
-						detail.handleQty = calc.add(detail.handleQty, pack.handleQty); 
+				if(detail.packList.length>0){
+					detail.handleQty = new Decimal(0).toNumber();
+					for (let pack of detail.packList){
+						if(pack!=undefined&&pack.scaned){
+							detail.handleQty = calc.add(detail.handleQty, pack.handleQty); 
+						}
 					}
 				}
 				item.handleQty = calc.add(item.handleQty, detail.handleQty);
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 10f12497..1f7d0408 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -117,7 +117,7 @@
 					res => {
 						if (res) {
 							item.scaned = false
-							item.handleQty = 0
+							item.handleQty = null;
 							this.$emit('updateData')
 							this.$forceUpdate()
 						}
diff --git a/src/pages.json b/src/pages.json
index 5f149645..ae981a2f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -472,6 +472,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/issue/request/issueScanRequest",
+			"style": {
+				"navigationBarTitleText": "扫描叫料申请",
+				"enablePullDownRefresh": false
+			}
+		},
 
 		{
 			"path": "pages/issue/job/issueJob",
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
new file mode 100644
index 00000000..03247804
--- /dev/null
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -0,0 +1,144 @@
+<template>
+	<view class="page-wraper">
+		<view class="" >
+			<com-blank-view @goScan='goScan()'></com-blank-view>
+		</view>
+	</view>
+	<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HCMQ" title="叫料标签"></win-scan-pack>
+</template>
+
+<script>
+	import {
+		issueRequestSubmit,
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getRemoveOption,
+		navigateBack,
+		getCurrDateOneMonthsTimes
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	
+	export default {
+		name: 'issueRequestSubmit',
+		components: {
+			comBlankView,
+			jobDetailPopup,
+			comScanIssuePack,
+			comIssueRequestCreator,
+			winScanPack
+		},
+		data() {
+			return {
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				requestList: [], //需求信息
+				itemCodeTypeList:[],
+				useOnTheWay:"FALSE"
+
+			}
+		},
+		mounted() {
+		},
+		onLoad(option) {
+			var typeCode = "Issue"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.useOnTheWay = res.useOnTheWay;
+					this.fromInventoryStatuses = res.fromInventoryStatuses
+					this.toInventoryStatuses = res.toInventoryStatuses
+					this.goScan()
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		methods: {
+			goScan() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			getScanResult(data){
+				this.detailSource.subList = [];
+				var labelInfo = data.label;
+				var warehouseCode = labelInfo.warehouseCode;
+				var workshopCode =labelInfo.workshopCode;
+				var productionLineCode =labelInfo.productionLineCode;
+				var workStationCode = labelInfo.workStationCode;
+				
+				var itemCode = labelInfo.itemCode;
+				var location = labelInfo.location;
+				var qty = labelInfo.qty;
+				var uom = labelInfo.uom;
+				var packUnit = labelInfo.packUnit;
+				var data = {};
+				this.detailSource.subList.push()
+				
+				
+			},
+
+			setParams() {
+				this.detailSource.dueTime = getCurrDateOneMonthsTimes();
+				return this.detailSource
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				issueRequestSubmit(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)
+				})
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 71aa0e8f..a711a661 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -311,6 +311,7 @@
 									})
 
 									calcTreeHandleQty(this.detailSource);
+									var test =this.detailSource
 									this.continueScan()
 									this.$forceUpdate()
 								}
@@ -409,17 +410,17 @@
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
 
-						purchaseReceiptJobSubmit(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)
-						})
+						// purchaseReceiptJobSubmit(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)
+						// })
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);