报工信息

api/base/path.js

@@ -1,22 +1,24 @@
-import { reactive } from 'vue'
+import {
+	reactive
+} from 'vue'
 
 export const path = reactive({
-	baseURL:  'http://192.168.31.152:8099', 
-	checkAppURL: 'http://192.168.31.152:8099',
+	baseURL: 'http://120.46.159.163:7004',
+	checkAppURL: 'http://120.46.159.163:7004',
 	// 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', 
+	updateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
 	furnaceNoURL: 'http://120.46.159.163:7002',
-	
+
 	// 内网
-	innerURL: 'http://192.168.31.152:8099',
+	innerURL: 'http://192.168.31.36:8099',
 	// innerURL: 'http://120.46.159.163:401',
-	innerUpdateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production', 
+	innerUpdateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
 	innerFurnaceNoURL: 'http://120.46.159.163:7002',
-	
+
 	// 外网
 	publicURL: 'http://36.129.132.128:8099',
-	outUpdateAppURL: 'http://36.129.132.128:401/ezhizao-dms-production', 
+	outUpdateAppURL: 'http://36.129.132.128:401/ezhizao-dms-production',
 	outFurnaceNoURL: 'http://36.129.132.128:401/ezhizao-dms-p2'
 })
 

api/business/dayWorkItem.js

@@ -94,6 +94,16 @@ export function listItem(data) {
 	})
 }
 
+export function getIsFirstOrder(dayWorkId) {
+	return req.request({
+		url: '/business/dayworkItem/getIsFirstOrder/'+dayWorkId,
+		method: 'GET',
+	})
+}
+
+
+
+
 
 export function getDayWorkItemHistory(startTime,endTime) {
 	return req.request({

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

@@ -80,7 +80,8 @@
 	} from '@/utils/common.js'
 	import {
 		getDayWorkItemList,
-		listItem
+		listItem,
+		getIsFirstOrder,
 	} from '@/api/business/dayWorkItem.js'
 
 	const baseDialog = ref(null)
@@ -91,6 +92,7 @@
 	const showCarrierList = ref(false) // 工序是否完成显示载具列表
 	const bindList = ref([])
 	const confirmCarrierList = ref([])
+	const isFirstOrder = ref(true); //是否为首序
 	const endFlag = ref(0)
 	const specialDeptProcessList = ref([])
 	const temp = ref(0) // 保存workInfo.value.qualifiedNum的值(还原用)
@@ -101,18 +103,18 @@
 	onLoad(() => {})
 
 	function open(data, itemListData) {
-		console.log(store.isPreProcess)
 		resetPage();
 		workInfo.value = {
 			...data,
 		};
+		//查看是否为首序
+		getIsFirst(store.dayworkInfo.id);
 		workInfo.value.qualifiedNum = 0;
 		Promise.all([getSpecialDeptProcessList(), listItem({
 				dayworkId: store.dayworkInfo.id,
 				status: 2
-			})], )
+			}), ], )
 			.then(([res, response]) => {
-				console.log(response.rows)
 				if (res.code == 200 && response.code == 200) {
 					for (let i = 0; i < res.data.length; i++) {
 						specialDeptProcessList.value[i] = res.data[i].processId;
@@ -123,6 +125,7 @@
 							lotPreSumQualifiedNum.value += response.rows[i].qualifiedNum;
 						}
 					}
+
 				}
 				if (specialDeptProcessList.value.includes(workInfo.value.processId)) {
 					workInfo.value.qualifiedNum = store.dayworkInfo.processQualifiedNum > 0 ?
@@ -137,6 +140,8 @@
 				} else {
 					workInfo.value.qualifiedNum = 0;
 				}
+
+
 			});
 		init();
 		baseDialog.value.open()
@@ -146,6 +151,16 @@
 		baseDialog.value.close()
 	}
 
+	function getIsFirst(dayworkId) {
+		getIsFirstOrder(dayworkId).then(res => {
+			if (res.code == 200) {
+				isFirstOrder.value = res.data.isFirstOrder;
+			}
+		}).catch(err => {
+			console.log(err)
+		})
+	}
+
 	function resetPage() {
 		workInfo.value.qualifiedNum = null;
 		workInfo.value = {};
@@ -216,7 +231,7 @@
 	function handleScanCode() {
 		// 引入原生插件
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-		// 调用插件的 mpaasScan 方法
+		//调用插件的 mpaasScan 方法
 		mpaasScanModule.mpaasScan({
 				// 扫码识别类型，参数可多选，qrCode、barCode，
 				// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
@@ -239,50 +254,88 @@
 	}
 
 	function handlePreFinishReporting() {
+
+		//数投产
+		let number = store.dayworkInfo.processQualifiedNum == 0 ? store.dayworkInfo.oneLotQuantity : store.dayworkInfo
+			.processQualifiedNum;
+		console.log("总数", number);
+		console.log("合格量", (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value))
+		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
+		let num = 103;
 		// 填入数大于剩余量情况
-		if (store.isPreProcess && (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - store.dayworkInfo
-				.oneLotQuantity > 0)) {
-			uni.showModal({
-				title: '提示',
-				// content: `合格数总量超出投入量${parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity}，是否继续保存?`,
-				content: `合格数总量超出投入量${((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity).toFixed(3) * 100}%，是否继续保存?`,
-				success: function(res) {
-					if (res.confirm) {
-						handleSave();
-					} else if (res.cancel) {}
+		if (store.isPreProcess && (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - number > 0)) {
+			// 判断当前是否为首序
+			if (isFirstOrder.value) {
+				uni.showModal({
+					title: '提示',
+					// content: `合格数总量超出投入量${parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity}，是否继续保存?`,
+					content: `合格数总量超出投入量${(((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity) * 100).toFixed(2)}%，是否继续保存?`,
+					success: function(res) {
+						if (res.confirm) {
+							handleSave();
+						} else if (res.cancel) {}
+					}
+				})
+			} else {
+				if (percent > num) {
+					uni.showToast({
+						icon: 'none',
+						title: '合格数总量为投产量的' + percent + "%,请重新输入！"
+					})
+					return;
+				} else {
+					handleSave();
 				}
-			})
+			}
 		} else {
 			handleSave();
 		}
 	}
 
 	function handleFinishReporting() {
+		//数投产
+		let number = store.dayworkInfo.processQualifiedNum == 0 ? store.dayworkInfo.oneLotQuantity : store.dayworkInfo
+			.processQualifiedNum;
+		console.log("总数", number);
+		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
+		let num = 103;
 		if (store.isPreProcess && (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - store.dayworkInfo
 				.oneLotQuantity > 0)) {
-			uni.showModal({
-				title: '提示',
-				// content: `合格数总量超出投入量${parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity}，是否继续保存?`,
-				content: `合格数总量超出投入量${((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity).toFixed(3) * 100}%，是否继续保存?`,
-				success: function(res) {
-					if (res.confirm) {
-						if (showCarrierList.value) {
-							if (endFlag.value >= bindList.value.length) {
-								handleSave();
+			if (isFirstOrder.value) {
+				uni.showModal({
+					title: '提示',
+					// content: `合格数总量超出投入量${parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity}，是否继续保存?`,
+					content: `合格数总量超出投入量${(((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity) * 100).toFixed(2)}%，是否继续保存?`,
+					success: function(res) {
+						if (res.confirm) {
+							if (showCarrierList.value) {
+								if (endFlag.value >= bindList.value.length) {
+									handleSave();
+								} else {
+									uni.showToast({
+										icon: "none",
+										title: "请先扫码确认载具",
+										duration: 2000
+									})
+									return;
+								}
 							} else {
-								uni.showToast({
-									icon: "none",
-									title: "请先扫码确认载具",
-									duration: 2000
-								})
-								return;
+								handleSave();
 							}
-						} else {
-							handleSave();
-						}
-					} else if (res.cancel) {}
+						} else if (res.cancel) {}
+					}
+				})
+			} else {
+				if (percent > num) {
+					uni.showToast({
+						icon: 'none',
+						title: '合格数总量为投产量的' + percent + "%,请重新输入！"
+					})
+					return;
+				} else {
+					handleSave();
 				}
-			})
+			}
 		} else {
 			if (showCarrierList.value) {
 				if (endFlag.value >= bindList.value.length) {
@@ -378,14 +431,15 @@
 					.processQualifiedNum - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value
 					.qualifiedNum > 0 ? store.dayworkInfo
 					.processQualifiedNum - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value
-					.qualifiedNum : 1 
-					: 
-					store.dayworkInfo.isLast == 1 ? 
-						store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum > 0
-						? store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum : 1
-							:
-						store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum > 0 
-						? store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum : 1,
+					.qualifiedNum : 1 : store.dayworkInfo.isLast == 1 ?
+					store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value -
+					workInfo.value.qualifiedNum > 0 ?
+					store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value -
+					workInfo.value.qualifiedNum : 1 : store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum
+					.value - lotPreSumReject.value -
+					workInfo.value.qualifiedNum > 0 ?
+					store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value -
+					workInfo.value.qualifiedNum : 1,
 				reason: ''
 			})
 		}
@@ -394,7 +448,7 @@
 
 	function handleDeleteWasteInfo(index) {
 		wasteInfo.value.splice(index, 1);
-		handleInputRejectNum();
+		// handleInputRejectNum();
 	}
 
 	function handleReasonChange(item) {

pages/reportingForWork/index.vue

@@ -130,7 +130,6 @@
 	onLoad(() => {
 		curPlan.value = store.planDetails;
 		dayWorkInfo.value = store.dayworkInfo;
-		console.log(dayWorkInfo.value)
 		init();
 	})
 	// onUnload(() => {
@@ -192,6 +191,8 @@
 	}
 
 	function handleShowEndWorkDialog(data) {
+		
+		console.log("dayWorkInfo展示",dayWorkInfo.value);
 		checkBizDayworkCarriers({
 			id: store.dayworkInfo.id
 		}).then(res => {