Merge branch 'master' of D:\project\DMS\ezhizao_dms_app with conflicts.

api/base/path.js

@@ -3,15 +3,15 @@ import {
 } from 'vue'
 
 export const path = reactive({
-	baseURL: 'http://120.46.159.163:7004',
-	checkAppURL: 'http://120.46.159.163:7004',
+	baseURL: 'http://192.168.31.224:8099',
+	checkAppURL: 'http://192.168.31.224:8099',
 	// baseURL: 'http://120.46.159.163:401/ezhizao-dms-sys',
 	// checkAppURL: 'http://120.46.159.163:401',
 	updateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
 	furnaceNoURL: 'http://120.46.159.163:7002',
 
 	// 内网
-	innerURL: 'http://192.168.31.216:8099',
+	innerURL: 'http://192.168.31.224:8099',
 	// innerURL: 'http://120.46.159.163:401',
 	innerUpdateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
 	innerFurnaceNoURL: 'http://120.46.159.163:7002',

pages/addNewBatch/index.vue

@@ -174,7 +174,8 @@
 	const furnaceNumberInfoList = ref([])
 	const emit = defineEmits(['batchReporting-addBatch']);
 	const inpValue = ref('')
-	const curDept = ref(false)//判断当前工段是否是该批次的领料部门
+
+	const curDept = ref(false) //判断当前工段是否是该批次的领料部门
 	const lotList = ref([])
 	const selectedProcess = ref(null)
 	const processList = ref([])
@@ -337,8 +338,6 @@
 	}
 
 	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) {
@@ -401,13 +400,46 @@
 		}
 		})
 	}
+
+	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.processStepNumber,
+						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: '提示',
 			content: '确认是否加工尾批?',
 			success: function(res) {
 				if (res.confirm) {
-					if(lotList.value.some(item => item.isLast == 1)){
+					if (lotList.value.some(item => item.isLast == 1)) {
 						for (let i = 0; i < lotList.value.length; i++) {
 							if (lotList.value[i].isLast == 1) {
 								batchNoList.value = [lotList.value[i]];
@@ -417,13 +449,13 @@
 								return;
 							}
 						}
-					}else{
+					} else {
 						uni.showToast({
 							icon: 'none',
 							title: '当前计划尾批已被加工',
 							duration: 2500
 						})
-					}	
+					}
 				} else if (res.cancel) {}
 			}
 		});
@@ -465,8 +497,10 @@
 
 	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
+		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() {
@@ -517,7 +551,6 @@
 			})
 			return;
 		}
-		dayWork.value.isWasteRecycling = 1
 		console.log(dayWork.value)
 		console.log(basicInfo.value)
 		store.furnaceNumberInfo = basicInfo.value;