diff --git a/src/mycomponents/balance/productionline.vue b/src/mycomponents/balance/productionline.vue
new file mode 100644
index 00000000..de155d5c
--- /dev/null
+++ b/src/mycomponents/balance/productionline.vue
@@ -0,0 +1,46 @@
+<template>
+	<view class="card_view">
+		<text class="card_packing_code">{{title}}</text>
+		<text class="card_content ">{{productionLineCode}}</text>
+	</view>
+</template>
+
+<script> 
+import {
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
+	export default {
+		components: {
+		},
+
+		data() {
+			return {
+				
+			};
+		},
+		props: {
+			productionLineCode: {
+				type: String,
+				default: ''
+			},
+			title:{
+				type:String,
+				default: '生产线'
+			},
+			isShowProductionline:{
+				type:Boolean,
+				default:false
+			}
+		},
+		mounted() {
+		},
+		methods: {
+			 
+		}
+	}
+</script>
+
+<style>
+</style>
+
+
diff --git a/src/mycomponents/balance/shift.vue b/src/mycomponents/balance/shift.vue
new file mode 100644
index 00000000..af509ce9
--- /dev/null
+++ b/src/mycomponents/balance/shift.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="card_view">
+		<text class="card_location ">{{title}}</text>
+		<text class="card_content ">{{shift}}</text>
+	</view>
+</template>
+
+<script> 
+import {
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
+	export default {
+		components: {
+		},
+
+		data() {
+			return {
+				
+			};
+		},
+		props: {
+			shift: {
+				type: String,
+				default: ''
+			},
+			title:{
+				type:String,
+				default: '班次'
+			},
+			isShowShift:{
+				type:Boolean,
+				default:false
+			}
+		},
+		mounted() {
+		},
+		methods: {
+			 
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index be5e64e9..3800c676 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -10,6 +10,9 @@
 				<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
 			<div class="u-p-l-10">
 				<goodsShelves v-if="isShowGoodsShelves && dataContent.itemGroup" :goodsShelves="dataContent.itemGroup"></goodsShelves>
+				<productionline v-if="isShowProductionline" :productionLineCode="dataContent.productionLineCode
+"></productionline>
+				<shift v-if="isShowShift" :shift="dataContent.shift"></shift>
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
@@ -35,6 +38,8 @@
 	import batch from '@/mycomponents/balance/batch.vue'
 	import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
 	import goodsShelves from '@/mycomponents/balance/goodsShelves.vue'
+	import productionline from '@/mycomponents/balance/productionline.vue'
+	import shift from '@/mycomponents/balance/shift.vue'
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
 	import level from '@/mycomponents/balance/level.vue'
 
@@ -47,7 +52,9 @@
 			intoDeliNo,
 			itemCompareQty,
 			level,
-			goodsShelves
+			goodsShelves,
+			productionline,
+			shift
 		},
 		data() {
 			return {};
@@ -97,7 +104,15 @@
 			isShowGoodsShelves:{
 				type:Boolean,
 				default:false
-			}
+			},
+			isShowProductionline:{
+				type:Boolean,
+				default:false
+			},
+			isShowShift:{
+				type:Boolean,
+				default:false
+			},
 		},
 
 
diff --git a/src/pages/productReceipt/coms/comProductJobCard.vue b/src/pages/productReceipt/coms/comProductJobCard.vue
index 594a2bfd..1cee6fde 100644
--- a/src/pages/productReceipt/coms/comProductJobCard.vue
+++ b/src/pages/productReceipt/coms/comProductJobCard.vue
@@ -1,7 +1,7 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
 		
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard  :dataContent="dataContent" :isShowProductionline='isShowProductionline' :isShowShift='isShowShift'></jobComMainDetailCard>
 		<view class='split_line' v-show="dataContent.acceptUserName"></view>
 		<jobAccept :dataContent="dataContent" v-show="dataContent.acceptUserName"></jobAccept>
 		<!-- <view class="task_item">
@@ -55,6 +55,14 @@
 				type: Object,
 				default: {}
 			},
+			isShowProductionline:{
+				type:Boolean,
+				default:false
+			},
+			isShowShift:{
+				type:Boolean,
+				default:false
+			},
 		},
 
 		methods: {
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 072486ae..44780eb4 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -241,9 +241,7 @@
 							}else{
 								that.jobContent.allowModifyLocation = 'FALSE'
 							}
-							// if (that.jobContent.allowModifyLocation == 'FALSE') {
-							// 	that.toLocationCode = that.subList[0].toLocationCode
-							// }
+							that.toLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
 							if (that.scanMessage) {
@@ -452,21 +450,30 @@
 			var hint = ""
 			for (var i = 0; i < this.detailSource.length; i++) {
 				var item = this.detailSource[i];
+				 let  handleQty = 0
 				for (var j = 0; j < item.subList.length; j++) {
-					var subItem = item.subList[i]
-					console.log(calc.sub(subItem.handleQty, subItem.qty) )
-					if (calc.sub(subItem.handleQty, subItem.qty) < 0 || calc.sub(subItem.handleQty, subItem.qty) > 0) {
-						isCheck = false;
-						hint = "批次【" + subItem.batch + "】实际收货数量:[" + subItem.handleQty + "]与包装数量[" + subItem.qty +
-							"]不相等，是否继续收货?"
-						break
-					}
-					
+						var subItem = item.subList[j]
+					handleQty = calc.add(handleQty,subItem.handleQty)
 				}
+				if(parseFloat(handleQty)<parseFloat(item.qty)){
+					hint = "物料号【" + item.itemCode + "】实际收货数量【" + handleQty + "】小于任务的收货数量【" + item.qty + 	"】，\n"
+					isCheck = false;
+				}
+				// for (var j = 0; j < item.subList.length; j++) {
+				// 	var subItem = item.subList[i]
+				// 	console.log(calc.sub(subItem.handleQty, subItem.qty) )
+				// 	if (calc.sub(subItem.handleQty, subItem.qty) < 0 || calc.sub(subItem.handleQty, subItem.qty) > 0) {
+				// 		isCheck = false;
+				// 		hint = "批次【" + subItem.batch + "】批次【" + subItem.batch + "】实际收货数量【" + subItem.handleQty + "】小于任务的收货数量【" + subItem.qty +
+				// 			"】，对于未收货部分将创建一个新的收货任务?"
+				// 		break
+				// 	}
+					
+				// }
 			}
 			console.log(isCheck)
 			if (!isCheck) {
-				this.showQuestMessage(hint, res => {
+				this.showQuestMessage(hint+'对于未收货部分将创建一个新的收货任务?', res => {
 					if (res) {
 						this.submitJob();
 					}
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index fb26b22e..f5ea377d 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -11,7 +11,7 @@
 				<view v-for="(item, index) in jobList" :key="index">
 					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
-						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'></com-product-job-card>
+						<com-product-job-card :dataContent="item" @click='openJobDetail(item)' :isShowProductionline='true' :isShowShift='true'></com-product-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -20,8 +20,8 @@
 			<job-info-popup ref='jobInfoPopup'></job-info-popup>
 
 			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
-			<win-scan-button @goScan='openScanPopup' v-if="manageModel!='BY_BATCH'&&jobList.length>0"></win-scan-button>
-			<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
+			<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
+			<winScanPackJob ref="scanPopup" @getResult='getScanResult' title='制品标签'></winScanPackJob>
 			<jobList ref="jobList" @selectItem="selectItem"></jobList>
 			<comMessage ref="comMessage"></comMessage>
 		</view>
@@ -181,13 +181,16 @@
 					action: "==",
 					value: this.type
 				})
-
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 				var params = {
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
 				}
-
 				getProductReceiptJobList(params).then(res => {
 					uni.hideLoading();
 					if (type === "refresh") {
@@ -205,8 +208,6 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-
-
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
@@ -341,22 +342,33 @@
 			},
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
+				if(item.status == 2 && item.acceptUserId && this.$store.state.user.id != item.acceptUserId){
+					this.showMessage("该任务已经被[" +  item.acceptUserName + "]承接" )
+					return;
+				}
+				
 				this.openJobDetail(item, this.scanMessage);
 			},
 			getScanResult(result) {
+				console.log(result)
+				if(!result.label.requestNumber ){
+					this.showMessage("该标签未关联到收货申请")
+					return;
+				}
 				try {
 					this.scanMessage = ""
-					var filters = [{
-							column: "packingNumber",
-							action: "in",
-							value: result.package.number + "," + result.package.parentNumber
-						},
+					var filters = [
 						{
-							column: "batch",
+							column: "request_number",
 							action: "==",
-							value: result.label.batch
+							value: result.label.requestNumber 
 						},
 						// {
+						// 	column: "batch",
+						// 	action: "==",
+						// 	value: result.label.batch
+						// },
+						// {
 						// 	column: "qty",
 						// 	action: "==",
 						// 	value: result.label.qty