Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/api/request2.js

@@ -4154,9 +4154,10 @@ export function isCheckMesCode(code) {
  * 获取上架任务打印明细
  * @param {*}  
  */
-export  function getJimuPutawayJobDetail(ids) {
+export  function getJimuPutawayJobDetail(data) {
 	return  request({
-		url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA?masterIds="+ids,
-		method: "get",
+		url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA",
+		method: "post",
+		data:data
 	});
 }

src/mycomponents/package/packageCard.vue

@@ -93,6 +93,19 @@
 
 		},
 		watch: {
+			// 模拟扫描功能
+			dataContent: {
+				handler(newVal, oldVal) {
+					if(newVal.scaned){
+						newVal.copyContent = "HPQ;V1.0;I" + newVal.itemCode + ";P" + newVal.packingNumber + ";B" + newVal.batch + ";Q" + newVal.qty
+					}else{
+						newVal.copyContent = ''
+					}
+					console.log('newVal.copyContent',newVal.copyContent)
+				},
+				immediate: true,
+				deep: true
+			}
 
 		},
 		methods: {

src/mycomponents/recommend/recommend.vue

@@ -93,7 +93,19 @@
 
 		},
 		watch: {
-
+			// 模拟扫描功能
+			detail: {
+				handler(newVal, oldVal) {
+					if(newVal.scaned){
+						newVal.copyContent = "HPQ;V1.0;I" + newVal.itemCode + ";P" + newVal.packingNumber + ";B" + newVal.batch + ";Q" + newVal.qty
+					}else{
+						newVal.copyContent = ''
+					}
+					console.log('newVal.copyContent',newVal.copyContent)
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 		methods: {
 			copy() {

src/mycomponents/scan/winComScan.vue

@@ -145,6 +145,9 @@
 			this.placeholderValue = '请扫描' + this.placeholder;
 		},
 		methods: {
+			setItemCodeSimulate(scanMsg) {
+				this.scanMsg = scanMsg;
+			},
 			hide() {
 				// #ifdef APP-PLUS
 				// 只是解决软键盘的闪现

src/mycomponents/scan/winComScanFg.vue

@@ -139,6 +139,10 @@
 				}, 1000);
 				// #endif 
 			},
+			setItemCodeSimulate(itemCode,scanMsg) {
+				this.itemCode = itemCode;
+				this.scanMsg = scanMsg;
+			},
 			setItemCode(itemCode) {
 				this.itemCode = itemCode;
 			},

src/mycomponents/scan/winScanFgLabel.vue

@@ -21,6 +21,8 @@
 				</view>
 			</view>
 		</uni-popup>
+		<!-- 模拟扫描功能 -->
+		<win-com-scan-fg v-show="false" ref="comscansimulate" @getResult="getScanResult" :isShowHistory="false" :clearResult="true"></win-com-scan-fg>
 		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
 	</view>
 </template>
@@ -52,6 +54,11 @@
 
 		},
 		methods: {
+			//模拟扫描功能
+			simulateScan(item){
+				this.$refs.comscansimulate.setItemCodeSimulate(item.itemCode,item.copyContent)
+				this.$refs.comscansimulate.clickScanMsg();
+			},
 			openScanPopup(itemCode) {
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')

src/mycomponents/scan/winScanPack.vue

@@ -20,6 +20,8 @@
 				</view>
 			</view>
 		</uni-popup>
+		<!-- 模拟扫描功能 -->
+		<win-com-scan v-show="false" ref="comscansimulate"  @getResult="getScanResult" :headerType="headerType" :isShowHistory="false" :clearResult="true"></win-com-scan>
 		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
 	</view>
 </template>
@@ -55,6 +57,10 @@
 
 		},
 		methods: {
+			simulateScan(item){
+				this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
+				this.$refs.comscansimulate.clickScanMsg();
+			},
 			openScanPopup() {
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
@@ -75,6 +81,7 @@
 			},
 
 			getScanResult(result) {
+				
 				if (result.success) {
 					this.$emit("getResult", result);
 				} else {

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -46,6 +46,9 @@
 			</view>
 		</uni-popup>
 		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<!-- 模拟扫描功能 -->
+		<win-com-scan v-show="false" ref="comscansimulate"  @getResult="getScanResult" :headerType="headerType" :isShowHistory="false" :clearResult="true"></win-com-scan>
+		
 	</view>
 	<comMessage ref="comMessage"></comMessage>
 </template>
@@ -172,6 +175,38 @@
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 			},
+			//模拟扫描
+			openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent,item) {
+				this.fromLocationCode = fromLocationCode;
+				this.fromLocationList = fromLocationList;
+				if (fromLocationCode != '') {
+					// this.packGetFocus();
+					if (this.$refs.comscansimulate != undefined) {
+						this.$refs.comscansimulate.getfocus();
+					}
+					
+				} else {
+					if (this.fromLocationList.length == 0) {
+						// this.locationGetFocus();
+						alert('没有来源库位：List')
+					} else {
+						this.fromLocationCode = this.fromLocationList[0];
+					}
+				}
+				
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+				 let timer = setTimeout(res => {
+					 if(timer){
+						 clearTimeout(timer)
+					 }
+					 // this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
+					 // this.$refs.comscansimulate.clickScanMsg();
+				}, 500)
+				
+				
+			},
 
 			closeScanPopup(content) {
 				this.$refs.popup.close();

src/pages/pointPutawayJob/index.vue

@@ -14,7 +14,7 @@
 					创建人：<text>{{data.creator||''}}</text>
 				</view>
 				<view class="mb-text">
-					创建时间：<text>{{data.createTime}}</text>
+					创建时间：<text>{{formatDate(data.createTime)}}</text>
 				</view>
 			</view>
 			<u-table style="margin-top: 20rpx;">
@@ -50,6 +50,9 @@
 	import {
 		getJimuPutawayJobDetail 
 	} from '@/api/request2.js';
+	import {
+		dateFormat
+	} from '@/common/basic.js';
 	// 打印页面的模板
 	const htmlFileUrl = '/hybrid/html/pointPutawayJob.html';
 	import {
@@ -93,8 +96,11 @@
 				}, function(e) {
 					console.log("获取图片资源失败：" + e.message);
 				});
-			}
+			},
 			// #endif
+			formatDate(val) {
+				return dateFormat(val)
+			}
 		},
 		watch: {
 			isLoadFinish: {
@@ -115,7 +121,9 @@
 			}
 		},
 		async onShow() {
-			await getJimuPutawayJobDetail(this.data.ids).then(res=>{
+			await getJimuPutawayJobDetail({
+				masterIds:this.data.ids
+			}).then(res=>{
 				this.data.sublist = res.data
 			})
 			// 获取数据
@@ -187,7 +195,7 @@
 									创建人：<span>${this.data.creator}</span>
 								</div>
 								<div class="mb-text">
-									创建时间：<span>${this.data.createTime}</span>
+									创建时间：<span>${this.formatDate(this.data.createTime)}</span>
 								</div>
 							</div>
 							<table style="margin-top: 20rpx;" style='border-collapse: collapse;'>

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -199,21 +199,23 @@
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
+							
+							that.isCheckLocation = getSwitchInfoByCode(that.switchCode)
+							if (that.isCheckLocation) {
+								that.toLocationCode = ""
+							} else {
+								that.toLocationCode = that.jobToLocationCode;
+							}
 							that.detailSource.forEach(r => {
 								r.subList.forEach(s => {
 									if (this.scanedPackingNumber && this.scanedPackingNumber == s
 										.packingNumber) {
 											s.scaned = true
-											s.handleQty =s.qty
+											// s.handleQty =s.qty
+											this.openScanPopupSimulate(s)
 										}
 								})
 							})
-							that.isCheckLocation = getSwitchInfoByCode(that.switchCode)
-							if (that.isCheckLocation) {
-								that.toLocationCode = ""
-							} else {
-								that.toLocationCode = that.jobToLocationCode;
-							}
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -247,6 +249,25 @@
 			openDetail(item) {
 				this.$refs.detailInfoPopup.openPopup(item)
 			},
+			openScanPopupSimulate(item) {
+				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.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							fromlocationCode = l.fromLocationCode;
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,item);
+			},
 
 			openScanPopup() {
 				let fromlocationCode = '';

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -231,7 +231,11 @@
 							that.detailSource.forEach(r => {
 								r.subList.forEach(s => {
 									if (this.scanedPackingNumber && this.scanedPackingNumber == s
-										.packingNumber) s.scaned = true
+										.packingNumber) {
+											s.scaned = true
+											//模拟扫描功能
+											this.$refs.scanPopup.simulateScan(s);
+										}
 								})
 							})
 

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -224,7 +224,8 @@
 									if (this.scanedPackingNumber && this.scanedPackingNumber == s
 										.packingNumber){
 											s.scaned = true
-											s.handleQty =s.qty
+											this.$refs.scanPopup.simulateScan(s);
+											// s.handleQty =s.qty
 										} 
 								})
 							})

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -102,6 +102,9 @@
 	import {
 		productDismantleJobClose
 	} from '@/api/request2.js';
+	import {
+		nextTick
+	} from 'vue';
 
 	export default {
 		name: 'receipt_detail',
@@ -137,7 +140,7 @@
 
 		onLoad(option) {
 			this.id = option.id;
-			// this.scanedPackingNumber = option.scaned || '';
+			this.scanedPackingNumber = option.scaned || '';
 			this.operation = option.operation;
 			if (this.id != undefined) {
 				//新建的任务自动接收
@@ -219,13 +222,19 @@
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.detailSource = getTreeDataSource(that.subList)
+							that.isAllReceived = false;
+							nextTick(() => {
 								that.detailSource.forEach(r => {
 									r.subList.forEach(s => {
-									if (this.scanedPackingNumber && this.scanedPackingNumber == s
-										.packingNumber) s.scaned = true
+										if (this.scanedPackingNumber && this
+											.scanedPackingNumber == s
+											.packingNumber) {
+											s.scaned = true
+											this.$refs.scanPopup.simulateScan(s);
+										}
+									})
 								})
 							})
-							that.isAllReceived = false;
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -423,7 +432,7 @@
 							mask: true
 						});
 						productDismantleJobClose(this.id).then(res => {
-							console.log('拒收',res)
+							console.log('拒收', res)
 							if (res.data) {
 								navigateBack(1)
 							} else {
@@ -459,14 +468,15 @@
 									title: "提交成功,将跳转到打印页面",
 									mask: true
 								});
+
 								// 获取上架任务
 								let timerCount = 0
-								const timer1 = setInterval(async ()=>{
-									if(timerCount == 10){
+								const timer1 = setInterval(async () => {
+									if (timerCount == 15) {
 										clearInterval(timer1)
-										uni.showLoading({
+										uni.showToast({
 											title: "跳转打印页面失败",
-											mask: true
+											icon: "none"
 										});
 										return;
 									}
@@ -474,30 +484,36 @@
 										filters: [{
 											column: "purchaseReceiptRecordNumber",
 											action: "in",
-											value: res.data
+											value: res.data.number
 										}],
 										pageNo: 1,
 										pageSize: 1000,
-									}).then(res=>{
+									}).then(res1 => {
 										timerCount = timerCount + 1
-										console.log(11111)
-										if(res.data && res.data.list&&res.data.list.length){
+										if (res1.data && res1.data.list && res1.data
+											.list.length && (res1.data.total >= res
+												.data.detailCount)) {
 											uni.hideLoading()
 											clearInterval(timer1)
 											const dataParams = {
-												toLocationCode: res.data.list[0].toLocationCode,
-													number: res.data.list[0].number,
-													creator: res.data.list[0].creator,
-													createTime: res.data.list[0].createTime,
-													ids : res.data.list.map(item=>item.masterId).join(',')
+												toLocationCode: res1.data.list[0]
+													.toLocationCode,
+												number: res1.data.list[0].number,
+												creator: res1.data.list[0].creator,
+												createTime: res1.data.list[0]
+													.createTime,
+												ids: res1.data.list.map(item =>
+													item.masterId).join(',')
 											}
 											console.log(dataParams)
 											uni.navigateTo({
-												url:'/pages/pointPutawayJob/index?data='+encodeURIComponent(JSON.stringify(dataParams))
+												url: '/pages/pointPutawayJob/index?data=' +
+													encodeURIComponent(JSON
+														.stringify(dataParams))
 											})
 										}
 									})
-								},1000)
+								}, 2000)
 
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")

src/pages/putaway/job/putawayDetail.vue

@@ -190,15 +190,6 @@
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getTreeDataSource(that.subList)
-
-							that.detailSource.forEach(r => {
-								r.subList.forEach(s => {
-									if (this.scanedPackingNumber && this.scanedPackingNumber == s
-										.packingNumber) s.scaned = true
-									s.inventoryStatus = s.inspectResult; //更新检验结果状态
-								})
-							})
-
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.jobToLocationCode = that.subList[0].toLocationCode;
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
@@ -208,6 +199,18 @@
 							} else {
 								that.toLocationCode = that.jobToLocationCode;
 							}
+							that.detailSource.forEach(r => {
+								r.subList.forEach(s => {
+									if (this.scanedPackingNumber && this.scanedPackingNumber == s
+										.packingNumber) {
+											s.scaned = true
+											s.packList.forEach(item=>item.scaned = true)
+											s.inventoryStatus = s.inspectResult; //更新检验结果状态
+											this.openScanPopupSimulate(s)
+										}
+										
+								})
+							})
 
 						} else {
 							that.showMessage('列表数据为0');
@@ -252,6 +255,27 @@
 				// this.calcHandleQty();
 				calcTreeHandleQty(this.detailSource)
 			},
+			//模拟扫描功能
+			openScanPopupSimulate(item){
+				
+				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.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							fromlocationCode = l.fromLocationCode;
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,item);
+			},
 
 			openScanPopup() {
 				let fromlocationCode = '';

src/pages/putaway/job/putawayJob.vue

@@ -298,7 +298,7 @@
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
 				uni.navigateTo({
-					url: './putawayDetail?id=' + item.masterId + '&status=' + item.status
+					url: './putawayDetail?id=' + item.masterId + '&status=' + item.status+'&scaned='+item.packingNumber
 				});
 			},
 			getScanResult(result) {