From a0879581311efcda567430ac27e5caf70dc71163 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 5 Dec 2023 13:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99=20?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/record.js                              |   4 +
 pages/deliver/coms/comScanDeliverPack.vue     |  33 +-
 pages/deliver/job/deliverDetail2.vue          | 533 ------------------
 pages/issue/coms/comScanIssuePack.vue         |  38 +-
 pages/issue/record/issueRecord.vue            |  37 +-
 .../repleinsh/coms/comRepleishDetailCard.vue  |  16 +-
 pages/repleinsh/coms/comScanReplishPack.vue   |  26 +-
 pages/repleinsh/job/repleinshDetail.vue       |  17 +-
 pages/repleinsh/job/repleinshDetail2.vue      | 521 -----------------
 9 files changed, 111 insertions(+), 1114 deletions(-)
 delete mode 100644 pages/deliver/job/deliverDetail2.vue
 delete mode 100644 pages/repleinsh/job/repleinshDetail2.vue

diff --git a/common/record.js b/common/record.js
index 5e8fe283..353842eb 100644
--- a/common/record.js
+++ b/common/record.js
@@ -49,6 +49,8 @@ export function getBusinessType(typeCode, callback) {
 		businessType: '',
 		fromlocationTypeList: '',
 		tolocationTypeList: '',
+		fromInventoryStatuses:'',
+		toInventoryStatuses:'',
 		message: ''
 	};
 	getBusinesstypeByCode(typeCode).then(res => {
@@ -56,6 +58,8 @@ export function getBusinessType(typeCode, callback) {
 			result.businessType = res.data.list[0];
 			result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes)
 			result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes)
+			result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses;
+			result.toInventoryStatuses = res.data.list[0].inInventoryStatuses;
 			callback(result)
 		} else {
 			result.success = false;
diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue
index e3ed35ac..8b02061f 100644
--- a/pages/deliver/coms/comScanDeliverPack.vue
+++ b/pages/deliver/coms/comScanDeliverPack.vue
@@ -138,7 +138,7 @@
 				fromLocationList: [],
 				fromLocationCode: '',
 				fromLocation: null,
-				issueRecord: [], //发货历史
+				issueRecord: [], //补料历史
 				expand: true,
 				scanOptions: {},
 				editItem: {},
@@ -212,7 +212,7 @@
 				let location = this.fromLocationList.find(r => r == fromlocation)
 				if (location == undefined) {
 					this.fromLocationCode = ''
-					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+					this.showErrorMessage('补料库位【' + fromlocation + '】不存在')
 				}
 			},
 			onScan(result) {
@@ -225,12 +225,13 @@
 						});
 						return;
 					}
+					let packageInfo = result.package;
 					let itemCode = result.label.itemCode;
 					let packingCode = result.label.packingNumber;
 					let lot = result.label.batch;
 					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
 					if (item == undefined) {
-						that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细',
+						that.showErrorMessage('未查找到零件【' + itemCode + '】的补料明细',
 							res => {
 								that.getfocus();
 							}
@@ -251,7 +252,7 @@
 										})
 								} else if (balanceRes.data.list.length == 1) {
 									let balance = balanceRes.data.list[0];
-									this.afterGetBalance(result.label, balance);
+									this.afterGetBalance(result.label, balance,packageInfo);
 								} else {
 									this.label =result.label;
 									this.showBalanceSelect(balanceRes.data.list);
@@ -273,7 +274,7 @@
 			},
 			
 
-			afterGetBalance(label, balance) {
+			afterGetBalance(label, balance,packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -294,11 +295,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance)
+										that.addRecord(batch, label, balance,packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance);
+											that.addRecord(batch, label, balance,packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -308,7 +309,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance)
+									that.addRecord(batch, label, balance,packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -320,21 +321,21 @@
 						} else {
 							if (this.jobContent.AllowModifyBatch == null) {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
-									'】的发货明细,是否要继续发货?', res => {
+									'】的补料明细,是否要继续补料?', res => {
 										if (res) {
 											let batch = that.createBatchInfo(label, balance);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
 							} else {
-								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+								that.showErrorMessage('未查找到批次【' + lot + '】的补料明细',
 									res => {
 										that.getfocus();
 									});
 							}
 						}
 					} else {
-						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的补料明细',
 							res => {
 								that.getfocus();
 							}
@@ -363,12 +364,14 @@
 				return batch;
 			},
 
-			creatRecord(label, balance) {
+			creatRecord(label, balance,packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
-					qty: Number(label.qty)>Number(label.balance)?Number(label.balance):Number(label.qty),
+					qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
@@ -386,8 +389,8 @@
 				batch.handleQty = handleQty;
 			},
 
-			addRecord(batch, label, balance) {
-				let record = this.creatRecord(label, balance);
+			addRecord(batch, label, balance,packageInfo) {
+				let record = this.creatRecord(label, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
diff --git a/pages/deliver/job/deliverDetail2.vue b/pages/deliver/job/deliverDetail2.vue
deleted file mode 100644
index 153a5f4f..00000000
--- a/pages/deliver/job/deliverDetail2.vue
+++ /dev/null
@@ -1,533 +0,0 @@
-<template>
-	<view class="page-wraper">
-		<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-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
-							@updateData="updateData" @openDetail="openDetail"
-							:locationTypeList="tolocationTypeList">
-						</com-detail-card>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-
-		
-		<view class="page-footer">
-			<view class="uni-flex u-col-center space-between padding_10"
-				style="background-color:ghostwhite; width: 100%; ">
-				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-						:locationTypeList="tolocationTypeList"></requiredLocation>
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-				</view>
-			</view>
-		</view>
-
-		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
-
-		<com-message ref="comMessage"></com-message>
-	</view>
-</template>
-
-<script>
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
-	import {
-		getDeliverDetail,
-		getBasicLocationByCode,
-		takeDeliverJob,
-		cancleTakeDeliverJob,
-		deliverJobSubmit
-	} from '@/api/request2.js';
-	import {
-		getLocationTypeArray
-	} from '@/common/array.js';
-
-	import {
-		getInventoryStatusName,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-
-	import {
-		goHome,
-		getCurrDateTime,
-		getPackingNumberAndBatch
-	} from '@/common/basic.js';
-
-	import {
-		getDataSource,
-		createRecordInfo,
-		calcHandleQty,
-		getScanCount
-	} from '@/common/detail.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import detailInfoPopup from '@/pages/deliver/coms/detailInfoPopup.vue'
-
-	export default {
-		components: {
-			winScanButton,
-			winScanPackAndLocation,
-			comMessage,
-			requiredLocation,
-			comDetailCard,
-			detailInfoPopup
-		},
-		data() {
-			return {
-				id: '',
-				received: false,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				managementList: [],
-				fromLocationCode: "",
-				toLocationCode: "",
-				toLocationInfo: {},
-				tolocationTypeList: [],
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.received = true;
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.received) {
-					//取消承接任务	
-					cancleTakeDeliverJob(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) {
-					takeDeliverJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getDeliverDetail(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.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
-							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
-							that.detailSource = getDataSource(that.subList)
-							that.getLocationInfo(that.toLocationCode);
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			getLocationInfo(locationCode) {
-				if (locationCode != '') {
-					getBasicLocationByCode(locationCode).then(res => {
-						if (res.data.list.length > 0) {
-							this.toLocationInfo = res.data.list[0]
-						}
-					})
-				}
-			},
-
-			calcHandleQty() {
-				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() {
-				this.calcHandleQty();
-			},
-
-			openDetail(item) {
-				this.$refs.detailInfoPopup.openPopup(item)
-			},
-
-			openScanPopup() {
-				let fromlocationCode = '';
-				let fromlocationList = [];
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					item.subList.forEach(l => {
-						//重复的库位不往里面插入
-						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
-							fromlocationList.push(l.fromLocationCode);
-						}
-						//来源库位赋默认值
-						if (fromlocationCode == '') {
-							if (!l.scaned) {
-								fromlocationCode = l.fromLocationCode;
-							}
-						}
-					})
-				}
-				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			getScanResult(result) {
-				try {
-					var packingNumber = result.balance.packingNumber;
-					var batch = result.balance.batch;
-					var qty = result.balance.qty;
-					var itemCode = result.balance.itemCode;
-					var locationCode = result.balance.locationCode;
-					var inventoryStatus = result.balance.inventoryStatus;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-
-					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-					} else {
-						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber &&
-								r.batch == batch
-						})
-						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-							} else {
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续发货?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
-												this.scanPopupGetFocus();
-											}
-										});
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-									this.calcHandleQty();
-								}
-							}
-						}
-					}
-				} catch (e) {
-					this.showMessage(e.message)
-				}
-			},
-
-
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
-
-			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.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this.subList.length + "]箱", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
-					}
-				}
-			},
-
-			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));
-
-						// deliverJobSubmit(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)
-						// })
-					} 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;
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-			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()
-					}
-				});
-			},
-
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showQuestionMessage(message, callback) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showQuestionMessage(message, res => {
-						if (res) {
-							callback(res);
-						}
-					});
-				})
-			},
-
-			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
-			},
-
-			scanPopupLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './deliverJob'
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
-</style>
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index fcbb192e..70f20728 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -85,6 +85,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 		<com-message ref="comMessage"></com-message>
 		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
 	</view>
@@ -95,6 +96,7 @@
 	import winComScan from '@/mycomponents/scan/winComScan.vue'
 	import balance from '@/mycomponents/balance/balance.vue'
 	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 
 	import {
 		getDetailOption,
@@ -114,7 +116,8 @@
 			comMessage,
 			winComScan,
 			balance,
-			balanceQtyEdit
+			balanceQtyEdit,
+			balanceSelect
 		},
 		props: {
 			title: {
@@ -141,7 +144,8 @@
 				editItem: {},
 				positionInfo: "请选择位置",
 				positionList: [],
-				defaultValueList: []
+				defaultValueList: [],
+				fromInventoryStatuses :"",
 			}
 		},
 		created() {
@@ -174,11 +178,15 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
+					that.fromInventoryStatuses =this.jobContent.outInventoryStatuses
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();
 				}
 			},
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
 
 			getFromLocationList() {
 				let list = [];
@@ -215,6 +223,7 @@
 						});
 						return;
 					}
+					let packageInfo = result.package;
 					let itemCode = result.label.itemCode;
 					let packingCode = result.label.packingNumber;
 					let lot = result.label.batch;
@@ -232,7 +241,7 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, "OK", balanceRes => {
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
 							if (balanceRes.success) {
 								if (balanceRes.data.list.length == 0) {
 									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
@@ -241,7 +250,7 @@
 										})
 								} else if (balanceRes.data.list.length == 1) {
 									let balance = balanceRes.data.list[0];
-									this.afterGetBalance(result.label, balance);
+									this.afterGetBalance(result.label, balance,packageInfo);
 								} else {
 									this.showBalanceSelect(balanceRes.data.list);
 								}
@@ -256,8 +265,11 @@
 					uni.hideLoading();
 				}
 			},
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance);
+			},
 
-			afterGetBalance(label, balance) {
+			afterGetBalance(label, balance,packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -278,11 +290,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance)
+										that.addRecord(batch, label, balance,packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance);
+											that.addRecord(batch, label, balance,packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -292,7 +304,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance)
+									that.addRecord(batch, label, balance,packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -347,12 +359,14 @@
 				return batch;
 			},
 
-			creatRecord(label, balance) {
+			creatRecord(label, balance,packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					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,
@@ -370,8 +384,8 @@
 				batch.handleQty = handleQty;
 			},
 
-			addRecord(batch, label, balance) {
-				let record = this.creatRecord(label, balance);
+			addRecord(batch, label, balance,packageInfo) {
+				let record = this.creatRecord(label, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 66d4730e..74807e48 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -30,7 +30,7 @@
 	</view>
 	<com-message ref="comMessage"></com-message>
 	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup>
-	<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+	<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
 	<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 	</com-scan-issue-pack>
 </template>
@@ -46,12 +46,15 @@
 		goHome,
 		updateTitle,
 		getRemoveOption,
-		getISODateTime
+		getISODateTime,
 	} from '@/common/basic.js';
 
 	import {
 		getDataSource
 	} from '@/pages/issue/js/issue.js';
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
 
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
@@ -83,11 +86,13 @@
 				detailOptions: [],
 				scanOptions: [],
 				fromType: "",
-				workShopCode: ""
+				workShopCode: "",
+				fromInventoryStatuses: "",
+				toInventoryStatuses: ""
 			}
 		},
 		mounted() {
-			this.goScan(true)
+
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
@@ -97,8 +102,25 @@
 				updateTitle("发料记录")
 			}
 
+			var typeCode = "Issue"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.fromInventoryStatuses = res.fromInventoryStatuses
+					this.toInventoryStatuses = res.toInventoryStatuses
+					this.goScan(true)
+				} else {
+					this.$refs.comMessage.showBreakMessage(res.message);
+				}
+			});
+
 		},
 		methods: {
+			closeScan(){
+				this.resizeCollapse();
+			},
 			resizeCollapse() {
 				this.$nextTick(r => {
 					this.$refs.comIssueDetailCard.forEach(r => {
@@ -216,7 +238,11 @@
 				var datacontent = {}
 				//克隆对象，深度克隆，防止双向绑定同一个变量
 				// Object.assign(datacontent, this.detailSource);
-				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+				var dataContent = {
+					allowModifyPackingNumber: "FALSE",
+					outInventoryStatuses: this.fromInventoryStatuses
+				}
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
 			},
 
 			closeScanPopup() {
@@ -243,6 +269,7 @@
 					})
 				}
 				// item.handleQty=itemHandleQty;
+				// this.closeScan();
 			},
 
 			setParams() {
diff --git a/pages/repleinsh/coms/comRepleishDetailCard.vue b/pages/repleinsh/coms/comRepleishDetailCard.vue
index afd9726b..731e0f58 100644
--- a/pages/repleinsh/coms/comRepleishDetailCard.vue
+++ b/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -5,7 +5,7 @@
 
 		<view v-for="(item,index) in dataContent.Items">
 			<uni-collapse ref="collapse">
-				<uni-collapse-item :open="true">
+				<uni-collapse-item :open="true" :show-animation="true">
 					<template v-slot:title>
 						<!-- 物品 -->
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
@@ -19,8 +19,8 @@
 								</location>
 							</view>
 							<view v-for="(batch,index) in loacation.Batchs">
-								<recommend-balance style='margin-left: 20px;' :detail="batch"
-									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								<recommend-balance style='margin-left: 20px;' :detail="batch" :isShowLocation="false"
+									:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
 								</recommend-balance>
 								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
 									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
@@ -115,7 +115,7 @@
 
 		methods: {
 			resizeCollapse() {
-				this.$nextTick(r => {
+				this.$nextTick(() => {
 					this.$refs.collapse.forEach(r => {
 						r.childrens.forEach(i => {
 							i.init();
@@ -133,12 +133,12 @@
 				}
 			},
 
-			edit(batch, item) {
+			edit(batch, record) {
 				let that = this;
-				that.editItem = item;
+				that.editItem = record;
 				that.batchItem = batch;
-				item.balance.balanceQty=item.balance.qty;
-				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+				record.balance.balanceQty = record.balance.qty;
+				that.$refs.balanceQtyEdit.openEditPopup(record.balance, record.qty);
 			},
 
 			detail(item) {
diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue
index ac813ae8..d441399f 100644
--- a/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/pages/repleinsh/coms/comScanReplishPack.vue
@@ -225,6 +225,7 @@
 						});
 						return;
 					}
+					let packageInfo = result.package;
 					let itemCode = result.label.itemCode;
 					let packingCode = result.label.packingNumber;
 					let lot = result.label.batch;
@@ -242,7 +243,7 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, "OK", balanceRes => {
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
 							if (balanceRes.success) {
 								if (balanceRes.data.list.length == 0) {
 									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
@@ -251,7 +252,7 @@
 										})
 								} else if (balanceRes.data.list.length == 1) {
 									let balance = balanceRes.data.list[0];
-									this.afterGetBalance(result.label, balance);
+									this.afterGetBalance(result.label, balance,packageInfo);
 								} else {
 									this.showBalanceSelect(balanceRes.data.list);
 								}
@@ -266,8 +267,11 @@
 					uni.hideLoading();
 				}
 			},
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance);
+			},
 
-			afterGetBalance(label, balance) {
+			afterGetBalance(label, balance,packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -288,11 +292,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance)
+										that.addRecord(batch, label, balance,packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance);
+											that.addRecord(batch, label, balance,packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -302,7 +306,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance)
+									that.addRecord(batch, label, balance,packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -357,12 +361,14 @@
 				return batch;
 			},
 
-			creatRecord(label, balance) {
+			creatRecord(label, balance,packageInfo) {
+				balance.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					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,
@@ -380,8 +386,8 @@
 				batch.handleQty = handleQty;
 			},
 
-			addRecord(batch, label, balance) {
-				let record = this.creatRecord(label, balance);
+			addRecord(batch, label, balance,packageInfo) {
+				let record = this.creatRecord(label, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 2833278f..48e32a23 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -192,7 +192,7 @@
 
 				//目前任务只到一个库位
 				var itemCodes = []
-				let locationCode = this.detailSource[0].toLocationCode
+				let locationCode = this.toLocationCode
 				this.detailSource.forEach(toLocation => {
 					toLocation.Items.forEach(item => {
 						itemCodes.push(item.itemCode)
@@ -223,9 +223,9 @@
 				repleinshJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成补料记录" + res.data)
 					} else {
-						this.showErrorMessage("提交失败" + res.msg)
+						this.showErrorMessage("提交失败[" + res.msg+"]")
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -251,7 +251,7 @@
 											.ContainerNumber;
 										record.toInventoryStatus = r
 											.inventoryStatus;
-										record.toLocationCode = subItem
+										record.toLocationCode = this
 											.toLocationCode;
 										record.supplierCode = r.supplierCode;
 
@@ -335,6 +335,7 @@
 						}
 					})
 				}
+				
 				// item.handleQty=itemHandleQty;
 			},
 
@@ -370,7 +371,7 @@
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					uni.navigateTo({
-						url: './issueJob'
+						url: './repleinshJob'
 					})
 				})
 			},
@@ -413,11 +414,7 @@
 			scanLocationCode(location, code) {
 				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
+					
 				})
 			},
 		}
diff --git a/pages/repleinsh/job/repleinshDetail2.vue b/pages/repleinsh/job/repleinshDetail2.vue
deleted file mode 100644
index ea971ec9..00000000
--- a/pages/repleinsh/job/repleinshDetail2.vue
+++ /dev/null
@@ -1,521 +0,0 @@
-<template>
-	<view class="page-wraper">
-		<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-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationTypeList='tolocationTypeList'>
-						</com-detail-card>
-					</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="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-						:locationTypeList="tolocationTypeList"></requiredLocation>
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-				</view>
-			</view>
-		</view>
-
-		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-
-		<repleinsh-detail-info-popup ref="jobDetailPopup"></repleinsh-detail-info-popup>
-		<com-message ref="comMessage"></com-message>
-	</view>
-</template>
-
-<script>
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
-	import {
-		getRepleinshJobDetail,
-		getBasicLocationByCode,
-		takeRepleinshJob,
-		cancleTakeRepleinshJob,
-		repleinshJobSubmit
-	} from '@/api/request2.js';
-	import {
-		goHome,
-		getCurrDateTime,
-		getPackingNumberAndBatch,
-		getInventoryStatusName,
-		getDirectoryItemArray
-	} from '@/common/basic.js';
-
-	import {
-		getDataSource,
-		createRecordInfo,
-		calcHandleQty,
-		getScanCount
-	} from '@/common/detail.js';
-
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import repleinshDetailInfoPopup from '@/pages/repleinsh/coms/repleinshDetailInfoPopup.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-
-	export default {
-		components: {
-			winScanButton,
-			winScanPackAndLocation,
-			requiredLocation,
-			comDetailCard,
-			repleinshDetailInfoPopup,
-			comMessage
-		},
-		data() {
-			return {
-				id: '',
-				received: false,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				managementList: [],
-				fromLocationCode: "",
-				toLocationCode: "",
-				tolocationTypeList: [],
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.received = true;
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.received) {
-					//取消承接任务
-					cancleTakeRepleinshJob(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) {
-					takeRepleinshJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getRepleinshJobDetail(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.detailSource = getDataSource(that.subList)
-
-							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
-							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			calcScanCount(closeScan) {
-				let items = this.subList.filter(r => {
-					if (r.scaned) {
-						return r;
-					}
-				})
-				this.scanCount = items != null ? items.length : 0;
-				if (this.scanCount == this.subList.length) {
-					this.closeScanPopup();
-				}
-			},
-
-			calcHandleQty() {
-				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() {
-				this.calcHandleQty();
-			},
-
-			openScanPopup() {
-				let fromlocationCode = '';
-				let fromlocationList = [];
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					item.subList.forEach(l => {
-						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
-							fromlocationList.push(l.fromLocationCode);
-						}
-						//来源库位赋默认值
-						if (fromlocationCode == '') {
-							if (!l.scaned) {
-								fromlocationCode = l.fromLocationCode;
-							}
-						}
-					})
-				}
-				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			getScanResult(result) {
-				try {
-					var packingNumber = result.balance.packingNumber;
-					var batch = result.balance.batch;
-					var qty = result.balance.qty;
-					var itemCode = result.balance.itemCode;
-					var locationCode = result.balance.locationCode;
-					var inventoryStatus = result.balance.inventoryStatus;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-
-					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-					} else {
-						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber &&
-								r.batch == batch
-						})
-						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-							} else {
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
-												this.scanPopupGetFocus();
-											}
-										});
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
-										result.balance.qty) : Number(result.label.qty);
-									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-									this.calcHandleQty();
-								}
-							}
-						}
-					}
-				} catch (e) {
-					this.showMessage(e.message)
-				}
-			},
-
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
-
-			openDetail(item) {
-				this.$refs.jobDetailPopup.openPopup(item)
-			},
-
-			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.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
-					}
-				}
-			},
-
-			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));
-
-						// repleinshJobSubmit(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)
-						// })
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
-					}
-				});
-
-
-			},
-
-			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()
-					}
-				});
-			},
-
-
-			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;
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showQuestionMessage(message, callback) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showQuestionMessage(message, res => {
-						if (res) {
-							callback(res);
-						}
-					});
-				})
-			},
-
-			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
-			},
-
-			scanPopupLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './repleinshJob'
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
-</style>