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

src/mycomponents/package/packageCard.vue

@@ -19,7 +19,7 @@
 				<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined" :dataContent="dataContent"
 					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-					:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false">
+					:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus">
 				</compare-qty>
 
 				<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">

src/mycomponents/recommend/recommend.vue

@@ -18,7 +18,7 @@
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
 					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
-					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus">
 				</compare-qty>
 
 				<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -284,7 +284,11 @@
 				if (this.allowNullBalance) {
 					this.allowNoneBalance(datas);
 				} else if (this.noShowBalanceMessage) {
+					if(Array.isArray(datas)){
+						this.countCallBack(datas[0]);
+					}else{
 						this.countCallBack(datas);
+					}
 				} else {
 					this.mustHavaBalance(datas);
 				}

src/pages/pointProductReceipt/index.vue

@@ -12,8 +12,8 @@
 					<view class="value" id="name2">{{item.itemName}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">物料描述</view>
+					<view class="label">包装名称</view>
-					<view class="value">{{item.itemDesc1}}</view>
+					<view class="value">{{item.packName}}</view>
 				</view>
 				<view class="left-item">
 					<view class="label">包装号</view>
@@ -37,8 +37,8 @@
 					<view class="value">{{item.batch}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">班次</view>
+					<view class="label">物料类型</view>
-					<view class="value">{{item.shiftCode}}</view>
+					<view class="value">{{item.itemType}}</view>
 				</view>
 				<view class="left-item" >
 					<view class="label">打印时间</view>
@@ -117,20 +117,20 @@
 												<div class="value" id="name2">${item.itemName}</div>
 											</div>
 											<view class="left-item">
-												<view class="label">物料描述</view>
+												<view class="label">包装名称</view>
-												<view class="value">{{item.itemDesc1}}</view>
+												<view class="value">${item.packName}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">包装号</view>
-												<view class="value">{{item.relateNumber}}</view>
+												<view class="value">${item.relateNumber}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">生产线</view>
-												<view class="value">{{item.productionLineCode}}</view>
+												<view class="value">${item.productionLineCode}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">数量</view>
-												<view class="value">{{item.qty}}</view>
+												<view class="value">${item.qty}</view>
 											</view>
 										</div>
 										<div class="right">
@@ -139,15 +139,15 @@
 											</div>
 											<view class="left-item">
 												<view class="label">批次</view>
-												<view class="value">{{item.batch}}</view>
+												<view class="value">${item.batch}</view>
 											</view>
 											<view class="left-item">
-												<view class="label">班次</view>
+												<view class="label">物料类型</view>
-												<view class="value">{{item.shiftCode}}</view>
+												<view class="value">${item.itemType}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">打印时间</view>
-												<view class="value">{{item.printTimes}}</view>
+												<view class="value">${item.printTimes}</view>
 											</view>
 										</div>
 									</div>`

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -349,6 +349,7 @@
 				itemDetail.handleQty = Number(result.balance.qty)
 				itemDetail.balance = result.balance;
 				itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+				itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
 				itemDetail.balance.balanceQty = Number(result.balance.qty)
 				itemDetail.balance.packQty = Number(result.package.packQty)
 				itemDetail.balance.packUnit = result.package.packUnit

src/pages/productPutaway/record/productPutawayRecord.vue

@@ -153,6 +153,7 @@
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.fromInventoryStatus = balance.inventoryStatus;
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -166,6 +167,7 @@
 					})
 					if (detail == undefined) {
 						let newDetail = createDetailInfo(balance, pack);
+						newDetail.fromInventoryStatus = balance.inventoryStatus;
 						item.subList.push(newDetail);
 					} else {
 						if (detail.scaned == true) {

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -70,6 +70,7 @@
 	import {
 		getManagementPrecisions
 	} from '@/common/balance.js';
+	import { getCurrDateTime} from '@/common/basic.js';
 
 	import {
 		getProductReceiptJobDetail,
@@ -381,13 +382,15 @@
 							barcodeString: item.barcodeString, //标签
 							itemCode: item.itemCode || '', //物品代码
 							itemName: item.itemName || '', //物品名称
+							packName: item.packName || '', //包装名称
+							itemType: item.itemType || '', //物料类型
 							itemDesc1: item.itemDesc1 || '', //物品描述
 							relateNumber: item.relateNumber || '', //relateNumber包装号
 							batch: item.batch || '', //批次
 							productionLineCode: item.productionLineCode || '', //生产线
 							shiftCode: item.shiftCode || '', //班次
 							qty: item.qty || '', //数量
-							printTimes: item.printTimes || '' //打印时间
+							printTimes: getCurrDateTime() //打印时间
 						})
 					})
 					console.log('pointData', pointData)

src/pages/putaway/job/putawayDetail.vue

@@ -345,6 +345,9 @@
 									scanedLength++;
 								}
 							})
+							//大哥让加的
+							itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+							
 							if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
 								this.showMessage("箱码【" + packingNumber + "】已经扫描")
 							} else {

src/pages/putaway/record/putawayRecord.vue

@@ -172,6 +172,7 @@
 						newDetail.poLine=poLine;
 						newDetail.poNumber=poNumber;
 						newDetail.supplierCode=supplierCode;
+						newDetail.fromInventoryStatus = balance.inventoryStatus;
 						
 						itemp.subList.push(newDetail);
 						this.detailSource.push(itemp)
@@ -195,6 +196,8 @@
 							newDetail.poLine=poLine;
 							newDetail.poNumber=poNumber;
 							newDetail.supplierCode=supplierCode;
+							newDetail.fromInventoryStatus = balance.inventoryStatus;
+							
 							item.subList.push(newDetail);
 							calcHandleQty(this.detailSource);
 						});