修改申请执行

fe/PDA/api/index.js

@@ -1643,12 +1643,19 @@ export const getInjectionRequestJobByRequest = (requestNumber) => promise(
 	})
 
 //注塑发料 是否有新任务
-export const isInjectionHasNewJob = (data) => promise(
+export const isInjectionHasNewJob = (requestNumber,data) => promise(
-	devUrl + "/api/pda/store/injection-request/isHasNewJob", {
+	devUrl + "/api/pda/store/injection-request/isHasNewJob?requestNumber="+requestNumber, {
 		method: 'post',
 		data: data
 	})
 	
+//注塑发料申请详情
+export const injectionRequestDetail = (id) => promise(
+	devUrl + "/api/pda/store/injection-request/"+id, {
+		method: 'get',
+		data: {}
+	})
+
 
 
 //注塑计划 申请
@@ -1823,8 +1830,8 @@ export const getCoatingRequestJobByRequest = (requestNumber) => promise(
 	})
 
 //喷涂发料 是否有新任务
-export const isCoatingHasNewJob = (data) => promise(
+export const isCoatingHasNewJob = (requestNumber,data) => promise(
-	devUrl + "/api/pda/store/coating-request/isHasNewJob", {
+	devUrl + "/api/pda/store/coating-request/isHasNewJob?requestNumber="+requestNumber, {
 		method: 'post',
 		data: data
 	})
@@ -1922,8 +1929,8 @@ export const getAssembleRequestJobByRequest = (requestNumber) => promise(
 	})
 
 //装配 发料 是否有新任务
-export const isAssembleHasNewJob = (data) => promise(
+export const isAssembleHasNewJob = (requestNumber,data) => promise(
-	devUrl + "/api/pda/store/assemble-request/isHasNewJob", {
+	devUrl + "/api/pda/store/assemble-request/isHasNewJob?requestNumber="+requestNumber, {
 		method: 'post',
 		data: data
 	})
@@ -1970,8 +1977,8 @@ export const getkittingRequestJobByRequest = (requestNumber) => promise(
 	})
 
 //kiting发料 是否有新任务
-export const iskittingHasNewJob = (data) => promise(
+export const iskittingHasNewJob = (requestNumber,data) => promise(
-	devUrl + "/api/pda/store/kitting-request/isHasNewJob", {
+	devUrl + "/api/pda/store/kitting-request/isHasNewJob?requestNumber="+requestNumber, {
 		method: 'post',
 		data: data
 	})
@@ -2063,8 +2070,8 @@ export const getSparePartRequestJobByRequest = (requestNumber) => promise(
 	})
 
 //备件发料 是否有新任务
-export const isSparePartHasNewJob = (data) => promise(
+export const isSparePartHasNewJob = (requestNumber,data) => promise(
-	devUrl + "/api/pda/store/spare-part-request/isHasNewJob", {
+	devUrl + "/api/pda/store/spare-part-request/isHasNewJob?requestNumber="+requestNumber, {
 		method: 'post',
 		data: data
 	})

fe/PDA/common/basic.js

@@ -206,7 +206,16 @@ export function getJobType(val) {
 	else if (val == 6) return 'IssueJob' //发料任务
 	else if (val == 7) return 'DeliverJob' //发货任务
 	else if (val == 8) return 'CheckJob' //校验任务
-	else if (val == 9) return 'CountJob' //盘点任务
+	else if (val == 9) return 'ByPackingCode' //盘点任务有箱码
+	else if (val == 10) return 'ByErpItemCode' //盘点任务无箱码
+	else if (val == 16) return 'ContainerTransferJob' //器具转移
+	else if (val == 17) return 'ThirdLocationJob' //三方库
+	else if (val == 18) return 'InjectionIssueJob' //注塑发料
+	else if (val == 19) return 'InjectionPlanJob' //注塑计划
+	else if (val == 20) return 'CoatingIssueJob' //喷涂发料
+	else if (val == 21) return 'AssembleIssueJob' //装配发料
+	else if (val == 22) return 'KittingIssueJob' //kitting发料
+	else if (val == 23) return 'SparePartIssueJob' //备品发料
 	else return 'Other'
 }
 

fe/PDA/mycomponents/coms/comUnPacking.vue

@@ -230,8 +230,13 @@
 						mask:true
 					})
 					var labelData = await getInventoryLabel(this.dataContent.recommendPackingCode)
-					
+					if(!newPackingCodeParam){
+						uni.hideLoading()
+						this.showMessage("箱码["+this.dataContent.recommendPackingCode+"]在标签表中不存在")
+						return;
+					}
 					var newPackingCodeParam = this.setNewPackingCodeParam(labelData,qty)
+					
 					var newPackingCodeData = await generateNewPacking(1,newPackingCodeParam);
 					var unPackingParams;
 					if(this.jobType==6){

fe/PDA/pages/index/index.vue

@@ -228,7 +228,10 @@
 				let that = this;
 				let isToday = this.$isReceiptToday;
 				let jobItems = await getJobCountAsync(isToday,localStorage.getItem('userId'));
+				jobItems.items.push({jobType:18,count:3})
 				let jobTypes = jobItems.items; //类型
+				
+				
 				if (menus != null && jobTypes != null) {
 					for (var g = 0; g < menus.length; g++) {
 						let group = menus[g];

fe/PDA/pages/request/assembleIssueRequestList.vue

@@ -114,11 +114,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.kittingRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isAssembleHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isAssembleHasNewJob(item.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					this.getList('refresh')
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/assembleIssueRequestListDetail.vue

@@ -189,11 +189,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.assembleRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isAssembleHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isAssembleHasNewJob(this.datacontent.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					navigateBack(1)
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/coatingIssueRequestList.vue

@@ -9,7 +9,7 @@
 			<!-- <comInjectIssue :dataContent="item"></comInjectIssue> -->
 		</view>
 		<uni-load-more :status="loadingType" v-if="deliverList.length>0" />
-	<!-- 	<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<!-- 	<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<win-mulit-scan ref="scanPopup" :titleArray="titleArray" @getScanResult='getScanResult'>
 		</win-mulit-scan> -->
 		<comMessage ref="comMessage"></comMessage>
@@ -97,28 +97,29 @@
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
-			}else if(e.index === 1){
+			} else if (e.index === 1) {
 				window.location.reload();
 			}
 		},
 		methods: {
-		async handle(item){
+			async handle(item) {
 				uni.showLoading({
-					title:"提交中",
+					title: "提交中",
-					mask:true
+					mask: true
 				})
-				try{
+				try {
 					var jobList = await getCoatingRequestJobByRequest(item.number)
 					var handleResult = await coatingRequestHandle(item.id)
 
-					var isHaveNewJobList=[];
+					var isHaveNewJobList = [];
-					jobList.forEach(res=>{
+					jobList.forEach(res => {
-						isHaveNewJobList.push(res.CoatingRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isCoatingHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isCoatingHasNewJob(item.number, isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
-				}catch(error){
+					this.getList('refresh')
+				} catch (error) {
 					uni.hideLoading()
 					this.showMessage(error)
 				}
@@ -152,7 +153,7 @@
 					this.pageIndex = 1;
 					this.deliverList = [];
 				}
-				getCoatingRequestList(that.pageIndex,that.pageSize,false)
+				getCoatingRequestList(that.pageIndex, that.pageSize, false)
 					.then(res => {
 						uni.hideLoading();
 						if (type === "refresh") {

fe/PDA/pages/request/coatingIssueRequestListDetail.vue

@@ -189,11 +189,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.coatingRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isCoatingHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isCoatingHasNewJob(this.datacontent.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					navigateBack(1)
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/injectionIssueRequestList.vue

@@ -114,11 +114,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.injectionRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isInjectionHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isInjectionHasNewJob(item.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					this.getList('refresh')
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)
@@ -182,7 +183,7 @@
 			
 			openDetail(item) {
 				uni.navigateTo({
-					url: './kittingIssueRequestListDetail?id=' + item.id + '&jobStatus=' + item.jobStatus
+					url: './injectionIssueRequestListDetail?id=' + item.id + '&jobStatus=' + item.jobStatus
 				});
 			},
 			showMessage(message) {

fe/PDA/pages/request/injectionIssueRequestListDetail.vue

@@ -90,7 +90,7 @@
 
 <script>
 	import {
-		getInjectionRequestList,
+		injectionRequestDetail,
 		injectionRequestHandle,
 		getInjectionRequestJobByRequest,
 		isInjectionHasNewJob
@@ -143,7 +143,7 @@
 					mask:false
 				})
 				let that = this;
-				getInjectionRequestList(that.id)
+				injectionRequestDetail(that.id)
 					.then(item => {
 						uni.hideLoading()
 						console.log('item', item);
@@ -189,11 +189,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.injectionRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isInjectionHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isInjectionHasNewJob(this.datacontent.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					navigateBack(1)
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/kittingIssueRequestList.vue

@@ -114,11 +114,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.kittingRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await iskittingHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await iskittingHasNewJob(item.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					this.getList('refresh')
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/kittingIssueRequestListDetail.vue

@@ -189,11 +189,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.kittingRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await iskittingHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await iskittingHasNewJob(this.datacontent.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					navigateBack(1)
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/sparePartIssueRequestList.vue

@@ -114,11 +114,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.kittingRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isSparePartHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isSparePartHasNewJob(item.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					this.getList('refresh')
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/sparePartIssueRequestListDetail.vue

@@ -189,11 +189,12 @@
 					
 					var isHaveNewJobList=[];
 					jobList.forEach(res=>{
-						isHaveNewJobList.push(res.SparePartRequestNumber);
+						isHaveNewJobList.push(res.number);
 					})
-					var isHaveNewJob = await isSparePartHasNewJob(isHaveNewJobList)
+					var isHaveNewJob = await isSparePartHasNewJob(this.datacontent.number,isHaveNewJobList)
 					uni.hideLoading()
 					this.showMessage(isHaveNewJob)
+					navigateBack(1);
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)

fe/PDA/pages/request/thirdLocationRequestList.vue

@@ -108,10 +108,15 @@
 				})
 				thirdLocationRequestCancle(item.id).then(res => {
 					uni.hideLoading()
-					uni.showToast({
+					if(res.error){
-						title:"取消成功"
+						this.showMessage("取消失败" + res.error.message)
-					})
+					}else {
-					this.getList('refresh');
+						uni.showToast({
+							title:"取消成功"
+						})
+						this.getList('refresh');
+					}
+					
 				}).catch(error => {
 					uni.hideLoading()
 					this.showMessage("取消失败" + error)

fe/PDA/pages/return/purchaseReturnRequestApprove.vue

@@ -55,7 +55,12 @@
 				skipCount: 0,
 				pageIndex: 0,
 				totalCount: 0,
-				filter: []
+				filter: [{
+					logic: "And",
+					column: "requestStatus",
+					action: "==",
+					value: "2"
+				}]
 			};
 		},
 
@@ -87,7 +92,7 @@
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
-			}else if(e.index === 1){
+			} else if (e.index === 1) {
 				window.location.reload();
 			}
 		},
@@ -125,7 +130,8 @@
 					skipCount: this.skipCount,
 					sorting: "",
 					condition: {
-						filters: this.filter
+						filters: this.filter,
+
 						// [
 						// {
 						// 	logic: "And",
@@ -167,7 +173,8 @@
 
 			openDetail(item) {
 				uni.navigateTo({
-					url: './purchaseReturnRequestApprove_detail?id=' + item.id +"&requestStatus="+item.requestStatus
+					url: './purchaseReturnRequestApprove_detail?id=' + item.id + "&requestStatus=" + item
+						.requestStatus
 				});
 			},
 

fe/PDA/pages/task/assembleIssueJobDetail.vue

@@ -250,6 +250,12 @@
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
+				if (this.jobStatus == 2) {
+					//取消承接任务	
+					cancelTakeAssembleIssueJob(this.id).then(res => {
+					}).catch(error => {
+					})
+				}
 				goHome();
 			} else if (e.index === 1) {
 				window.location.reload();

fe/PDA/pages/task/assembleIssueJobDetailByQty.vue

@@ -197,7 +197,6 @@
 				old: {
 					scrollTop: 0
 				},
-				ispending: false,
 				allCount: 0,
 				scanCount:0,
 				isPack: true,
@@ -320,10 +319,11 @@
 								r => {
 									r.scaned = false;
 									r.scanDate = new Date()
-
+									r.handledFromLocationCode=""
+									r.handledToLocationCode=""
 								}
 							);
-							that.ispending = item.jobStatus === 2;
+							
 							this.allCount = that.details[0].recommendFromQty;
 							this.scanCount = that.details[0].handledToQty;
 							that.details[0].defaultHandleQty = that.details[0].handledFromQty;
@@ -331,8 +331,8 @@
 							that.details[0].tempHandledFromQty =0
 							//查找收容数
 							getCountByItemCode(that.details[0].itemCode).then(res => {
+								uni.hideLoading();
 								if (res) {
-									uni.hideLoading();
 									var qty = res.qty;
 									this.shouRongCount = qty;
 									this.details[0].tempHandledToQty = qty;

fe/PDA/pages/task/coatingIssuleJob.vue

@@ -94,6 +94,15 @@
 		onShow() {
 			this.getList('refresh');
 		},
+		
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index === 1) {
+				window.location.reload();
+			}
+		},
 		methods: {
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup();

fe/PDA/pages/task/coatingIssuleJobDetail.vue

@@ -250,6 +250,12 @@
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
+				if (this.jobStatus == 2) {
+					//取消承接任务	
+					cancelTakeCoatingIssueJob(this.id).then(res => {
+					}).catch(error => {
+					})
+				}
 				goHome();
 			} else if (e.index === 1) {
 				window.location.reload();

fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue

@@ -322,7 +322,8 @@
 								r => {
 									r.scaned = false;
 									r.scanDate = new Date()
-
+									r.handledFromLocationCode=""
+									r.handledToLocationCode=""
 								}
 							);
 							that.ispending = item.jobStatus === 2;
@@ -333,8 +334,8 @@
 							that.details[0].tempHandledFromQty =0
 							//查找收容数
 							getCountByItemCode(that.details[0].itemCode).then(res => {
+								uni.hideLoading();
 								if (res) {
-									uni.hideLoading();
 									var qty = res.qty;
 									this.shouRongCount = qty;
 									this.details[0].tempHandledToQty = qty;

fe/PDA/pages/task/countFgDetail.vue

@@ -447,7 +447,7 @@
 						that.originalDetails = res.details;
 						that.allCount = res.details.length
 
-						that.scanAllDetails = res.depDetails;
+						that.scanAllDetails = res.depDetails.filter(r => r.inventoryStage == res.inventoryStage);
 						that.scanCount = res.depDetails.length
 						that.scanAllDetails.forEach(res=>{
 							res.IsDelete = false;

fe/PDA/pages/task/injectionIssueJobDetail.vue

@@ -250,6 +250,9 @@
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
+				cancelTakeInjectionIssueJob(this.id).then(res => {
+				}).catch(error => {
+				})
 				goHome();
 			} else if (e.index === 1) {
 				window.location.reload();

fe/PDA/pages/task/injectionIssueJobDetailByQty.vue

@@ -316,6 +316,8 @@
 								r => {
 									r.scaned = false;
 									r.scanDate = new Date()
+									r.handledFromLocationCode=""
+									r.handledToLocationCode=""
 
 								}
 							);
@@ -327,8 +329,8 @@
 							that.details[0].tempHandledFromQty =0
 							//查找收容数
 							getCountByItemCode(that.details[0].itemCode).then(res => {
+								uni.hideLoading();
 								if (res) {
-									uni.hideLoading();
 									var qty = res.qty;
 									this.shouRongCount = qty;
 									this.details[0].tempHandledToQty = qty;

fe/PDA/pages/task/kittingIssueJobDetail.vue

@@ -250,6 +250,12 @@
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
+				if (this.jobStatus == 2) {
+					//取消承接任务	
+					cancelTakeKittingIssueJob(this.id).then(res => {
+					}).catch(error => {
+					})
+				} 
 				goHome();
 			} else if (e.index === 1) {
 				window.location.reload();

fe/PDA/pages/task/kittingIssueJobDetailByQty.vue

@@ -220,7 +220,14 @@
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
+				if (this.jobStatus == 2) {
+					//取消承接任务	
+					cancelTakeKittingIssueJob(this.id).then(res => {
+					}).catch(error => {
+					})
+				} 
 				goHome();
+				
 			} else if (e.index === 1) {
 				window.location.reload();
 			}
@@ -316,7 +323,8 @@
 								r => {
 									r.scaned = false;
 									r.scanDate = new Date()
-
+									r.handledFromLocationCode = ""
+									r.handledToLocationCode = ""
 								}
 							);
 							that.ispending = item.jobStatus === 2;
@@ -327,8 +335,8 @@
 							that.details[0].tempHandledFromQty =0
 							//查找收容数
 							getCountByItemCode(that.details[0].itemCode).then(res => {
+								uni.hideLoading();
 								if (res) {
-									uni.hideLoading();
 									var qty = res.qty;
 									this.shouRongCount = qty;
 									this.details[0].tempHandledToQty = qty;

fe/PDA/pages/task/sparePartIssueJobDetail.vue

@@ -250,6 +250,12 @@
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
+				if (this.jobStatus == 2) {
+					//取消承接任务	
+					cancelTakeSparePartIssueJob(this.id).then(res => {
+					}).catch(error => {
+					})
+				}
 				goHome();
 			} else if (e.index === 1) {
 				window.location.reload();

fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue

@@ -316,6 +316,8 @@
 								r => {
 									r.scaned = false;
 									r.scanDate = new Date()
+									r.handledFromLocationCode = ""
+									r.handledToLocationCode = ""
 
 								}
 							);
@@ -327,8 +329,8 @@
 							that.details[0].tempHandledFromQty =0
 							//查找收容数
 							getCountByItemCode(that.details[0].itemCode).then(res => {
+								uni.hideLoading();
 								if (res) {
-									uni.hideLoading();
 									var qty = res.qty;
 									this.shouRongCount = qty;
 									this.details[0].tempHandledToQty = qty;
@@ -346,7 +348,6 @@
 					})
 					.catch(err => {
 						this.showMessage('未查找到详细信息')
-
 						uni.hideLoading();
 					});
 			},