0423

components/dialog-end-work/dialog-end-work.vue

@@ -103,6 +103,7 @@
 	onLoad(() => {})
 
 	function open(data, itemListData) {
+		console.log(store.dayworkInfo)
 		resetPage();
 		workInfo.value = {
 			...data,
@@ -382,6 +383,7 @@
 					title: "请输入废弃数或废弃原因",
 					duration: 2000
 				})
+				console.log("444")
 				return;
 			}
 			rejectSum += Number(wasteInfo.value[i].rejectNum);
@@ -400,8 +402,7 @@
 		workInfo.value.endTime = timestampToTime(new Date());
 		workInfo.value.rejectList = wasteInfo.value;
 		workInfo.value.isPreProcess = store.isPreProcess;
-
-		console.log(workInfo.value)
+	    workInfo.value.processStepNumber = store.dayworkInfo.currentProcess.processStepNumber
 		saveDayWorkItem(workInfo.value).then(res => {
 			if (res.code === 200) {
 				uni.showToast({

components/dialog-lot/dialog-lot.vue

@@ -38,6 +38,9 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
+	import {
+		getProcessListByLot
+	} from "@/api/business/lot.js"
 	import {
 		getProcessList
 	} from '@/api/business/deptProcess.js'
@@ -50,16 +53,16 @@
 	const form = ref([])
 	const emit = defineEmits(['submit'])
 	const selection = ref([])
-	const selectedProcess = ref(null)
+	const selectedProcess = ref({})
 	const processList = ref([])
 
 
 	const open = (data) => {
-		// console.log(dialog.value)
+		console.log(data)
 		form.value = data;
 		baseDialog.value.open();
 		selection.value = [];
-		selectedProcess.value = null;
+		selectedProcess.value = {};
 		processList.value = [];
 		getProcesses();
 	}
@@ -73,15 +76,18 @@
 	})
 
 	function getProcesses() {
-		getProcessList({
+		Promise.all([getProcessList({
 			deptId: store.curDeptDetails.deptId,
 			dayworkId:form.value.dayworkId
-		}).then(res => { 
+		}), getProcessListByLot({
+			id: form.value[0].daywork.lotId,
+			isWasteRecycling:form.value[0].daywork.isWasteRecycling
+		})
+		]).then(([res, response]) =>{
 			if (res.code == 200) {
 				//过滤工序列表将上道序及之前的工序去掉, 然后过滤出工序交集
-				let curProcessSequence = [...store.planDetails.processSequence];
-				console.log(curProcessSequence)
-				console.log(form.value[0])
+				// let curProcessSequence = [...store.planDetails.processSequence];
+				let curProcessSequence = response.data
 				// 这里根据前一序当前工序 过滤工序列表。
 				// 假设单批单改部分修改后 需要做其他修改
 				/* // 20240408 前毛宇辰版本
@@ -101,32 +107,37 @@
 				let filteredData = curProcessSequence.filter((item1) =>
 					res.data.some((item2) => item2.processCode === item1.processCode)
 				);
+				console.log(filteredData)
 				for (let i = 0; i < filteredData.length; i++) {
 					processList.value[i] = {
 						text: filteredData[i].processAlias,
-						value: filteredData[i].technologicalProcessDetailId,
-						processId: filteredData[i].id
+						value: filteredData[i].technologicalProcessDetailId?filteredData[i].technologicalProcessDetailI:filteredData[i].id,
+						processId: filteredData[i].processId,
+						processStepNumber:filteredData[i].processStepNumber
 					}
 				}
-				selectedProcess.value = filteredData[0].technologicalProcessDetailId;
+				console.log(processList.value)
+				selectedProcess.value = filteredData[0].value;
+				console.log(selectedProcess.value)
 			}
 			// console.log(selectedProcess.value)
 		})
 	}
 
 	function handleProcessChange() {
-
+		console.log(selectedProcess.value)
 	}
 
 	function handleConfirm() {
 		// 添加选择的工序
 		for (let i = 0; i < selection.value.length; i++) {
 			selection.value[i].daywork.technologicalProcessDetailId = selectedProcess.value;
+			selection.value[i].daywork.processStepNumber = processList.value.find(v => v.value === selectedProcess.value)?.processStepNumber;
 			selection.value[i].daywork.processId = processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processId : null
 			console.log(processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processId : null)
 		}
-		// console.log(selection.value)
-		// 执行确认
+		 console.log(selection.value)
+		//执行确认
 		if (selectedProcess.value && selection.value.length > 0) {
 			close();
 			emit('submit', selection.value);

pages/addNewBatch/index.vue

@@ -15,7 +15,7 @@
 					<uni-easyinput v-if="batchNoList.length > 0" class="inp" suffixIcon="checkmarkempty"
 						v-model="inpValue" placeholder="可手动修正批次" @iconClick="iconClick"></uni-easyinput>
 					<view class="uni-row" style="justify-content: space-between;">
-						<view v-if="batchNoList.length > 0" class="scanLotCode" @click="handleDoLastLot">
+						<view v-if="batchNoList.length > 0 && curDept" class="scanLotCode" @click="handleDoLastLot">
 							<text>是否加工尾批</text>
 						</view>
 						<view v-if="batchNoList.length > 0" class="scanLotCode" @click="handleConfirmLotCode">
@@ -46,7 +46,12 @@
 			<view class="selectedProcess">
 				<uni-section title="请选择工序" type="square">
 					<uni-data-select v-model="selectedProcess" :localdata="processList" :clear="false"
-						@change="handleProcessChange"></uni-data-select>
+						@change="handleProcessChange">
+						<template v-slot:option="{item }">
+						            <!-- 自定义下拉框每一项的显示内容 -->
+									<span>{{ (item.index) + 1}}</span>
+						            <span>{{ item.text }}</span>
+						        </template></uni-data-select>
 				</uni-section>
 			</view>
 			<view class='middle'>
@@ -134,7 +139,9 @@
 		onReady
 	} from '@dcloudio/uni-app'
 	import {
-		getLotList
+		getLotList,
+		getWasteRecyclingLot,
+		getProcessListByLot
 	} from "@/api/business/lot.js"
 	import {
 		saveDayWork
@@ -162,10 +169,12 @@
 	const vehicleList = ref([])
 	const basicInfo = ref({}) // 基础信息对象
 	const dayWork = ref({})
+	const wasteRecyclingList = ref([])//废品回用批次
 	const curPlan = ref({})
 	const furnaceNumberInfoList = ref([])
 	const emit = defineEmits(['batchReporting-addBatch']);
 	const inpValue = ref('')
+	const curDept = ref(false)//判断当前工段是否是该批次的领料部门
 	const lotList = ref([])
 	const selectedProcess = ref(null)
 	const processList = ref([])
@@ -185,21 +194,66 @@
 	function init() {
 		let obj = {}
 		obj.productionPlanDetailId = store.planDetails.id;
-		getLotList(obj).then(res => {
-			console.log(res)
-			lotList.value = res.rows;
-			if (res.rows.length > 0) {
-				batchNoList.value = [res.rows[0]];
-				dayWork.value.lotId = batchNoList.value[0].id;
-				dayWork.value.lotCode = batchNoList.value[0].lotCode;
-				if(dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId){
-					dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
-					store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+		//开始新批次，判断当前工段是否能开始这个批次（领料部门是当前工段的；批次的领料部门是当前工段的）
+		//当前计划单的领料部门是当前工段
+		if(store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId) {
+			curDept.value= true
+			//只查不是废品回用的批次
+			getLotList(obj).then(res => {
+				console.log(res)
+				lotList.value = res.rows;
+				if (res.rows.length > 0) {
+					batchNoList.value = [res.rows[0]];
+					dayWork.value.lotId = batchNoList.value[0].id;
+					dayWork.value.lotCode = batchNoList.value[0].lotCode;
+					if(dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId){
+						dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+						store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+					}
+					getProcessInfo(batchNoList.value[0])
+				} else {
+					batchNoList.value = res.rows;
 				}
-			} else {
-				batchNoList.value = res.rows;
-			}
-		})
+			})
+		}else {
+			//废品回用的批次(领料部门是当前工段)
+			getWasteRecyclingLot({productionPlanDetailId:store.planDetails.id,requisitionDepartmentId :store.curDeptDetails.deptId,flag:true}).then(res => {
+				wasteRecyclingList.value = res.rows
+				if (res.rows.length > 0) {
+					//如果废品回用的批次领料部门是当前计划的领料部门，则加到lotList
+					if(wasteRecyclingList.value[0].requisitionDepartmentId == store.planDetails.requisitionDepartmentId) {
+						lotList.value.push(wasteRecyclingList.value)
+						batchNoList.value = [lotList.rows[0]];
+						dayWork.value.lotId = batchNoList.value[0].id;
+						dayWork.value.lotCode = batchNoList.value[0].lotCode;
+						if(dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId){
+							dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+							store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+						}
+					}else {
+						lotList.value = res.rows
+						batchNoList.value = [res.rows[0]];
+						dayWork.value.lotId = batchNoList.value[0].id;
+						dayWork.value.lotCode = batchNoList.value[0].lotCode;
+						if(dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId){
+							dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+							store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+						}
+						getProcessInfo(batchNoList.value[0])
+					}
+					//提示当前批次是废品回用
+					if(batchNoList.value[0].isWasteRecycling == 1) {
+									 uni.showToast({
+									 	icon: "none",
+									 	title: "该批是废品回用",
+									 	duration: 2000
+									 })
+					}
+				} else {
+					batchNoList.value = res.rows;
+				}
+				})
+		}
 
 		// 拉取炉号信息from p2
 		let token = 'Bearer ' + getToken();
@@ -233,34 +287,32 @@
 			}
 		})
 
-		getProcessList({
-			deptId: store.curDeptDetails.deptId,
-		}).then(res => {
-			if (res.code == 200) {
-				//过滤出工序交集
-				let filteredData = store.planDetails.processSequence.filter((item1) =>
-					res.data.some((item2) => item2.processCode === item1.processCode)
-				);
-				// for (let i = 0; i < filteredData.length; i++) {
-				// 	processList.value[i] = {
-				// 		text: filteredData[i].processAlias,
-				// 		// value: filteredData[i].id,
-				// 		value: filteredData[i].technologicalProcessDetailId,
-				// 		processId: filterData[i].id
-						
-				// 	}
-				// }
-				processList.value = filteredData.map(v => ({
-					text: v.processAlias,
-					value: v.technologicalProcessDetailId,
-					processId: v.id
-			    }))
-				console.log(processList.value)
-				selectedProcess.value = filteredData[0].technologicalProcessDetailId;
-				dayWork.value.processId = filteredData[0].id;
-				dayWork.value.technologicalProcessDetailId = selectedProcess.value
-			}
-		})
+		// getProcessList({
+		// 	deptId: store.curDeptDetails.deptId,
+		// }).then(res => {
+		// 	if (res.code == 200) {
+		// 		//过滤出工序交集
+		// 		//因为废品回用对工序进行单独的修改。所以重新查产品的工艺，如果该批不是废品回用，则查产品工序，如果是，则到
+		// 		//对应表查
+		// 		//通过批次号查
+		// 		console.log(batchNoList.value)
+		// 		 getProcessListByLot(batchNoList.value[0]).then(res => {
+		// 			 let lotProcessList = res.data
+		// 			 let filteredData = lotProcessList.filter((item1) =>
+		// 			 		res.data.some((item2) => item2.processCode === item1.processCode)
+		// 			 	);
+		// 			 	processList.value = filteredData.map(v => ({
+		// 			 		text: v.processAlias,
+		// 			 		value: v.technologicalProcessDetailId,
+		// 			 		processId: v.id
+		// 			     }))
+		// 			 	console.log(processList.value)
+		// 			 	selectedProcess.value = filteredData[0].technologicalProcessDetailId;
+		// 			 	dayWork.value.processId = filteredData[0].id;
+		// 			 	dayWork.value.technologicalProcessDetailId = selectedProcess.value
+		// 		 })
+		// }
+		// })
 	}
 
 	// function handleCheckBatchNo(item) {
@@ -285,17 +337,27 @@
 	}
 
 	function checkLotCode(lotCode) {
+		console.log(lotList.value)
+		console.log(lotList.value.some(item => item.lotCode == lotCode))
 		if (lotList.value.some(item => item.lotCode == lotCode)) {
 			for (let i = 0; i < lotList.value.length; i++) {
 				if (lotList.value[i].lotCode == lotCode) {
 					batchNoList.value = [lotList.value[i]];
 					dayWork.value.lotId = lotList.value[i].id;
 					dayWork.value.lotCode = lotList.value[i].lotCode;
+					if(batchNoList.value[0].isWasteRecycling == 1) {
+									 uni.showToast({
+									 	icon: "none",
+									 	title: "该批次号可用，该批是废品回用",
+									 	duration: 2000
+									 })
+					}else{
 					uni.showToast({
 						icon: "none",
 						title: "该批次号可用",
 						duration: 2000
 					})
+					}
 					return true;
 				}
 			}
@@ -308,7 +370,37 @@
 			return false;
 		}
 	}
-
+    function getProcessInfo(data) {
+		getProcessList({
+			deptId: store.curDeptDetails.deptId,
+		}).then(res => {
+			if (res.code == 200) {
+				//过滤出工序交集
+				//因为废品回用对工序进行单独的修改。所以重新查产品的工艺，如果该批不是废品回用，则查产品工序，如果是，则到
+				//对应表查
+				//通过批次号查
+				console.log(batchNoList.value)
+				 getProcessListByLot(data).then(response => {
+					 let lotProcessList = response.data
+					 console.log(lotProcessList)
+					 let filteredData = lotProcessList.filter((item1) =>
+					 		res.data.some((item2) => item2.processCode === item1.processCode)
+					 	);
+					 	processList.value = filteredData.map((v,index) => ({
+					 		text: v.processAlias,
+					 		value:v.technologicalProcessDetailId?v.technologicalProcessDetailId:v.id,
+					 		processId: v.processId,
+							processStepNumber:v.processStepNumber,
+							index:index
+					     }))
+					 	console.log(processList.value)
+					 	selectedProcess.value = filteredData[0].technologicalProcessDetailId;
+					 	dayWork.value.processId = filteredData[0].id;
+					 	dayWork.value.technologicalProcessDetailId = selectedProcess.value
+				 })
+		}
+		})
+	}
 	function handleDoLastLot() {
 		uni.showModal({
 			title: '提示',
@@ -374,6 +466,7 @@
 	function handleProcessChange() {
 		dayWork.value.technologicalProcessDetailId = selectedProcess.value;
 		dayWork.value.processId = processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processId : null
+		dayWork.value.processStepNumber = processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processStepNumber : null
 	}
 
 	// function handleScanCode() {
@@ -424,6 +517,7 @@
 			})
 			return;
 		}
+		dayWork.value.isWasteRecycling = 1
 		console.log(dayWork.value)
 		console.log(basicInfo.value)
 		store.furnaceNumberInfo = basicInfo.value;