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

src/pages/deliver/job/deliverDetail.vue

@@ -18,6 +18,10 @@
 						<view class="text_lightblue">客户寄售库</view>
 						<view>{{toLocationCode}}</view>
 					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">目标库位</view>
+						<view>{{toLocationCode}}</view>
+					</view>
 				</view>
 				<u-line />
 			</view>

src/pages/package/job/overPackageJobDetail.vue

@@ -11,19 +11,22 @@
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view v-for="(toLocation, index) in detailSource" :key="index">
-					<view class="" style="padding: 20rpx; font-size: 30rpx;">
+					<view class="cen_card" style="padding: 5rpx;" v-if='subList.length>0'>
-						<view>
+						<view class="cell_box uni-flex uni-row">
-							原始包装规格 : {{subList[0].fromPackUnit}}
+							<view class="cell_info">
-						</view>
+								<view class="text_lightblue">翻包前包装规格</view>
-						<view>
+								<view>
-							原始标包数量 : {{subList[0].fromPackQty}}
+									{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].fromPackUnit)}}
-						</view>
+								</view>
-						<view>
+							</view>
-							新包装规格 : {{subList[0].toPackUnit}}
+							<view class="cell_info">
-						</view>
+								<view class="text_lightblue">翻包后包装规格</view>
-						<view>
+								<view>
-							新标包数量 : {{subList[0].toPackQty}}
+									{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].toPackUnit)}}
+								</view>
+							</view>
 						</view>
+						<u-line />
 					</view>
 
 					<comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation"
@@ -80,6 +83,10 @@
 	import {
 		calc
 	} from '@/common/calc.js';
+	import {
+		getUomInfo,
+		getPackUnitName
+	} from '@/common/directory.js';
 
 	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 	import comOverPackJobDetailCard from '@/pages/package/coms/comOverPackJobDetailCard.vue'
@@ -321,7 +328,7 @@
 				overPageSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>" + res.data)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -534,6 +541,18 @@
 			closeScanPopup() {
 				this.updateCommitBtn();
 			},
+			getUomInfo(uom) {
+				let item = getUomInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			},
+			getPackUnitName(packUnit) {
+				let unit = getPackUnitName(packUnit);
+				return unit;
+			}
 		}
 	};
 </script>

src/pages/productionReceipt/job/productionReceiptDetail.vue

@@ -304,7 +304,7 @@
 
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.supplierCode = supplierCode
+									// itemDetail.supplierCode = supplierCode
 									itemDetail.handleQty = Number(result.balance.qty)
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
@@ -321,18 +321,6 @@
 				}
 			},
 
-			scanLocationCode(location, code) {
-				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					// })
-				})
-			},
-
 			commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
@@ -404,7 +392,7 @@
 						productionReceiptJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功<br>生成发料接收记录" + res.data)
+								this.showCommitSuccessMessage("提交成功<br>生成发料接收记录<br>" + res.data)
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
@@ -487,14 +475,14 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
 					this.detailSource.forEach(item => {
 						item.subList.forEach(detail => {
 							detail.toLocationCode = code
 						})
 					})
-				})
+				// })
 			},
 
 			showCommitSuccessMessage(hint) {

src/pages/repleinsh/coms/comScanReplishPack.vue

@@ -297,7 +297,7 @@
 							let record = batch.Records.find(r => r.packingNumber == packingCode);
 							if (record == undefined) {
 								//如果有推荐箱码	 
-								if (batch.Recommends.length > 0) {
+								if (batch.Recommends!=undefined && batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
 										that.addRecord(batch, label, packageInfo)
@@ -325,8 +325,9 @@
 							}
 						} else {
 							if (this.jobContent.allowModifyBatch == "TRUE") {
-								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+								
-									'】的发料明细,是否要继续发料?', res => {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,批次【' + lot +
+									'】不是推荐批次,是否要继续发料?', res => {
 										if (res) {
 											let batch = that.createBatchInfo(label, balance, packageInfo);
 											if (fromLocation.Batchs.length > 0) {