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

src/common/record.js

@@ -28,7 +28,7 @@ export function createItemInfo(balance, pack) {
 		// packingNumber: pack.number,
 		// parentPackingNumber: pack.parentNumber,
 	}
-	item.containerNumber = pack.parentNumber != null ? pack.parentNumber : pack.number;
+	item.containerNumber = pack.parentNumber ? pack.parentNumber : pack.number;
 	return item;
 }
 

src/pages.json

@@ -667,6 +667,34 @@
 				}
 			}
 		},
+		{
+			"path": "pages/issue/record/directIssue0816",
+			"style": {
+				"navigationBarTitleText": "直接发料0816",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+						
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						
+						},
+						{
+					
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
 		{
 			"path": "pages/productionReceipt/job/productionReceiptJob",
 			"style": {

src/pages/issue/record/directIssue0816.vue

@@ -0,0 +1,611 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='getBusinessType' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header-view">
+					<view class="header_item">
+						来源库位 : {{fromLocationCode}}
+					</view>
+				</view>
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								:isShowToLocation="false" :isShowParentToLocation="false" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="uni-row uni-flex">
+						<text>生产线:</text>
+						<view class="uni-flex u-col-center uni-row" @click="showSelect">
+							<view class="" style="margin-left: 20rpx;">
+								{{positionInfo}}
+							</view>
+							<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+								@confirm="confirmSelect"></u-select>
+						</view>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
+		</winComScanBalance>
+		<!-- <balanceQuery ref="refBalanceQuery"></balanceQuery> -->
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		issueRecordSubmit,
+		getWorkShopLineStation,
+		getBalanceByFilter
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcTreeHandleQty,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+	// import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard,
+			recordDetailCard,
+			balanceSelect,
+			winComScanBalance,
+			// balanceQuery
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromLocationAreaTypeList: [],
+				toLocationAreaTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				businessTypeCode: "Issue",
+				positionList: [],
+				show: false,
+				positionInfo: "请选择生产线",
+				resultData: {},
+				itemCode: ""
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+			this.clearData();
+			this.getBusinessType()
+
+			// if (this.positionList.length == 0) {
+			getWorkShopLineStation().then(res => {
+				if (res.data != null && res.data.length > 0) {
+					this.positionList = res.data
+				} else {
+					this.showErrorMessage('未查找到位置信息');
+				}
+
+			}).catch(error => {
+				this.showErrorMessage(error);
+			})
+			// }
+
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				// this.$refs.refBalanceQuery.showDrawer();
+				// this.closeScanPopup();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			// showDrawer() {
+			// 	this.$refs.showRight.open();
+			// },
+
+			getBusinessType() {
+				getBusinessType(this.businessTypeCode, res => {
+					if (res.success) {
+						this.businessType = res.businessType;
+						this.fromInventoryStatuses = getDirectoryItemArray(res.fromInventoryStatuses);
+						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+						this.openScanPopup();
+					} else {
+						this.showErrorMessage(res.message)
+					}
+				});
+			},
+
+			getScanResult(result) {
+				let pack = result.package;
+				let balance = result.balance;
+
+				if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
+					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
+						.fromLocationCode + "]没有库存余额")
+					return;
+				}
+
+				//扫描的是子包装
+				if (pack.parentNumber) {
+					this.setPackageData(result);
+				} else {
+					this.setContainerData(result);
+				}
+			},
+
+			setPackageData(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					if (this.itemCode != "" && this.itemCode != balance.itemCode) {
+						this.showErrorMessage("请扫描物料为【" + this.itemCode + "】的箱码")
+						return;
+					}
+					if (this.fromWarehouseCode == '') {
+						this.fromWarehouseCode = balance.warehouseCode;
+					}
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.parentNumber = pack.parentNumber;
+					newDetail.packingNumber = pack.number
+					newDetail.packUnit = pack.packUnit;
+					newDetail.packQty = pack.packQty;
+					if (balance.lableQty) {
+						newDetail.handleQty = balance.lableQty
+					}
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+					this.itemCode = balance.itemCode;
+					this.fromLocationCode = balance.locationCode
+					this.scanPopupGetFocus()
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == pack.number &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.parentNumber = pack.parentNumber;
+						newDetail.packingNumber = pack.number
+						newDetail.packUnit = pack.packUnit;
+						newDetail.packQty = pack.packQty;
+						if (balance.lableQty) {
+							newDetail.handleQty = balance.lableQty
+						}
+						item.subList.push(newDetail);
+						this.scanPopupGetFocus()
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描")
+						}
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+
+			setContainerData(result) {
+				//1.查询托和箱所有的库存
+				this.getBalance(result, resList => {
+
+				});
+			},
+
+			getBalance(result, callback) {
+				let packageInfo = result.package;
+				let filters = [{
+					column: "itemCode",
+					action: "==",
+					value: packageInfo.itemCode
+				}, {
+					column: "batch",
+					action: "==",
+					value: packageInfo.batch
+				}];
+				if (this.businessType.outInventoryStatuses != null) {
+					filters.push({
+						column: "inventoryStatus",
+						action: "in",
+						value: this.businessType.outInventoryStatuses
+					})
+				}
+				if (this.businessType.outAreaTypes != null) {
+					filters.push({
+						column: "areaType",
+						action: "in",
+						value: this.businessType.outAreaTypes
+					})
+				}
+
+
+				let packingNumber = packageInfo.number;
+				packageInfo.subList.forEach(sub => {
+					packingNumber = packingNumber + ',' + sub.number
+				})
+				packingNumber = packingNumber.trimEnd(',');
+				filters.push({
+					column: "packingNumber",
+					action: "in",
+					value: packingNumber
+				})
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					if (res.data.list.length > 0) {
+						res.data.list.forEach(r => {
+							// if (packageInfo.parentNumber !== null) {
+							// 	r.parentPackingNumber = packageInfo.parentNumber
+							// } else {
+							// 	r.parentPackingNumber = packageInfo.number
+							// }
+						})
+						callback(res.data.list)
+					} else {
+
+					}
+				}).catch(err => {
+					this.showErrorMessage(err.message);
+				})
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.scanPopupGetFocus()
+					}
+				});
+			},
+
+			calcTreeHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty, detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			showSelect() {
+				// if (this.editPosition) {
+				this.show = true
+				// }
+			},
+
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+
+				//赋值到库位代码
+				let toLocationCode = ''
+				this.positionList.forEach(item => {
+					if (this.workshopCode == item.value) { // 车间
+						item.children.find(child => {
+							if (this.productionLineCode == child.value) {
+								toLocationCode = child.children.find(subChild => this.workStationCode ==
+									subChild.value).rawLocationCode;
+							}
+						})
+					}
+				})
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = toLocationCode
+						detail.productionLineCode = this.productionLineCode
+						detail.workStationCode = this.workStationCode
+					})
+				})
+
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.businessType) {
+					this.$refs.scanPopup.openScanPopup(this.businessType);
+				} else {
+					this.getBusinessType()
+				}
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//记录有目标库位，需要查询管理模式
+				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
+				//2:获取管理模式，封装参数
+				getPrecisionStrategyList(precisionStrategyParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = {
+							...this.setRecordParams()
+						}
+						console.log("提交参数", JSON.stringify(params));
+
+						issueRecordSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setRecordParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.toBatch = info.batch;
+							submitItem.toContainerNumber = detail.containerNumber;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.fromBatch = info.batch;
+							submitItem.fromContainerNumber = detail.containerNumber;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							// detail.toInventoryStatus = detail.inventoryStatus
+							// detail.toLocationCode = detail.toLocationCode
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+							submitItem.recordList = [{
+								toInventoryStatus: detail.inventoryStatus,
+								fromParentPackingNumber: detail.parentNumber,
+								fromPackingNumber: info.packingNumber,
+								fromBatch: info.batch,
+								toPackingNumber: info.packingNumber,
+								toBatch: info.batch,
+								fromLocationCode: detail.locationCode,
+								toLocationCode: detail.toLocationCode,
+								handleQty: detail.handleQty,
+								fromPackUnit: detail.packUnit,
+								toPackUnit: detail.packUnit,
+								fromPackQty: detail.packQty,
+								toPackQty: detail.packQty
+							}]
+							subList.push(submitItem)
+						}
+					})
+				})
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			clearData() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+				this.positionInfo = "请选择生产线";
+				this.itemCode = ""
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>