修改到货检验参数

common/basic.js

@@ -4,7 +4,7 @@ export {
 }
 
 let jobStatusList = [];
-let itemStatusList =[];
+let itemStatusList = [];
 let locationTypeList = [];
 let uomList = [];
 let inventoryStatusList = [];
@@ -635,7 +635,7 @@ export function queryManageModel(managementList, itemCode) {
 	}
 }
 
-export function getPackingNumberAndBatch(managementList, itemCode,packingNumber,batch) {
+export function getPackingNumberAndBatch(managementList, itemCode, packingNumber, batch) {
 	var itemInfo = {
 		packingNumber: "",
 		batch: ""
@@ -677,19 +677,26 @@ export function getPackingNumberAndBatch(managementList, itemCode,packingNumber,
 // 	scanErrorAudio();
 // }
 
-export function compare(key) {
+export function compareTime() {
+	return function(a, b) {
+		// 按照时间降序
+		return Date.parse(a.time) - Date.parse(a.time)
+	}
+}
+//升序
+export function compareAsc(key) {
 	return function(a, b) {
 		var val1 = a[key];
 		var val2 = b[key];
-		return val2 - val1;
+		return val1 - val2;
 	}
 }
-
+//倒序
 export function compareDesc(key) {
 	return function(a, b) {
 		var val1 = a[key];
 		var val2 = b[key];
-		return val1 - val2;
+		return val2 - val1;
 	}
 }
 
@@ -704,9 +711,9 @@ export function goHome() {
  */
 export function getTodayDate() {
 	var startTime = new Date(new Date().toLocaleDateString()).getTime();
-	var endTime = startTime+24*60*60*1000-1
-	console.log("获取时间",startTime+","+endTime)
-	return startTime+","+endTime;
+	var endTime = startTime + 24 * 60 * 60 * 1000 - 1
+	console.log("获取时间", startTime + "," + endTime)
+	return startTime + "," + endTime;
 }
 
 export function getCurrDate() {

mycomponents/qty/RecommendQty.vue

@@ -1,6 +1,5 @@
 <template>
 	<view>
-		推荐
 		<view class="uni-flex uni-row center">
 			<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
 			<view class="text_recommend ">

pages/inspect/coms/inspectComDetailCard.vue

@@ -2,6 +2,9 @@
 	<view class="" style="background-color: #fff;">
 		<view class="">
 			<view class="" style="font-size: 32rpx;margin-left: 20rpx;">
+				<view class="">
+					检验类型 : {{getInspectType(jobContent.inspectType)}}
+				</view>
 				<view class="">
 					收货数量 : {{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}
 				</view>
@@ -73,9 +76,9 @@
 		getDetailEditRemoveOption,
 		getDetailRemoveOption
 	} from '@/common/array.js';
-	
 	import {
-		getUnitInfo
+		getUnitInfo,
+		getInspectType
 	} from '@/common/directory.js';
 	
 	export default {
@@ -144,6 +147,10 @@
 		},
 
 		methods: {
+			getInspectType(value){
+				return getInspectType(value)
+			},
+			
 			swipeClick(e, item,index) {
 				if (e.content.text == "详情") {
 					this.detail(item)

pages/inspect/job/inspectDetail.vue

@@ -89,25 +89,28 @@
 				locationTypeList: [],
 				managementList: [],
 				selectedItem: {},
-				failedQty:0,
-				crackQty:0
+				failedQty: 0,
+				crackQty: 0,
+				inspectType: ""
 			};
 		},
 		onLoad(option) {
 			this.id = option.id;
 			this.failedQty = option.failedQty;
 			this.crackQty = option.crackQty;
+			this.inspectType = option.inspectType;
 
-			if (this.id != undefined) {
+			if (this.id != undefined && this.inspectType == "FULL") {
 				// 	//新建的任务自动接收
-				// if (option.status == "1") {
-				// 	this.receive((callback => {
-				// 		this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-				// }
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.received = true;
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			} else {
 				this.getDetail();
 			}
 
@@ -119,24 +122,24 @@
 			}
 		},
 
-		// onBackPress(e) {
-		// 	//已经接收但是没提交任务
-		// 	if (e.from == 'backbutton') {
-		// 		if (this.received) {
-		// 			//取消承接任务	
-		// 			cancleTakeInspectJob(this.id).then(res => {
-		// 				uni.navigateBack();
-		// 			}).catch(error => {
-		// 				uni.navigateBack();
-		// 			})
-		// 		} else {
-		// 			uni.navigateBack();
-		// 		}
-
-		// 		return true;
-		// 	}
-
-		// },
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.received) {
+					//取消承接任务	
+					cancleTakeInspectJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
 
 		onPullDownRefresh() {
 			this.getDetail();
@@ -178,7 +181,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
-							that.jobContent.failedQty= this.failedQty 
+							that.jobContent.failedQty = this.failedQty
 							that.jobContent.crackQty = this.crackQty;
 							that.subList = res.data.subList;
 							that.subList.forEach(res => {
@@ -318,6 +321,21 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				//如果是全检，必须全部扫描
+				if (this.inspectType == "FULL") {
+					if (this.scanCount == this.subList.length) {
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this
+							.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				} else {
 					//扫描数量和任务数量相等，直接提交
 					if (this.scanCount == this.subList.length) {
 						this.submitJob();
@@ -337,6 +355,8 @@
 								});
 						}
 					}
+				}
+
 			},
 
 			submitJob() {
@@ -447,7 +467,7 @@
 							// detail.produceDate = detail.balance.produceDate;
 							// detail.expireDate = detail.balance.expireDate;
 
-						}else {
+						} else {
 							detail.sampleQty = detail.qty;
 							detail.failedQty = 0;
 							detail.crackQty = 0;

pages/inspect/job/inspectJob.vue

@@ -173,14 +173,22 @@
 			},
 
 
-
 			openJobDetail(item) {
 				// uni.navigateTo({
 				// 	url: './inspectDetail?id=' + item.id + '&status=' + item.status
 				// });
+				
+				if(item.inspectType=="FULL"){
+					uni.navigateTo({
+						url: './inspectDetail?id=' + item.id + '&status=' + item.status+'&inspectType=' + item.inspectType
+					});
+				}else {
 					uni.navigateTo({
 						url: './inspectResult?id=' + item.id + '&status=' + item.status
 					});
+				}
+				
+				
 			},
 
 			showItemList(itemList) {

pages/inspect/job/inspectResult.vue

@@ -50,9 +50,9 @@
 				<view class="pda-list-cell-left">
 					<view class="uni-label">不合格数量</view>
 				</view>
-				<view class="pda-list-cell-db" >
-					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字"
-						v-model="jobContent.failedQty" @blur="failedQtyConfirm" class="count-input">
+				<view class="pda-list-cell-db">
+					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty"
+						@blur="failedQtyConfirm" class="count-input">
 					</uni-easyinput>
 				</view>
 			</view>
@@ -62,18 +62,18 @@
 				<view class="pda-list-cell-left">
 					<view class="uni-label">报废数量</view>
 				</view>
-				<view class="pda-list-cell-db" >
+				<view class="pda-list-cell-db">
 					<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur=""
 						class="count-input">
 					</uni-easyinput>
 				</view>
 			</view>
 
-			<view class="pda-list-cell" >
+			<view class="pda-list-cell">
 				<view class="pda-list-cell-left">
 					<view class="uni-label">下一步动作</view>
 				</view>
-				<view class="pda-list-cell-db" >
+				<view class="pda-list-cell-db">
 					<uni-data-picker class='uni-data-picker' placeholder="请选择下一步动作" popup-title="下一步动作"
 						@change="nextStepChange" :localdata="nextActionList" v-model="nextAction">
 					</uni-data-picker>
@@ -84,9 +84,9 @@
 				<view class="pda-list-cell-left">
 					<view class="uni-label">最终不合格</view>
 				</view>
-				<view class="pda-list-cell-db" >
-					<uni-easyinput placeholder="待计算" type="number" :disabled="true"
-						v-model="jobContent.notPassedQty" class="count-input">
+				<view class="pda-list-cell-db">
+					<uni-easyinput placeholder="待计算" type="number" :disabled="true" v-model="jobContent.notPassedQty"
+						class="count-input">
 					</uni-easyinput>
 				</view>
 			</view>
@@ -248,10 +248,10 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.detailList = res.data.subList;
-							that.inspectType =that.jobContent.inspectType;
+							that.inspectType = that.jobContent.inspectType;
 							that.jobContent.goodQty = null, //合格数量
-							that.jobContent.failedQty = null,//不合格数量
-							that.jobContent.crackQty = null,//报废数量
+								that.jobContent.failedQty = null, //不合格数量
+								that.jobContent.crackQty = null, //报废数量
 								that.jobContent.notPassedQty = null; //最终不合格数量
 						} else {
 							that.showMessage('列表数据为0');
@@ -291,27 +291,28 @@
 				return getUnitInfo(value).label
 			},
 
-			nextStepChange(e){
+			nextStepChange(e) {
 				this.nextAction = e.detail.value[0].value;
 				this.calcNotPassQty();
 			},
 
-			calcNotPassQty(){
+			calcNotPassQty() {
 				var failedQty = Number(this.jobContent.failedQty == null ? 0 : this.jobContent.failedQty)
 				//检验类型：全检(全部合格)
-				if (this.inspectType == 'FUll' ) {
+				if (this.inspectType == 'FUll') {
 					//最终不合格数量等于不合格数量
 					this.jobContent.notPassedQty = failedQty
-				}else if(this.inspectType == 'SAMPLING'){
+				} else if (this.inspectType == 'SAMPLING') {
 					//检验类型：抽检
 					//下一步动作
 					//全检、部分合格
-					if (this.nextAction == "FULL_INSPECT"||this.nextAction == "PARTIAL_OK") {
+					if (this.nextAction == "FULL_INSPECT" || this.nextAction == "PARTIAL_OK") {
 						// 最终不合格数量=不合格数量
 						this.jobContent.notPassedQty = failedQty
-					}else if(this.nextAction=="ALL_NOK"){
+					} else if (this.nextAction == "ALL_NOK") {
 						//最终不合格数量=收货数量-报废数量
-						this.jobContent.notPassedQty = Number(this.jobContent.receiveQty)-Number(this.jobContent.crackQty==null?0:this.jobContent.crackQty)
+						this.jobContent.notPassedQty = Number(this.jobContent.receiveQty) - Number(this.jobContent
+							.crackQty == null ? 0 : this.jobContent.crackQty)
 
 					}
 				}
@@ -342,24 +343,38 @@
 
 				//不合格数量==0、(全部合格)、明细全部合格
 				if (failedQty == 0) {
-					//直接提交
-					this.jobContent.subList.forEach(res=>{
+					if (crackQty == 0) {
+						//报废数==0，直接提交
+						this.jobContent.subList.forEach(res => {
 							res.handleQty = res.qty
 							res.failedQty = 0;
 							res.notPassedQty = 0;
 							res.crackQty = 0;
-						res.goodQty = this.jobContent.receiveQty;
-						res.toInventoryStatus = res.inventoryStatus
-						res.failedReason ="";
+							res.goodQty = res.qty;
+							res.failedReason = "";
 							res.photos = ""
-						res.inspectResult =""
-						res.inspectUser =this.$store.state.user.id
+							res.inspectResult = ""
+							res.toInventoryStatus = "OK"
+							res.inspectUser = this.$store.state.user.id
 						})
 
-					this.jobContent.nextAction = this.nextAction;
+						this.jobContent.nextAction = "";
+						this.jobContent.goodQty = this.jobContent.receiveQty
 						this.submitJob(this.jobContent)
 
 					} else {
+						//报废数大于0，进入详情
+						//进入下一页面
+						uni.navigateTo({
+							url: './inspectDetail?id=' + this.id +
+								'&status=' + this.status +
+								'&failedQty=' + this.jobContent.failedQty +
+								'&crackQty=' + this.jobContent.crackQty
+						});
+					}
+
+				} else {
+
 					//不合格数量>0
 					//下一步动作
 					if (this.nextAction == null) {
@@ -369,64 +384,74 @@
 					//全不合格
 					if (this.nextAction == "ALL_NOK") {
 						//提交
-						this.jobContent.subList.forEach(res=>{
+						this.jobContent.subList.forEach(res => {
 							res.handleQty = res.qty
-							res.failedQty = this.jobContent.receiveQty;
-							res.notPassedQty = this.jobContent.receiveQty;
+							res.failedQty = res.qty;
+							res.notPassedQty = res.qty;
 							res.crackQty = 0;
 							res.goodQty = 0;
-							res.toInventoryStatus = "NOK"
-							res.failedReason ="";
+							res.failedReason = "";
 							res.photos = ""
-							res.inspectResult =""
-							re.inspectUser =this.$store.state.user.id
+							res.inspectResult = ""
+							res.toInventoryStatus = "NOK"
+							re.inspectUser = this.$store.state.user.id
 						})
 						this.jobContent.nextAction = this.nextAction;
+						this.jobContent.goodQty = 0
 						this.submitJob(this.jobContent)
 						//部分合格
 					} else if (this.nextAction == "PARTIAL_OK") {
 						//进入下一页面
 						uni.navigateTo({
 							url: './inspectDetail?id=' + this.id +
-							 '&status=' + this.status+
-							 '&failedQty=' + this.jobContent.failedQty+
+								'&status=' + this.status +
+								'&failedQty=' + this.jobContent.failedQty +
 								'&crackQty=' + this.jobContent.crackQty
 						});
-						//全检===全部合格
+						//全检 生成全检任务
 					} else if (this.nextAction == "FULL_INSPECT") {
 						//提交
-						this.jobContent.subList.forEach(res=>{
+						this.jobContent.subList.forEach(res => {
 							res.handleQty = res.qty
 							res.failedQty = 0;
 							res.notPassedQty = 0;
 							res.crackQty = 0;
-							res.goodQty = this.jobContent.receiveQty;
-							res.toInventoryStatus = res.inventoryStatus
-							res.failedReason ="";
+							res.goodQty = res.qty;
+							res.failedReason = "";
 							res.photos = ""
-							res.inspectResult =""
+							res.inspectResult = ""
+							res.toInventoryStatus = "OK"
 							res.inspectUser = this.$store.state.user.id
 						})
+						this.jobContent.goodQty = this.jobContent.receiveQty
 						this.jobContent.nextAction = this.nextAction;
 						this.submitJob(this.jobContent)
 					}
+
 				}
+
 			},
-			submitJob(params){
+			submitJob(params) {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
 				console.log("提交参数", JSON.stringify(params));
-				inspectJobSubmit(params).then(res=>{
+				inspectJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data, )
+						var hint="";
+						if(this.jobContent.nextAction=="FULL_INSPECT"){
+							hint ="提交成功<br>生成到货检验任务" + res.data
+						}else {
+							hint ="提交成功<br>生成到货检验记录" + res.data
+						}
+						this.showCommitSuccessMessage(hint)
 					} else {
-						this.showErrorMessage("提交失败["+res.msg+"]")
+						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
 
-				}).catch(error=>{
+				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error)
 				})
@@ -440,8 +465,7 @@
 			},
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-					}
+					if (res) {}
 				});
 			},
 

pages/purchaseReceipt/job/receiptDetail.vue

@@ -45,7 +45,8 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
-		updateTitle
+		updateTitle,
+		compareAsc
 	} from '@/common/basic.js';
 
 	import {
@@ -107,7 +108,6 @@
 				} else {
 					this.getDetail();
 				}
-				
 			}
 		},
 		//返回首页
@@ -208,11 +208,14 @@
 								this.showMessage("箱码【" + packingNumber + "】已经扫描")
 							} else {
 								itemDetail.scaned = true;
+								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
 								itemDetail.handleQty = Number(result.label.qty);
 								itemDetail.toLocationCode = this.toLocationCode;
 								itemDetail.labelQty = Number(result.label.qty);
 								calcHandleQty(this.detailSource);
 								this.continueScan()
+								this.$forceUpdate()
+								var list =this.detailSource[0].subList;
 							}
 						}
 					}

pages/putaway/record/putawayRecord.vue

@@ -17,8 +17,8 @@
 				</scroll-view>
 			</view>
 
-			<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationTypeList="tolocationTypeList"></requiredLocation>
+			<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+				@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
 
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
@@ -112,15 +112,18 @@
 				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
 				fromType: "",
-				showToLoaction:true
+				showToLoaction: true
 			};
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
-			if(this.fromType=="requestType"){
				this.showToLoaction=false
-				updateTitle("原料上架申请")
			}else {
+			if (this.fromType == "requestType") {
+				this.showToLoaction = false
+				updateTitle("原料上架申请")
+			} else {
 				updateTitle("原料上架记录")
-				this.showToLoaction=true
+				this.showToLoaction = true
+
 			}
 			var typeCode = "PurchasePutaway"
 			getBusinessType(typeCode, res => {
@@ -130,7 +133,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
+					this.$refs.comMessage.showBreakMessage(res.message);
 				}
 			});
 		},
@@ -145,8 +148,7 @@
 
 		onPullDownRefresh() {},
 
-		mounted() {
-		},
+		mounted() {},
 		methods: {
 			getScanResult(result) {
 				let balance = result.balance;
@@ -248,7 +250,7 @@
 			},
 
 			commit() {
-				if (this.showToLoaction &&this.toLocationCode == "") {
+				if (this.showToLoaction && this.toLocationCode == "") {
 					this.showMessage("请先选择目标库位")
 					return;
 				}
@@ -258,7 +260,7 @@
 					mask: true
 				});
 
-				if(this.fromType=="requestType"){
+				if (this.fromType == "requestType") {
 					var params = this.setParams(false)
 					console.log("提交" + JSON.stringify(params))
 					// putawayRequestSubmit(params).then(res => {
@@ -272,7 +274,7 @@
 					// 	uni.hideLoading()
 					// 	this.showErrorMessage(error)
 					// })
-				}else {
+				} else {
 					//记录有目标库位，需要查询管理模式
 					var itemCodes = []
 					this.detailSource.forEach(item => {