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

src/mycomponents/balance/balance.vue

@@ -14,7 +14,7 @@
 				<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
 					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
 				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
-					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack">
+					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack" :isShowStatus='isShowStatus'>
 				</compare-qty>
 				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
 					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>

src/mycomponents/balance/handleBalance.vue

@@ -7,10 +7,10 @@
 				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
 			</view>
 			<view style="word-break: break-all;">
-				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail"
+				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail" :isShowStatus='isShowStatus'
 					:isShowStdPack="false"></recommend-qty>
 
-				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty"
+				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty" :isShowStatus='isShowStatus'
 					:isShowStdPack="false">
 				</compare-qty>
 			</view>
@@ -56,7 +56,10 @@
 				type: Boolean,
 				default: true
 			},
-
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 

src/mycomponents/location/locationCompare.vue

@@ -13,6 +13,10 @@
 				<!-- <text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text> -->
 			</view>
 			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
+
+			<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
+				<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制</text>
+			</view>
 		</view>
 		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
@@ -21,6 +25,7 @@
 
 <script>
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -75,6 +80,33 @@
 			//扫描源库位
 			getLocation(location, code) {
 				this.$emit("getLocation", location, code)
+			},
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HLB;V1.0;" + this.recommendLocationCode;
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制库位成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制库位成功'
+						})
+					}
+				})
+				// #endif
+			},
+			isDevlement() {
+				return config.isDevelopment;
 			}
 		}
 	}

src/pages.json

@@ -795,7 +795,7 @@
 		{
 			"path": "pages/productReceipt/job/productReceiptJob",
 			"style": {
-				"navigationBarTitleText": "制品收货任务",
+				"navigationBarTitleText": "预生产收货任务",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					// "autoBackButton": "true",
@@ -821,7 +821,7 @@
 		{
 			"path": "pages/productReceipt/job/productReceiptDetail",
 			"style": {
-				"navigationBarTitleText": "制品收货详情",
+				"navigationBarTitleText": "预生产收货详情",
 				"enablePullDownRefresh": false
 			}
 		},	

src/pages/productRecycle/job/productRecycleJobDetail.vue

@@ -289,7 +289,7 @@
 								} else {
 									this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
 										itemStatus +
-										']不一致,不允许转移!', res => {
+										']不一致,不允许回收!', res => {
 											this.scanPopupGetFocus();
 										});
 								}

src/pages/putaway/coms/comPutawayJobCard.vue

@@ -12,7 +12,7 @@
 			<view class="task_item">
 				<view class="task_text">
 					<view class="">
-						客户代码 : {{dataContent.supplierCode}}
+						供应商代码 : {{dataContent.supplierCode}}
 					</view>
 				</view>
 			</view>

src/pages/putaway/job/putawayDetail.vue

@@ -337,14 +337,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
 						})
 					})
-				})
+				// })
 			},
 
 			openDetail(item) {

src/pages/repleinsh/coms/comRepleishDetailCard.vue

@@ -31,8 +31,12 @@
 											<uni-swipe-action ref="swipeAction">
 												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
 													:right-options="scanOptions">
+													<view class="card_view">
+														<text class="card_packing_code card_content ">外包装</text>
+														<text class="card_content ">{{record.parentPackingNumber}}</text>
+													</view>
 													<handle-balance :detail="record" :isShowLocation="false"
-														:isShowBatch="batch.packingNumber!=null">
+														:isShowBatch="batch.packingNumber!=null" :isShowStatus='true'>
 													</handle-balance>
 												</uni-swipe-action-item>
 											</uni-swipe-action>

src/pages/repleinsh/coms/comScanReplishPack.vue

@@ -69,7 +69,7 @@
 													<uni-swipe-action-item @click="swipeClick($event,record,index)"
 														:right-options="scanOptions">
 														<view style="padding: 0px 10px">
-															<balance :dataContent="record" :isShowFromLocation="false"
+															<balance :dataContent="record" :isShowFromLocation="false" :isShowStatus='true'
 																:isShowStdPack="false"></balance>
 														</view>
 													</uni-swipe-action-item>
@@ -242,30 +242,33 @@
 						)
 						return;
 					} else {
-						//查找库存信息
+
-						uni.showLoading({
+						this.afterGetBalance(result.label, result.label, packageInfo);
-							title: '加载中',
+
-							mask: true
+						// //查找库存信息
-						})
+						// uni.showLoading({
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+						// 	title: '加载中',
-							balanceRes => {
+						// 	mask: true
-								if (balanceRes.success) {
+						// })
-									if (balanceRes.data.list.length == 0) {
+						// getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
-										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+						// 	balanceRes => {
-											res => {
+						// 		if (balanceRes.success) {
-												this.packGetFocus();
+						// 			if (balanceRes.data.list.length == 0) {
-											})
+						// 				this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-									} else if (balanceRes.data.list.length == 1) {
+						// 					res => {
-										let balance = balanceRes.data.list[0];
+						// 						this.packGetFocus();
-										this.afterGetBalance(result.label, balance, packageInfo);
+						// 					})
-									} else {
+						// 			} else if (balanceRes.data.list.length == 1) {
-										this.showBalanceSelect(balanceRes.data.list);
+						// 				let balance = balanceRes.data.list[0];
-									}
+						// 				this.afterGetBalance(result.label, balance, packageInfo);
-								} else {
+						// 			} else {
-									this.showErrorMessage(balanceRes.message.message);
+						// 				this.showBalanceSelect(balanceRes.data.list);
-								}
+						// 			}
-								uni.hideLoading();
+						// 		} else {
-							});
+						// 			this.showErrorMessage(balanceRes.message.message);
+						// 		}
+						// 		uni.hideLoading();
+						// 	});
 					}
 				} catch (e) {
 					this.showErrorMessage(e.stack)
@@ -297,11 +300,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance, packageInfo)
+										that.addRecord(batch, label, packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance, packageInfo);
+											that.addRecord(batch, label, packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -311,7 +314,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance, packageInfo)
+									that.addRecord(batch, label, packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -363,31 +366,51 @@
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance,packageInfo);
+				let record = this.creatRecord(data, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;
 			},
 
-			creatRecord(label, balance, packageInfo) {
+			creatRecord(label, packageInfo) {
-				balance.packQty = packageInfo.packQty
-				balance.packUnit = packageInfo.packUnit
 				let record = {
 					scaned: true,
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
+					parentPackingNumber: packageInfo.parentNumber,
 					batch: label.batch,
-					qty: Number(balance.qty),
+					qty: Number(label.qty),
 					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
-					uom: balance.uom,
+					uom: label.uom,
-					inventoryStatus: balance.inventoryStatus,
+					inventoryStatus: "OK",
-					balance: balance,
+					balance: null,
 					toLocationCode: this.toLocationCode,
 					supplierCode: label.supplierCode
 				}
 				return record;
 			},
 
+
+
+			// creatRecord(label, balance, packageInfo) {
+			// 	balance.packQty = packageInfo.packQty
+			// 	balance.packUnit = packageInfo.packUnit
+			// 	let record = {
+			// 		scaned: true,
+			// 		itemCode: label.itemCode,
+			// 		packingNumber: label.packingNumber,
+			// 		batch: label.batch,
+			// 		qty: Number(balance.qty),
+			// 		// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+			// 		uom: balance.uom,
+			// 		inventoryStatus: balance.inventoryStatus,
+			// 		balance: balance,
+			// 		toLocationCode: this.toLocationCode,
+			// 		supplierCode: label.supplierCode
+			// 	}
+			// 	return record;
+			// },
+
 			calcBatchHandleQty(batch) {
 				let handleQty = 0;
 				batch.Records.forEach(res => {
@@ -400,7 +423,8 @@
 						var itemCodeHandleQty = 0;
 						item.Locations.forEach(batch => {
 							batch.Batchs.forEach(batchHandleQty => {
-							itemCodeHandleQty=calc.add(itemCodeHandleQty,batchHandleQty.handleQty)
+								itemCodeHandleQty = calc.add(itemCodeHandleQty,
+									batchHandleQty.handleQty)
 							})
 						})
 						item.handleQty = itemCodeHandleQty;
@@ -409,8 +433,8 @@
 				})
 			},
 
-			addRecord(batch, label, balance, packageInfo) {
+			addRecord(batch, label, packageInfo) {
-				let record = this.creatRecord(label, balance, packageInfo);
+				let record = this.creatRecord(label, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);

src/pages/repleinsh/job/repleinshDetail.vue

@@ -298,8 +298,8 @@
 											let record = {};
 											record.handleQty = r.qty;
 
-											record.fromPackingNumber = r
+											// record.fromPackingNumber = r
-												.packingNumber;
+											// 	.packingNumber;
 											record.fromBatch = r.batch;
 											record.fromContainerNumber = r
 												.ContainerNumber;
@@ -312,24 +312,39 @@
 												.toLocationCode;
 											record.supplierCode = r.supplierCode;
 											
-											//使用在途库不改变管理模式
+											if(record.parentPackingNumber!='')
-											if (this.jobContent
+											{
-												.useOnTheWayLocation ==
+												record.fromPackingNumber = record.parentPackingNumber;
-												'TRUE') {
 												record.toPackingNumber = r
 													.packingNumber;
-												record.toBatch = r.batch;
+											}
-											} else {
+											else
-												var info =
+											{
-													getPackingNumberAndBatch(
+												record.fromPackingNumber = record.packingNumber;
-														this.managementList, r
+												record.toPackingNumber = r
-														.itemCode,
-														r.packingNumber, r
-														.batch);
-												record.toPackingNumber = info
 													.packingNumber;
-												record.toBatch = info.batch;
 											}
+											record.toBatch = r.batch;
+											
+
+											// //使用在途库不改变管理模式
+											// if (this.jobContent
+											// 	.useOnTheWayLocation ==
+											// 	'TRUE') {
+											// 	record.toPackingNumber = r
+											// 		.packingNumber;
+											// 	record.toBatch = r.batch;
+											// } else {
+											// 	var info =
+											// 		getPackingNumberAndBatch(
+											// 			this.managementList, r
+											// 			.itemCode,
+											// 			r.packingNumber, r
+											// 			.batch);
+											// 	record.toPackingNumber = info
+											// 		.packingNumber;
+											// 	record.toBatch = info.batch;
+											// }
 											subItem.recordList.push(record);
 										})
 										commitSubList.push(subItem);