From 3462f7328785b8adef8a77d14b3ff3d098699200 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 09:23:06 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/FgProductReceiptDetail.vue            | 410 -----------------
 .../job/FgProductReceiptJob.vue               |  33 --
 .../job/SemiProductReceiptDetail.vue          | 418 ------------------
 .../job/SemiProductReceiptJob.vue             |  33 --
 4 files changed, 894 deletions(-)
 delete mode 100644 src/pages/productReceipt/job/FgProductReceiptDetail.vue
 delete mode 100644 src/pages/productReceipt/job/FgProductReceiptJob.vue
 delete mode 100644 src/pages/productReceipt/job/SemiProductReceiptDetail.vue
 delete mode 100644 src/pages/productReceipt/job/SemiProductReceiptJob.vue

diff --git a/src/pages/productReceipt/job/FgProductReceiptDetail.vue b/src/pages/productReceipt/job/FgProductReceiptDetail.vue
deleted file mode 100644
index 221820dc..00000000
--- a/src/pages/productReceipt/job/FgProductReceiptDetail.vue
+++ /dev/null
@@ -1,410 +0,0 @@
-<template>
-	<view class="page-wraper">
-		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view>
-			<u-line color="#D8D8D8"></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="">
-						<com-product-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
-						</com-product-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="">
-					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
-						:locationCode="toLocationCode" @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></locationCompare>
-				</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>
-		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='制品标签'></win-scan-fg-label>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
-	import {
-		getProductReceiptJobDetail,
-		takeProductReceiptJob,
-		cancleTakeProductReceiptJob,
-		productReceiptJobsubmit
-	} from '@/api/request2.js';
-	import {
-		goHome,
-		navigateBack,
-		getPackingNumberAndBatch,
-	} from '@/common/basic.js';
-
-	import {
-		getDirectoryItemArray,
-		getInventoryStatusName
-	} from '@/common/directory.js';
-
-	import {
-		getDataSource,
-		createRecordInfo,
-		calcHandleQty,
-		getScanCount
-	} from '@/common/detail.js';
-
-	import {
-		Decimal
-	} from 'decimal.js'; //引入
-
-	import {
-		calc
-	} from '@/common/calc'
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import locationCompare from '@/mycomponents/location/locationCompare.vue'
-	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import jobTop from '@/mycomponents/job/jobTop.vue'
-	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
-
-
-	export default {
-		name: 'receipt_detail',
-		components: {
-			winScanButton,
-			comDetailCard,
-			locationCompare,
-			winScanFgLabel,
-			jobTop,
-			comProductDetailCard,
-		},
-		data() {
-			return {
-				id: '',
-				receiptJob: {},
-				toLocationCode: '',
-				isShowPackingCode: true,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				toLocationTypeList: [],
-				managementList: [],
-				jobStatus: "",
-				jobToLocationCode: "",
-				fgList: []
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-
-			}
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.jobStatus == "2") {
-					//取消承接任务	
-					cancleTakeProductReceiptJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
-
-				return true;
-			}
-
-		},
-
-		onPullDownRefresh() {
-			this.getDetail();
-			uni.stopPullDownRefresh();
-		},
-
-		mounted() {
-
-		},
-		methods: {
-			//接收
-			receive(callback) {
-				if (this.id != null) {
-					takeProductReceiptJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getProductReceiptJobDetail(that.id).then(res => {
-					uni.hideLoading();
-					if (res.data == null) {
-						that.showMessage('未获取到详情');
-					} else {
-						if (res.data.subList.length > 0) {
-							that.jobContent = res.data;
-							that.subList = res.data.subList;
-							that.jobStatus = res.data.status
-							that.jobToLocationCode = that.subList[0].toLocationCode
-							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-							that.detailSource = getDataSource(that.subList)
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			getScanResult(result) {
-				//TODO缺少零件号的对应关系
-				let that = this;
-				if (that.detailSource.length > 0) {
-					let item = that.detailSource[0]; //应该按零件号查找
-					result.uom = item.uom;
-					if (item.subList.length > 0) {
-						let subItem = item.subList[0];
-						if (subItem.fgList == undefined) {
-							subItem.fgList = [];
-						}
-						subItem.fgList.push(result);
-						that.calcFgQty(this.detailSource);
-						setTimeout(r => {
-							this.scanPopupGetFocus();
-						}, 500)
-					}
-				}
-			},
-
-			calcFgQty() {
-				let that = this;
-				that.detailSource.forEach(item => {
-					item.subList.forEach(pack => {
-						pack.handleQty = new Decimal(0).toNumber();
-						pack.fgList.forEach(fg => {
-							if (fg != null) {
-								fg.qty = new Decimal(fg.qty).toNumber();
-								pack.handleQty = calc.add(pack.handleQty, fg.qty);
-								// item.qty = calc.add(item.qty, detail.qty);
-							}
-						})
-					})
-				})
-			},
-
-			updateData() {
-				calcHandleQty(this.detailSource);
-			},
-
-			openScanPopup() {
-				this.$refs.scanPopup.openScanPopup();
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-				this.toLocationCode = code
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						detail.toLocationCode = code
-					})
-				})
-				// })
-			},
-
-			checkLocation() {
-				var isPass = true;
-				if (this.toLocationCode == "" || this.toLocationCode == null) {
-					this.showMessageHint('请扫描收货库位', callback => {
-						this.$refs.comScanLocation.showLocation();
-					})
-					return isPass = false;
-				}
-				return isPass;
-			},
-
-			showMessageHint(hint, callback) {
-				this.$refs.comMessage.showErrorMessage(hint, res => {
-					if (res) {
-						callback()
-					}
-				});
-			},
-
-			commit() {
-				// this.scanCount = getScanCount(this.subList);
-				// if (this.scanCount == 0) {
-				// 	this.showErrorMessage("扫描数为0,请先扫描")
-				// 	return;
-				// }
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
-				this.detailSource.forEach(item => {
-					item.subList.forEach(subitem => {
-						if (subitem.handleQty == undefined) {
-							this.showMessage("还没扫码成品不能提交")
-						} else {
-							if (subitem.handleQty != subitem.packQty) {
-								this.showQuestionMessage('制品数量不等于包装数量,是否继续提交?', res => {
-									if (res) {
-										this.submitJob();
-									}
-								});
-							}
-						}
-					})
-				})
-			},
-
-			submitJob() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				var itemCodes = []
-				this.detailSource.forEach(item => {
-					itemCodes.push(item.itemCode)
-				})
-				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = this.setParams();
-						console.log("提交参数", JSON.stringify(params));
-						productReceiptJobsubmit(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);
-					}
-				});
-			},
-
-			setParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
-
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.batch);
-							detail.toPackingNumber = info.packingNumber;
-							detail.toBatch = info.batch;
-							detail.toContainerNumber = '';
-							detail.toInventoryStatus = detail.inventoryStatus
-							detail.toLocationCode = this.toLocationCode
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-
-			scanPopupLoseFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.losefocus();
-				}
-			},
-
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.scanPopupGetFocus();
-						}
-					});
-				})
-			},
-
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-							this.scanPopupGetFocus();
-						}
-					});
-				})
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/FgProductReceiptJob.vue b/src/pages/productReceipt/job/FgProductReceiptJob.vue
deleted file mode 100644
index 8fd0dd95..00000000
--- a/src/pages/productReceipt/job/FgProductReceiptJob.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-	<view class="">
-		<product-receipt-job ref="productreceiptjob" type='fg'></product-receipt-job>
-	</view>
-</template>
-
-<script>
-	import productReceiptJob from '@/pages/productReceipt/job/productReceiptJob.vue'
-
-	export default {
-		name: 'fgProductReceiptJob',
-		components: {
-			productReceiptJob
-		},
-		data() {
-			return {
-
-			};
-		},
-
-		mounted() {
-			this.$refs.productreceiptjob.getList("refresh");
-		},
-
-		methods: {
-
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-
-</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/SemiProductReceiptDetail.vue b/src/pages/productReceipt/job/SemiProductReceiptDetail.vue
deleted file mode 100644
index 6759a483..00000000
--- a/src/pages/productReceipt/job/SemiProductReceiptDetail.vue
+++ /dev/null
@@ -1,418 +0,0 @@
-<template>
-	<view class="page-wraper">
-		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view>
-			<u-line color="#D8D8D8"></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="">
-						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
-						</comProductDetailCard>
-					</view>
-					<u-line />
-				</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="">
-					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></locationCompare>
-				</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>
-		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
-	import {
-		getProductReceiptJobDetail,
-		takeProductReceiptJob,
-		cancleTakeProductReceiptJob,
-		productReceiptJobsubmit
-	} from '@/api/request2.js';
-	import {
-		goHome,
-		navigateBack,
-		getPackingNumberAndBatch,
-	} from '@/common/basic.js';
-
-	import {
-		getDirectoryItemArray,
-		getInventoryStatusName
-	} from '@/common/directory.js';
-
-	import {
-		getDataSource,
-		createRecordInfo,
-		calcHandleQty,
-		getScanCount
-	} from '@/common/detail.js';
-
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import locationCompare from '@/mycomponents/location/locationCompare.vue'
-	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import jobTop from '@/mycomponents/job/jobTop.vue'
-	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
-
-
-	export default {
-		name: 'receipt_detail',
-		components: {
-			winScanButton,
-			comDetailCard,
-			locationCompare,
-			winScanPack,
-			jobTop,
-			comProductDetailCard
-		},
-		data() {
-			return {
-				id: '',
-				receiptJob: {},
-				toLocationCode: '',
-				isShowPackingCode: true,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				toLocationTypeList: [],
-				managementList: [],
-				jobStatus:"",
-				jobToLocationCode:""
-
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-
-			}
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
-					//取消承接任务	
-					cancleTakeProductReceiptJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
-
-				return true;
-			}
-
-		},
-
-		onPullDownRefresh() {
-			this.getDetail();
-			uni.stopPullDownRefresh();
-		},
-
-		mounted() {
-
-		},
-		methods: {
-			//接收
-			receive(callback) {
-				if (this.id != null) {
-					takeProductReceiptJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getProductReceiptJobDetail(that.id).then(res => {
-					uni.hideLoading();
-					if (res.data == null) {
-						that.showMessage('未获取到详情');
-					} else {
-						if (res.data.subList.length > 0) {
-							that.jobContent = res.data;
-							that.subList = res.data.subList;
-							that.jobStatus = res.data.status
-							that.jobToLocationCode = that.subList[0].toLocationCode
-							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-							that.detailSource = getDataSource(that.subList)
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			getScanResult(result) {
-				let label = result.label;
-				var packingNumber = label.packingNumber;
-				var batch = label.batch;
-				var qty = label.qty;
-				var itemCode = label.itemCode;
-
-				var detail = this.detailSource.find(r => r.itemCode == itemCode);
-				if (detail == undefined) {
-					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-				} else {
-					var itemDetail = detail.subList.find(r =>
-						r.packingNumber == packingNumber &&
-						r.batch == batch);
-					if (itemDetail == undefined) {
-						this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
-					} else {
-						if (itemDetail.scaned) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-						} else {
-							itemDetail.scaned = true;
-							itemDetail.handleQty = Number(result.label.qty);
-							itemDetail.toLocationCode = this.toLocationCode;
-							itemDetail.labelQty = Number(result.label.qty);
-							calcHandleQty(this.detailSource);
-							this.continueScan()
-							this.$forceUpdate()
-						}
-
-					}
-				}
-			},
-
-			//继续扫描
-			continueScan() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == this.subList.length) {
-					this.closeScanPopup();
-				} else {
-					this.scanPopupGetFocus();
-				}
-			},
-
-
-			updateData() {
-				calcHandleQty(this.detailSource);
-			},
-
-
-			openScanPopup() {
-				this.$refs.scanPopup.openScanPopup();
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
-
-			checkLocation() {
-				var isPass = true;
-				if (this.toLocationCode == "" || this.toLocationCode == null) {
-					this.showMessageHint('请扫描收货库位', callback => {
-						this.$refs.comScanLocation.showLocation();
-					})
-
-					return isPass = false;
-				}
-				return isPass;
-			},
-
-			showMessageHint(hint, callback) {
-				this.$refs.comMessage.showErrorMessage(hint, res => {
-					if (res) {
-						callback()
-					}
-				});
-			},
-
-			commit() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
-					return;
-				}
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
-
-
-				//扫描数量和任务数量相等，直接提交
-				if (this.scanCount == this.subList.length) {
-					this.submitJob();
-				} else if (this.scanCount < this.subList.length) {
-					//扫描数量小于任务数量，判断是否允许部分提交
-					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						this.submitJob();
-					} else {
-						//不允许部分提交，提示
-						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
-							.length +
-							"]");
-					}
-				}
-
-			},
-
-			submitJob() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				var itemCodes = []
-				this.detailSource.forEach(item => {
-					itemCodes.push(item.itemCode)
-				})
-				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = this.setParams();
-						console.log("提交参数", JSON.stringify(params));
-						productReceiptJobsubmit(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);
-					}
-				});
-			},
-
-			setParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
-
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.batch);
-							detail.toPackingNumber = info.packingNumber;
-							detail.toBatch = info.batch;
-							detail.toContainerNumber = '';
-							detail.toInventoryStatus = detail.inventoryStatus
-							detail.toLocationCode = this.toLocationCode
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-
-			scanPopupLoseFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.losefocus();
-				}
-			},
-
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.scanPopupGetFocus();
-						}
-					});
-				})
-			},
-
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-							this.scanPopupGetFocus();
-						}
-					});
-				})
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-</style>
diff --git a/src/pages/productReceipt/job/SemiProductReceiptJob.vue b/src/pages/productReceipt/job/SemiProductReceiptJob.vue
deleted file mode 100644
index 87dcbb32..00000000
--- a/src/pages/productReceipt/job/SemiProductReceiptJob.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-	<view class="">
-		<product-receipt-job ref="productreceiptjob" type='predict'></product-receipt-job>
-	</view>
-</template>
-
-<script>
-	import productReceiptJob from '@/pages/productReceipt/job/productReceiptJob.vue'
-
-	export default {
-		name: 'semiProductReceiptJob',
-		components: {
-			productReceiptJob
-		},
-		data() {
-			return {
-
-			};
-		},
-
-		mounted() {
-			this.$refs.productreceiptjob.getList("refresh");
-		},
-
-		methods: {
-
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-
-</style>
\ No newline at end of file

From f5d1e373842b55593aa263c07aaccfe808da7897 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 09:27:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/fgProductReceiptDetail.vue            | 410 +++++++++++++++++
 .../job/fgProductReceiptJob.vue               |  33 ++
 .../job/semiProductReceiptDetail.vue          | 418 ++++++++++++++++++
 .../job/semiProductReceiptJob.vue             |  33 ++
 4 files changed, 894 insertions(+)
 create mode 100644 src/pages/productReceipt/job/fgProductReceiptDetail.vue
 create mode 100644 src/pages/productReceipt/job/fgProductReceiptJob.vue
 create mode 100644 src/pages/productReceipt/job/semiProductReceiptDetail.vue
 create mode 100644 src/pages/productReceipt/job/semiProductReceiptJob.vue

diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
new file mode 100644
index 00000000..221820dc
--- /dev/null
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -0,0 +1,410 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></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="">
+						<com-product-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</com-product-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="">
+					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></locationCompare>
+				</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>
+		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='制品标签'></win-scan-fg-label>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductReceiptJobDetail,
+		takeProductReceiptJob,
+		cancleTakeProductReceiptJob,
+		productReceiptJobsubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
+	import {
+		calc
+	} from '@/common/calc'
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
+
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			comDetailCard,
+			locationCompare,
+			winScanFgLabel,
+			jobTop,
+			comProductDetailCard,
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				toLocationCode: '',
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				managementList: [],
+				jobStatus: "",
+				jobToLocationCode: "",
+				fgList: []
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeProductReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getScanResult(result) {
+				//TODO缺少零件号的对应关系
+				let that = this;
+				if (that.detailSource.length > 0) {
+					let item = that.detailSource[0]; //应该按零件号查找
+					result.uom = item.uom;
+					if (item.subList.length > 0) {
+						let subItem = item.subList[0];
+						if (subItem.fgList == undefined) {
+							subItem.fgList = [];
+						}
+						subItem.fgList.push(result);
+						that.calcFgQty(this.detailSource);
+						setTimeout(r => {
+							this.scanPopupGetFocus();
+						}, 500)
+					}
+				}
+			},
+
+			calcFgQty() {
+				let that = this;
+				that.detailSource.forEach(item => {
+					item.subList.forEach(pack => {
+						pack.handleQty = new Decimal(0).toNumber();
+						pack.fgList.forEach(fg => {
+							if (fg != null) {
+								fg.qty = new Decimal(fg.qty).toNumber();
+								pack.handleQty = calc.add(pack.handleQty, fg.qty);
+								// item.qty = calc.add(item.qty, detail.qty);
+							}
+						})
+					})
+				})
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanLocationCode(location, code) {
+				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+				this.toLocationCode = code
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+				// })
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				// this.scanCount = getScanCount(this.subList);
+				// if (this.scanCount == 0) {
+				// 	this.showErrorMessage("扫描数为0,请先扫描")
+				// 	return;
+				// }
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+				this.detailSource.forEach(item => {
+					item.subList.forEach(subitem => {
+						if (subitem.handleQty == undefined) {
+							this.showMessage("还没扫码成品不能提交")
+						} else {
+							if (subitem.handleQty != subitem.packQty) {
+								this.showQuestionMessage('制品数量不等于包装数量,是否继续提交?', res => {
+									if (res) {
+										this.submitJob();
+									}
+								});
+							}
+						}
+					})
+				})
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams();
+						console.log("提交参数", JSON.stringify(params));
+						productReceiptJobsubmit(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);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/fgProductReceiptJob.vue b/src/pages/productReceipt/job/fgProductReceiptJob.vue
new file mode 100644
index 00000000..8fd0dd95
--- /dev/null
+++ b/src/pages/productReceipt/job/fgProductReceiptJob.vue
@@ -0,0 +1,33 @@
+<template>
+	<view class="">
+		<product-receipt-job ref="productreceiptjob" type='fg'></product-receipt-job>
+	</view>
+</template>
+
+<script>
+	import productReceiptJob from '@/pages/productReceipt/job/productReceiptJob.vue'
+
+	export default {
+		name: 'fgProductReceiptJob',
+		components: {
+			productReceiptJob
+		},
+		data() {
+			return {
+
+			};
+		},
+
+		mounted() {
+			this.$refs.productreceiptjob.getList("refresh");
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/semiProductReceiptDetail.vue b/src/pages/productReceipt/job/semiProductReceiptDetail.vue
new file mode 100644
index 00000000..6759a483
--- /dev/null
+++ b/src/pages/productReceipt/job/semiProductReceiptDetail.vue
@@ -0,0 +1,418 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8"></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="">
+						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</comProductDetailCard>
+					</view>
+					<u-line />
+				</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="">
+					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
+						 @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></locationCompare>
+				</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>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductReceiptJobDetail,
+		takeProductReceiptJob,
+		cancleTakeProductReceiptJob,
+		productReceiptJobsubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
+
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			comDetailCard,
+			locationCompare,
+			winScanPack,
+			jobTop,
+			comProductDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				toLocationCode: '',
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				managementList: [],
+				jobStatus:"",
+				jobToLocationCode:""
+
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeProductReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getScanResult(result) {
+				let label = result.label;
+				var packingNumber = label.packingNumber;
+				var batch = label.batch;
+				var qty = label.qty;
+				var itemCode = label.itemCode;
+
+				var detail = this.detailSource.find(r => r.itemCode == itemCode);
+				if (detail == undefined) {
+					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+				} else {
+					var itemDetail = detail.subList.find(r =>
+						r.packingNumber == packingNumber &&
+						r.batch == batch);
+					if (itemDetail == undefined) {
+						this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
+					} else {
+						if (itemDetail.scaned) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+						} else {
+							itemDetail.scaned = true;
+							itemDetail.handleQty = Number(result.label.qty);
+							itemDetail.toLocationCode = this.toLocationCode;
+							itemDetail.labelQty = Number(result.label.qty);
+							calcHandleQty(this.detailSource);
+							this.continueScan()
+							this.$forceUpdate()
+						}
+
+					}
+				}
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
+							.length +
+							"]");
+					}
+				}
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams();
+						console.log("提交参数", JSON.stringify(params));
+						productReceiptJobsubmit(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);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/pages/productReceipt/job/semiProductReceiptJob.vue b/src/pages/productReceipt/job/semiProductReceiptJob.vue
new file mode 100644
index 00000000..87dcbb32
--- /dev/null
+++ b/src/pages/productReceipt/job/semiProductReceiptJob.vue
@@ -0,0 +1,33 @@
+<template>
+	<view class="">
+		<product-receipt-job ref="productreceiptjob" type='predict'></product-receipt-job>
+	</view>
+</template>
+
+<script>
+	import productReceiptJob from '@/pages/productReceipt/job/productReceiptJob.vue'
+
+	export default {
+		name: 'semiProductReceiptJob',
+		components: {
+			productReceiptJob
+		},
+		data() {
+			return {
+
+			};
+		},
+
+		mounted() {
+			this.$refs.productreceiptjob.getList("refresh");
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file

From 9a7677546f836e8b23fc512192590a48cfd01452 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 09:31:48 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScanFG.vue   | 262 -----------------------
 src/mycomponents/scan/winScanFGLabel.vue | 110 ----------
 2 files changed, 372 deletions(-)
 delete mode 100644 src/mycomponents/scan/winComScanFG.vue
 delete mode 100644 src/mycomponents/scan/winScanFGLabel.vue

diff --git a/src/mycomponents/scan/winComScanFG.vue b/src/mycomponents/scan/winComScanFG.vue
deleted file mode 100644
index e23070b9..00000000
--- a/src/mycomponents/scan/winComScanFG.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<!--扫描组件-->
-<template>
-	<!-- <page-meta root-font-size="18px"></page-meta> -->
-	<view>
-		<view class="pop_tab">
-			<view class="tab_info">
-				<view class="conbox">
-					<textarea inputmode="none" v-model="scanMsg" trim="all" maxlength="1000"
-						style="margin-left: 5px;width: 90%;" :focus="boxfocus" :placeholder="placeholderValue"
-						@focus="getfocus" @blur="losefocus" @input="handelScanMsg" :cursor="cursorIndex"></textarea>
-				</view>
-				<view class="uni-flex uni-row space-between u-col-center">
-					<view class="uni-flex">
-						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
-						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
-					</view>
-				</view>
-			</view>
-
-			<view style="width: 100%;">
-				<view style="width: 100%;" v-if="scanList.length>0&&isShowHistory">
-					<view class="uni-flex uni-row space-between u-col-center">
-						<view class="" style="padding: 10rpx;">
-							历史记录
-						</view>
-						<view class="" style="padding-right: 10rpx;">
-							<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
-						</view>
-					</view>
-					<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'></u-line>
-					<scroll-view scroll-y="true" class="scroll-view" v-if="expand&&scanList.length>0"
-						style="height: 70px;">
-						<view class="uni-flex u-col" v-for="(item,index) in scanList">
-							<view style="width: 100%;max-height: 100px;">
-								<view class="uni-flex u-row space-between u-col-center" @click="showItem(item)">
-									<view class="text_ellipsis" style="padding: 15rpx;">
-										{{item}}
-									</view>
-									<view class="">
-										<u-icon name="arrow-right"></u-icon>
-									</view>
-								</view>
-								<u-line class='line_color'></u-line>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-			</view>
-		</view>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-<script>
-	import {
-		getLabelInfo
-	} from '../../common/label.js';
-
-	export default {
-		name: "winComScan",
-		emits: ["getResult"],
-		components: {},
-		props: {
-			placeholder: {
-				type: String,
-				default: '请扫描标签'
-			},
-			clearResult: {
-				type: Boolean,
-				default: true
-			},
-			boxFocus: {
-				type: Boolean,
-				default: true
-			},
-			isShowHistory: {
-				type: Boolean,
-				default: true
-			},
-			headerType: {
-				type: String,
-				default: 'HPQ' //HLB   HMQ   HCQ HPQ
-			}
-		},
-		data() {
-			return {
-				// scanMsg: "HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q100",
-				scanMsg: "",
-				boxfocus: false,
-				placeholderValue: '',
-				scanResult: {},
-				scanList: [],
-				expand: true,
-				expendIcon: 'arrow-down',
-				cursorIndex: 0
-			}
-		},
-		mounted() {
-			this.boxfocus = true;
-			uni.hideKeyboard();
-
-			// #ifdef H5
-			if (document.querySelector('textarea') != null) {
-				document.querySelector('textarea').setAttribute('inputmode', 'none')
-			}
-			// #endif 
-			this.hide()
-			// #ifdef APP-PLUS
-
-			// #endif 
-		},
-		watch: {
-			placeholder() {
-				this.placeholderValue = '请扫描' + this.placeholder;
-			}
-		},
-		created() {
-			this.placeholderValue = '请扫描' + this.placeholder;
-		},
-		methods: {
-			hide() {
-				// #ifdef APP-PLUS
-				// 只是解决软键盘的闪现
-				var interval = setInterval(function() {
-					uni.hideKeyboard(); //隐藏软键盘
-					console.log('刷新')
-				}, 5);
-				setTimeout(() => {
-					clearInterval(interval);
-					console.log('停止刷新')
-				}, 1000);
-				// #endif 
-			},
-			getValue() {
-				return this.scanMsg
-			},
-			setValue(val) {
-				this.scanMsg = val
-			},
-			clearScanValue() {
-				this.scanMsg = ''
-				this.getfocus();
-			},
-			clickScanMsg() {
-				this.scanMsg = this.scanMsg + "\n";
-				this.handelScanMsg();
-			},
-			handelScanMsg() {
-				let that = this;
-				setTimeout(() => {
-					that.losefocus();
-					// let content = uni.$u.trim(that.scanMsg)
-					let content = that.scanMsg;
-					if (content == "") {
-						that.getfocus();
-						this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
-							if (res) {
-								that.scanMsg = ""
-								that.getfocus();
-							}
-						})
-						return;
-					}
-
-					if (that.isShowHistory) {
-						that.scanList.unshift(content);
-					}
-
-					try {
-						let itemCode = content.substr(0, 10);
-						let productDate = content.substr(10, 8);
-						let batch = content.substr(18, 3);
-						let order = content.substr(21, 8);
-
-						let scanResult = {
-							itemCode: itemCode,
-							productDate: productDate,
-							batch: batch,
-							order: order,
-							qty: 1,
-							content: content,
-							success: true,
-						};
-						that.clear();
-						that.$emit("getResult", scanResult);
-					} catch (e) {
-						this.$refs.comMessage.showErrorMessage('解析错误', res => {
-							if (res) {
-								that.getfocus();
-							}
-						})
-					}
-				}, 500);
-			},
-			getfocus() {
-				let that = this;
-				this.$nextTick(r => {
-					that.boxfocus = true;
-				});
-				this.hide()
-			},
-			losefocus() {
-				let that = this;
-				this.$nextTick(r => {
-					that.boxfocus = false;
-				});
-			},
-			clear() {
-				this.cursorIndex = 0;
-				this.scanMsg = ''
-			},
-			iconClick(type) {
-				this.$emit("clearResult", this.scanMsg);
-			},
-			expands() {
-				this.expand = !this.expand;
-				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
-			},
-			scanClick() {
-				this.handelScanMsg();
-			},
-			cancelClick() {
-				this.clear();
-				this.getfocus();
-			},
-			showItem(item) {
-				this.$refs.comMessage.showMessage(item, res => {
-					if (res) {
-						// this.$refs.modal.cancelClose();
-					}
-				})
-			},
-
-			scanQRCode() {
-				let that = this;
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: (res) => {
-						that.scanMsg = res.result;
-						that.$emit("getResult", res.result);
-						console.log('扫描二维码成功,结果:' + res.result);
-					},
-					fail: (res) => {
-						that.showItem('扫描出现错误:' + res.result);
-						console.log('扫描出现错误:' + res.result);
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<script module="textarea" lang="renderjs">
-	export default {
-		mounted() {
-			document.querySelector('textarea').setAttribute('inputmode', 'none')
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-
-</style>
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanFGLabel.vue b/src/mycomponents/scan/winScanFGLabel.vue
deleted file mode 100644
index 99c9720b..00000000
--- a/src/mycomponents/scan/winScanFGLabel.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<view>
-		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
-			<view class="popup_box">
-				<view class="pop_title uni-flex space-between">
-					<view class="" style="font-size: 35rpx;">
-						扫描{{title}}
-					</view>
-
-					<view class="">
-						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
-							@click="closeScanPopup()"></image>
-					</view>
-				</view>
-				<view class="">
-					<view class="">
-						<win-com-scan-fg ref="comscan" :placeholder="title" @getResult="getScanResult"
-							:headerType="headerType" :isShowHistory="isShowHistory"
-							:clearResult="true"></win-com-scan-fg>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
-	</view>
-</template>
-
-<script>
-	import winComScanFg from '@/mycomponents/scan/winComScanFg.vue'
-
-	export default {
-		name: 'winScanFGLabel',
-		components: {
-			winComScanFg,
-		},
-		props: {
-			title: {
-				type: String,
-				default: '成品标签'
-			},
-			isShowHistory: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				show: false,
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			openScanPopup() {
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
-				}, 200)
-			},
-
-			closeScanPopup() {
-				this.$refs.popup.close();
-				this.$emit("close", '');
-			},
-
-			scanClick() {
-				this.$refs.comscan.clickScanMsg();
-			},
-
-			cancelClick() {
-				this.$refs.comscan.clearScanValue();
-			},
-
-			getScanResult(result) {
-				if (result.success) {
-					this.$emit("getResult", result);
-				} else {
-					this.showMessage(result.message)
-				}
-			},
-
-			getfocus() {
-				if (this.$refs.comscan != undefined) {
-					this.$refs.comscan.getfocus();
-				}
-			},
-
-			losefocus() {
-				if (this.$refs.comscan != undefined) {
-					this.$refs.comscan.losefocus();
-				}
-			},
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message);
-			},
-			change(e) {
-				this.show = e.show
-			},
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.scroll-view {
-		overflow-y: scroll;
-		height: auto;
-		max-height: 300rpx;
-	}
-</style>
\ No newline at end of file

From 351ae125246049bc05894659762eb08555999a9d Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 09:32:40 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScanFg.vue   | 262 +++++++++++++++++++++++
 src/mycomponents/scan/winScanFgLabel.vue | 110 ++++++++++
 2 files changed, 372 insertions(+)
 create mode 100644 src/mycomponents/scan/winComScanFg.vue
 create mode 100644 src/mycomponents/scan/winScanFgLabel.vue

diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
new file mode 100644
index 00000000..e23070b9
--- /dev/null
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -0,0 +1,262 @@
+<!--扫描组件-->
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view>
+		<view class="pop_tab">
+			<view class="tab_info">
+				<view class="conbox">
+					<textarea inputmode="none" v-model="scanMsg" trim="all" maxlength="1000"
+						style="margin-left: 5px;width: 90%;" :focus="boxfocus" :placeholder="placeholderValue"
+						@focus="getfocus" @blur="losefocus" @input="handelScanMsg" :cursor="cursorIndex"></textarea>
+				</view>
+				<view class="uni-flex uni-row space-between u-col-center">
+					<view class="uni-flex">
+						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
+						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
+					</view>
+				</view>
+			</view>
+
+			<view style="width: 100%;">
+				<view style="width: 100%;" v-if="scanList.length>0&&isShowHistory">
+					<view class="uni-flex uni-row space-between u-col-center">
+						<view class="" style="padding: 10rpx;">
+							历史记录
+						</view>
+						<view class="" style="padding-right: 10rpx;">
+							<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+						</view>
+					</view>
+					<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'></u-line>
+					<scroll-view scroll-y="true" class="scroll-view" v-if="expand&&scanList.length>0"
+						style="height: 70px;">
+						<view class="uni-flex u-col" v-for="(item,index) in scanList">
+							<view style="width: 100%;max-height: 100px;">
+								<view class="uni-flex u-row space-between u-col-center" @click="showItem(item)">
+									<view class="text_ellipsis" style="padding: 15rpx;">
+										{{item}}
+									</view>
+									<view class="">
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</view>
+								<u-line class='line_color'></u-line>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+<script>
+	import {
+		getLabelInfo
+	} from '../../common/label.js';
+
+	export default {
+		name: "winComScan",
+		emits: ["getResult"],
+		components: {},
+		props: {
+			placeholder: {
+				type: String,
+				default: '请扫描标签'
+			},
+			clearResult: {
+				type: Boolean,
+				default: true
+			},
+			boxFocus: {
+				type: Boolean,
+				default: true
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: 'HPQ' //HLB   HMQ   HCQ HPQ
+			}
+		},
+		data() {
+			return {
+				// scanMsg: "HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q100",
+				scanMsg: "",
+				boxfocus: false,
+				placeholderValue: '',
+				scanResult: {},
+				scanList: [],
+				expand: true,
+				expendIcon: 'arrow-down',
+				cursorIndex: 0
+			}
+		},
+		mounted() {
+			this.boxfocus = true;
+			uni.hideKeyboard();
+
+			// #ifdef H5
+			if (document.querySelector('textarea') != null) {
+				document.querySelector('textarea').setAttribute('inputmode', 'none')
+			}
+			// #endif 
+			this.hide()
+			// #ifdef APP-PLUS
+
+			// #endif 
+		},
+		watch: {
+			placeholder() {
+				this.placeholderValue = '请扫描' + this.placeholder;
+			}
+		},
+		created() {
+			this.placeholderValue = '请扫描' + this.placeholder;
+		},
+		methods: {
+			hide() {
+				// #ifdef APP-PLUS
+				// 只是解决软键盘的闪现
+				var interval = setInterval(function() {
+					uni.hideKeyboard(); //隐藏软键盘
+					console.log('刷新')
+				}, 5);
+				setTimeout(() => {
+					clearInterval(interval);
+					console.log('停止刷新')
+				}, 1000);
+				// #endif 
+			},
+			getValue() {
+				return this.scanMsg
+			},
+			setValue(val) {
+				this.scanMsg = val
+			},
+			clearScanValue() {
+				this.scanMsg = ''
+				this.getfocus();
+			},
+			clickScanMsg() {
+				this.scanMsg = this.scanMsg + "\n";
+				this.handelScanMsg();
+			},
+			handelScanMsg() {
+				let that = this;
+				setTimeout(() => {
+					that.losefocus();
+					// let content = uni.$u.trim(that.scanMsg)
+					let content = that.scanMsg;
+					if (content == "") {
+						that.getfocus();
+						this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
+							if (res) {
+								that.scanMsg = ""
+								that.getfocus();
+							}
+						})
+						return;
+					}
+
+					if (that.isShowHistory) {
+						that.scanList.unshift(content);
+					}
+
+					try {
+						let itemCode = content.substr(0, 10);
+						let productDate = content.substr(10, 8);
+						let batch = content.substr(18, 3);
+						let order = content.substr(21, 8);
+
+						let scanResult = {
+							itemCode: itemCode,
+							productDate: productDate,
+							batch: batch,
+							order: order,
+							qty: 1,
+							content: content,
+							success: true,
+						};
+						that.clear();
+						that.$emit("getResult", scanResult);
+					} catch (e) {
+						this.$refs.comMessage.showErrorMessage('解析错误', res => {
+							if (res) {
+								that.getfocus();
+							}
+						})
+					}
+				}, 500);
+			},
+			getfocus() {
+				let that = this;
+				this.$nextTick(r => {
+					that.boxfocus = true;
+				});
+				this.hide()
+			},
+			losefocus() {
+				let that = this;
+				this.$nextTick(r => {
+					that.boxfocus = false;
+				});
+			},
+			clear() {
+				this.cursorIndex = 0;
+				this.scanMsg = ''
+			},
+			iconClick(type) {
+				this.$emit("clearResult", this.scanMsg);
+			},
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+			scanClick() {
+				this.handelScanMsg();
+			},
+			cancelClick() {
+				this.clear();
+				this.getfocus();
+			},
+			showItem(item) {
+				this.$refs.comMessage.showMessage(item, res => {
+					if (res) {
+						// this.$refs.modal.cancelClose();
+					}
+				})
+			},
+
+			scanQRCode() {
+				let that = this;
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						that.scanMsg = res.result;
+						that.$emit("getResult", res.result);
+						console.log('扫描二维码成功,结果:' + res.result);
+					},
+					fail: (res) => {
+						that.showItem('扫描出现错误:' + res.result);
+						console.log('扫描出现错误:' + res.result);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<script module="textarea" lang="renderjs">
+	export default {
+		mounted() {
+			document.querySelector('textarea').setAttribute('inputmode', 'none')
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanFgLabel.vue b/src/mycomponents/scan/winScanFgLabel.vue
new file mode 100644
index 00000000..99c9720b
--- /dev/null
+++ b/src/mycomponents/scan/winScanFgLabel.vue
@@ -0,0 +1,110 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan-fg ref="comscan" :placeholder="title" @getResult="getScanResult"
+							:headerType="headerType" :isShowHistory="isShowHistory"
+							:clearResult="true"></win-com-scan-fg>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
+	</view>
+</template>
+
+<script>
+	import winComScanFg from '@/mycomponents/scan/winComScanFg.vue'
+
+	export default {
+		name: 'winScanFGLabel',
+		components: {
+			winComScanFg,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '成品标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 200)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+			scanClick() {
+				this.$refs.comscan.clickScanMsg();
+			},
+
+			cancelClick() {
+				this.$refs.comscan.clearScanValue();
+			},
+
+			getScanResult(result) {
+				if (result.success) {
+					this.$emit("getResult", result);
+				} else {
+					this.showMessage(result.message)
+				}
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			change(e) {
+				this.show = e.show
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
\ No newline at end of file

From 07082655da0ae496671d265b6e15c9fc26b3ef8f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 11:37:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/location/locationCompare.vue | 36 +++++++++++++++++--
 src/pages/putaway/coms/comPutawayJobCard.vue  |  2 +-
 src/pages/putaway/job/putawayDetail.vue       |  4 +--
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue
index 00d3428b..f0f1cad2 100644
--- a/src/mycomponents/location/locationCompare.vue
+++ b/src/mycomponents/location/locationCompare.vue
@@ -7,12 +7,16 @@
 		<view class="uni-flex uni-row u-col-center" @click="showLocation">
 			<view>
 				<text style="font-size: 30rpx;">{{title}}</text>
-				
+
 				<text style="font-size: 25rpx;color:#3FBAFF;">&nbsp {{recommendLocationCode}}</text>
 				<text v-if="locationCode" style="font-size: 25rpx;color:#3FBAFF;">&nbsp/&nbsp{{locationCode}}</text>
 				<!-- <text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text> -->
 			</view>
 			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
+
+			<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
+				<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制</text>
+			</view>
 		</view>
 		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
@@ -21,6 +25,7 @@
 
 <script>
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -75,10 +80,37 @@
 			//扫描源库位
 			getLocation(location, code) {
 				this.$emit("getLocation", location, code)
+			},
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HLB;V1.0;" + this.recommendLocationCode;
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制库位成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制库位成功'
+						})
+					}
+				})
+				// #endif
+			},
+			isDevlement() {
+				return config.isDevelopment;
 			}
 		}
 	}
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/putaway/coms/comPutawayJobCard.vue b/src/pages/putaway/coms/comPutawayJobCard.vue
index 4f19c5d3..05c20fcc 100644
--- a/src/pages/putaway/coms/comPutawayJobCard.vue
+++ b/src/pages/putaway/coms/comPutawayJobCard.vue
@@ -12,7 +12,7 @@
 			<view class="task_item">
 				<view class="task_text">
 					<view class="">
-						客户代码 : {{dataContent.supplierCode}}
+						供应商代码 : {{dataContent.supplierCode}}
 					</view>
 				</view>
 			</view>
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index a6cc7858..8c0aceab 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -337,14 +337,14 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
 					this.detailSource.forEach(item => {
 						item.subList.forEach(detail => {
 							detail.toLocationCode = code
 						})
 					})
-				})
+				// })
 			},
 
 			openDetail(item) {

From 244c2042c96d6d76430d16cf6c61e8c8896d26bc Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 16:39:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/balance/balance.vue          |   2 +-
 src/mycomponents/balance/handleBalance.vue    |  13 +-
 .../repleinsh/coms/comRepleishDetailCard.vue  |   6 +-
 .../repleinsh/coms/comScanReplishPack.vue     | 134 +++++++++++-------
 src/pages/repleinsh/job/repleinshDetail.vue   |  49 ++++---
 5 files changed, 125 insertions(+), 79 deletions(-)

diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index d6f8c460..1886ea25 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -14,7 +14,7 @@
 				<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
 					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
 				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
-					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack">
+					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack" :isShowStatus='isShowStatus'>
 				</compare-qty>
 				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
 					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
diff --git a/src/mycomponents/balance/handleBalance.vue b/src/mycomponents/balance/handleBalance.vue
index 1707d4ab..71e35d1a 100644
--- a/src/mycomponents/balance/handleBalance.vue
+++ b/src/mycomponents/balance/handleBalance.vue
@@ -1,16 +1,16 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
-		<view class="space_between center" >
+		<view class="space_between center">
 			<view style="word-break: break-all;width: 60%;">
 				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
 				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
 			</view>
 			<view style="word-break: break-all;">
-				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail"
+				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail" :isShowStatus='isShowStatus'
 					:isShowStdPack="false"></recommend-qty>
 
-				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty"
+				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty" :isShowStatus='isShowStatus'
 					:isShowStdPack="false">
 				</compare-qty>
 			</view>
@@ -56,7 +56,10 @@
 				type: Boolean,
 				default: true
 			},
-
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 
@@ -77,4 +80,4 @@
 		opacity: 1;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
index 8aa9becf..6fdcc65f 100644
--- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue
+++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -31,8 +31,12 @@
 											<uni-swipe-action ref="swipeAction">
 												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
 													:right-options="scanOptions">
+													<view class="card_view">
+														<text class="card_packing_code card_content ">外包装</text>
+														<text class="card_content ">{{record.parentPackingNumber}}</text>
+													</view>
 													<handle-balance :detail="record" :isShowLocation="false"
-														:isShowBatch="batch.packingNumber!=null">
+														:isShowBatch="batch.packingNumber!=null" :isShowStatus='true'>
 													</handle-balance>
 												</uni-swipe-action-item>
 											</uni-swipe-action>
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index c5fc6ae9..a62c0719 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -69,7 +69,7 @@
 													<uni-swipe-action-item @click="swipeClick($event,record,index)"
 														:right-options="scanOptions">
 														<view style="padding: 0px 10px">
-															<balance :dataContent="record" :isShowFromLocation="false"
+															<balance :dataContent="record" :isShowFromLocation="false" :isShowStatus='true'
 																:isShowStdPack="false"></balance>
 														</view>
 													</uni-swipe-action-item>
@@ -104,10 +104,10 @@
 	import {
 		getWorkShopLineStation
 	} from '@/api/request2.js';
-	
+
 	import {
-			calc
-		} from '@/common/calc.js';
+		calc
+	} from '@/common/calc.js';
 
 	import {
 		getBalanceByManagementPrecision
@@ -242,30 +242,33 @@
 						)
 						return;
 					} else {
-						//查找库存信息
-						uni.showLoading({
-							title: '加载中',
-							mask: true
-						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
-							balanceRes => {
-								if (balanceRes.success) {
-									if (balanceRes.data.list.length == 0) {
-										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-											res => {
-												this.packGetFocus();
-											})
-									} else if (balanceRes.data.list.length == 1) {
-										let balance = balanceRes.data.list[0];
-										this.afterGetBalance(result.label, balance, packageInfo);
-									} else {
-										this.showBalanceSelect(balanceRes.data.list);
-									}
-								} else {
-									this.showErrorMessage(balanceRes.message.message);
-								}
-								uni.hideLoading();
-							});
+
+						this.afterGetBalance(result.label, result.label, packageInfo);
+
+						// //查找库存信息
+						// uni.showLoading({
+						// 	title: '加载中',
+						// 	mask: true
+						// })
+						// getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+						// 	balanceRes => {
+						// 		if (balanceRes.success) {
+						// 			if (balanceRes.data.list.length == 0) {
+						// 				this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+						// 					res => {
+						// 						this.packGetFocus();
+						// 					})
+						// 			} else if (balanceRes.data.list.length == 1) {
+						// 				let balance = balanceRes.data.list[0];
+						// 				this.afterGetBalance(result.label, balance, packageInfo);
+						// 			} else {
+						// 				this.showBalanceSelect(balanceRes.data.list);
+						// 			}
+						// 		} else {
+						// 			this.showErrorMessage(balanceRes.message.message);
+						// 		}
+						// 		uni.hideLoading();
+						// 	});
 					}
 				} catch (e) {
 					this.showErrorMessage(e.stack)
@@ -297,11 +300,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance, packageInfo)
+										that.addRecord(batch, label, packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance, packageInfo);
+											that.addRecord(batch, label, packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -311,7 +314,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance, packageInfo)
+									that.addRecord(batch, label, packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -325,8 +328,8 @@
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发料明细,是否要继续发料?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance,packageInfo);
-											if(fromLocation.Batchs.length>0){
+											let batch = that.createBatchInfo(label, balance, packageInfo);
+											if (fromLocation.Batchs.length > 0) {
 												batch.detail = fromLocation.Batchs[0].detail;
 											}
 											fromLocation.Batchs.unshift(batch);
@@ -355,7 +358,7 @@
 				}
 			},
 
-			createBatchInfo(data, balance,packageInfo) {
+			createBatchInfo(data, balance, packageInfo) {
 				let batch = {
 					batch: data.batch,
 					qty: 0,
@@ -363,54 +366,75 @@
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance,packageInfo);
+				let record = this.creatRecord(data, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;
 			},
 
-			creatRecord(label, balance, packageInfo) {
-				balance.packQty = packageInfo.packQty
-				balance.packUnit = packageInfo.packUnit
+			creatRecord(label, packageInfo) {
 				let record = {
 					scaned: true,
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
+					parentPackingNumber: packageInfo.parentNumber,
 					batch: label.batch,
-					qty: Number(balance.qty),
+					qty: Number(label.qty),
 					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
-					uom: balance.uom,
-					inventoryStatus: balance.inventoryStatus,
-					balance: balance,
+					uom: label.uom,
+					inventoryStatus: "OK",
+					balance: null,
 					toLocationCode: this.toLocationCode,
 					supplierCode: label.supplierCode
 				}
 				return record;
 			},
 
+
+
+			// creatRecord(label, balance, packageInfo) {
+			// 	balance.packQty = packageInfo.packQty
+			// 	balance.packUnit = packageInfo.packUnit
+			// 	let record = {
+			// 		scaned: true,
+			// 		itemCode: label.itemCode,
+			// 		packingNumber: label.packingNumber,
+			// 		batch: label.batch,
+			// 		qty: Number(balance.qty),
+			// 		// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+			// 		uom: balance.uom,
+			// 		inventoryStatus: balance.inventoryStatus,
+			// 		balance: balance,
+			// 		toLocationCode: this.toLocationCode,
+			// 		supplierCode: label.supplierCode
+			// 	}
+			// 	return record;
+			// },
+
 			calcBatchHandleQty(batch) {
 				let handleQty = 0;
 				batch.Records.forEach(res => {
-					handleQty = calc.add(handleQty,res.qty)
+					handleQty = calc.add(handleQty, res.qty)
 				})
 				batch.handleQty = handleQty;
-				
-				this.dataContent.forEach(toLocationCode=>{
-					toLocationCode.Items.forEach(item=>{
-						var itemCodeHandleQty =0;
-						item.Locations.forEach(batch=>{
-							batch.Batchs.forEach(batchHandleQty=>{
-							itemCodeHandleQty=calc.add(itemCodeHandleQty,batchHandleQty.handleQty)
+
+				this.dataContent.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						var itemCodeHandleQty = 0;
+						item.Locations.forEach(batch => {
+							batch.Batchs.forEach(batchHandleQty => {
+								itemCodeHandleQty = calc.add(itemCodeHandleQty,
+									batchHandleQty.handleQty)
 							})
 						})
-						item.handleQty=itemCodeHandleQty;
+						item.handleQty = itemCodeHandleQty;
 					})
-					
+
 				})
 			},
 
-			addRecord(batch, label, balance, packageInfo) {
-				let record = this.creatRecord(label, balance, packageInfo);
+			addRecord(batch, label, packageInfo) {
+				let record = this.creatRecord(label, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
@@ -528,4 +552,4 @@
 		max-height: 300rpx;
 		padding: 10rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index cf33ab4c..3a4bfe98 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -298,8 +298,8 @@
 											let record = {};
 											record.handleQty = r.qty;
 
-											record.fromPackingNumber = r
-												.packingNumber;
+											// record.fromPackingNumber = r
+											// 	.packingNumber;
 											record.fromBatch = r.batch;
 											record.fromContainerNumber = r
 												.ContainerNumber;
@@ -311,25 +311,40 @@
 											record.toLocationCode = this
 												.toLocationCode;
 											record.supplierCode = r.supplierCode;
-
-											//使用在途库不改变管理模式
-											if (this.jobContent
-												.useOnTheWayLocation ==
-												'TRUE') {
+											
+											if(record.parentPackingNumber!='')
+											{
+												record.fromPackingNumber = record.parentPackingNumber;
 												record.toPackingNumber = r
 													.packingNumber;
-												record.toBatch = r.batch;
-											} else {
-												var info =
-													getPackingNumberAndBatch(
-														this.managementList, r
-														.itemCode,
-														r.packingNumber, r
-														.batch);
-												record.toPackingNumber = info
+											}
+											else
+											{
+												record.fromPackingNumber = record.packingNumber;
+												record.toPackingNumber = r
 													.packingNumber;
-												record.toBatch = info.batch;
 											}
+											record.toBatch = r.batch;
+											
+
+											// //使用在途库不改变管理模式
+											// if (this.jobContent
+											// 	.useOnTheWayLocation ==
+											// 	'TRUE') {
+											// 	record.toPackingNumber = r
+											// 		.packingNumber;
+											// 	record.toBatch = r.batch;
+											// } else {
+											// 	var info =
+											// 		getPackingNumberAndBatch(
+											// 			this.managementList, r
+											// 			.itemCode,
+											// 			r.packingNumber, r
+											// 			.batch);
+											// 	record.toPackingNumber = info
+											// 		.packingNumber;
+											// 	record.toBatch = info.batch;
+											// }
 											subItem.recordList.push(record);
 										})
 										commitSubList.push(subItem);