11.6

api/business/dayWork.js

@@ -78,6 +78,13 @@ export function getAvailableCarrierList(data) {
 		data: data
 	})
 }
+export function getCarrierTotalList(data) {
+	return req.request({
+		url: '/business/daywork/getCarrierTotalList',
+		method: 'GET',
+		data: data
+	})
+}
 export function getDayworkInfoById(data) {
 	return req.request({
 		url: '/business/daywork/getDayworkInfoById',

api/business/planDetails.js

@@ -6,4 +6,18 @@ export function getPlanDetailsList(data) {
 		method: 'POST',
 		data: data
 	})
+}
+export function selectByCarrierCode(data) {
+	return req.request({
+		url:'/business/productionPlanDetail/selectByCarrierCode',
+		method: 'Get',
+		data: data
+	})
+}
+export function selectInfoByLotCode(data) {
+	return req.request({
+		url:'/business/productionPlanDetail/selectInfoByLotCode',
+		method: 'Get',
+		data: data
+	})
 }

components/dialog-selectDaywork/dialog-selectDaywork.vue

@@ -0,0 +1,148 @@
+<template>
+	<dialog-base ref="baseDialog" title="请选择批次">
+		<view>
+			<uni-section title="批次" type="line">
+				<uni-data-select v-model="selectedLot" :localdata="lotList" :clear="false"
+					@change="handleLotChange"></uni-data-select>
+			</uni-section>
+		</view>
+
+		<view class="add-btn-container uni-row">
+			<button type="primary" class="btn" @click="handleStart">确定</button>
+		</view>
+	</dialog-base>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import {
+		store
+	} from '@/store/index.js'
+
+	const baseDialog = ref(null)
+	const selectedLot = ref("")
+	const lotList = ref([])
+	const emit = defineEmits(['handleSelectDaywork'])
+
+
+	// onLoad(() => {
+
+	// })
+
+	function open(data) {
+		lotList.value = data.map(v => ({
+			text: v.lotCode,
+			value: v.lotCode,
+		}))
+		selectedLot.value = lotList.value[0].value
+
+		baseDialog.value.open();
+	}
+
+	function handleLotChange() {
+		console.log("选中", selectedLot.value);
+	}
+
+	function handleStart() {
+		emit('handleSelectDaywork', selectedLot.value);
+		close()
+	}
+
+	function close() {
+		baseDialog.value.close()
+	}
+
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss">
+	.dialog-body {
+		.equipment-container {
+			height: 300rpx;
+			overflow: auto;
+			flex-wrap: wrap;
+			justify-content: flex-start;
+			margin: 24rpx 0 0 7%;
+
+			.item {
+				width: 236rpx;
+				height: 60rpx;
+				text-align: center;
+				line-height: 60rpx;
+				border-radius: 6rpx;
+				margin: 16rpx;
+				flex: 0 0 40%;
+				border: 1px solid #000000;
+			}
+
+			.selected {
+				background-color: #1684fc;
+				color: #FFF;
+			}
+		}
+
+		.add-btn-container {
+			margin-top: 32rpx;
+
+			.btn {
+				flex: 1;
+			}
+		}
+
+		.switch {
+			font-size: 26rpx;
+			align-items: center;
+			justify-content: space-between;
+			margin: 16rpx;
+		}
+
+		.userList {
+			border: 1rpx solid #1684fc;
+			border-radius: 8rpx;
+			max-height: 300rpx;
+			overflow: auto;
+			width: 100%;
+
+			.showUser {
+				justify-content: flex-start;
+				flex-wrap: wrap;
+
+				.user {
+					border: 1rpx solid #999;
+					border-radius: 8rpx;
+					width: 150rpx;
+					height: 50rpx;
+					text-align: center;
+					line-height: 50rpx;
+					margin: 10rpx;
+					overflow: auto;
+				}
+			}
+		}
+
+		.selectedUserList {
+			width: 100%;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+
+			.selectedUser {
+				border: 1rpx solid #999;
+				border-radius: 8rpx;
+				width: 150rpx;
+				height: 50rpx;
+				text-align: center;
+				line-height: 50rpx;
+				margin: 20rpx 20rpx 0 0;
+				justify-content: space-around;
+
+			}
+		}
+	}
+</style>

pages.json

@@ -28,6 +28,13 @@
 				// "enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/sortProductionPlan/details",
+			"style": {
+				"navigationBarTitleText": "查箱号",
+				"onReachBottomDistance": 100
+			}
+		},
 		{
 			"path": "pages/batchReporting/index",
 			"style": {

pages/deliveryInspection/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column">
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -181,6 +181,11 @@
 		});
 		}	
 	}
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 	//扫码
 	function handleScan() {
 		// 引入原生插件

pages/factoryInspection/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column">
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -166,6 +166,11 @@
 			}
 		});
 	}
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 	function delable(item) {
 		if(store.userInfo.roles.some(item =>item.roleKey == 'factoryInspection')) {
 			return true

pages/firstInspection/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column">
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -153,6 +153,11 @@
 			url: '/pages/firstInspection/reviewScan'
 		})
 	}
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 	function getList() {
 		uni.showLoading({
 			title: '加载中'

pages/inspectionDetails/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column">
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -187,7 +187,14 @@
 			}
 		});
 	}
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 	function handleChangeStatus() {
+		pageNum.value = 1
+		status.value = true
 		getList()
 	}
 

pages/instrumentRoomInspection/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column">
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -180,6 +180,11 @@
 		});
 		uni.hideLoading();
 	}
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 	function delable(item) {
 		if (item.creatorId === store.userInfo.userId) {
 			return true

pages/onSiteInspection/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column" >
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -146,6 +146,11 @@
 		})
 		}
 	})
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 	function getList() {
 		uni.showLoading({
 			title: '加载中'

pages/outsourcedInspection/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-container uni-column">
 		<view class="search-container uni-row">
 			<input type="text" v-model="quer.keyword" placeholder="请输入关键字" />
-			<view class="btn uni-row" @click="getList">搜索</view>
+			<view class="btn uni-row" @click="handleSearch">搜索</view>
 			<!-- <uni-icons type="scan" size="24" /> -->
 		</view>
 
@@ -164,6 +164,11 @@
 			}
 		});
 	}
+	function handleSearch() {
+		pageNum.value = 1
+		status.value = true
+		getList()
+	}
 
 	//查询P2中外协完成后需要检查的工序
 	function getP2() {

pages/productionPlan/index.vue

@@ -17,6 +17,8 @@
 					<view class="title uni-row">
 						<text class="label">生产计划单号</text>
 						<text class="label code">{{ item['productionPlanNo'] }}</text>
+						<text class="label" style="margin-left: 20px;">序号</text>
+						<text class="label code">{{ item['lineNumber'] }}</text>
 					</view>
 					<view v-if="item['dayWorkList'].length > 0" class="tag"><text class="label">进行中</text></view>
 					<view v-else type="default" class="tag not-start"><text class="label">未开始</text></view>

pages/reportHistory/index.vue

@@ -153,6 +153,11 @@
 				<view class="item-info uni-row">
 					<text class="label">设备</text>
 					<text class="label right">{{ item['equipmentDetailCode'] }}</text>
+					<view class="uni-row" style="justify-content: flex-end;margin-left: 20px;" v-if="item['adoptStatus'] && item['adoptStatus'] != null">
+						<text >交检状态:</text>
+						<text  v-if="item['adoptStatus'] == 1" style="color: #67c337;"	>正常</text>
+						<text  v-if="item['adoptStatus'] == 2" style="color: red;"	>反选</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -318,7 +323,9 @@
 		      processId: current.processId,
 		      qualifiedNum: current.qualifiedNum,
 		      rejectSum: current.rejectSum,
-		      endTime: endTimeStatus
+		      endTime: endTimeStatus,
+			  adoptStatus:current.adoptStatus == null? null:current.adoptStatus
+			 
 		    });
 		  }
 		}

pages/sortBatchReporting/index.vue

@@ -145,6 +145,7 @@
 		normalizeProps,
 		reactive,
 		onMounted,
+		getCurrentInstance,
 		ref
 	} from 'vue'
 	import {
@@ -202,9 +203,20 @@
 	const curProcessAfte = ref([])
 	const showRight = ref(null) // 抽屉
 	const editStatus = ref(false)
-	onLoad(() => {
+	
+	onLoad((options) => {
 		curPlan.value = store.planDetails;
 		normalStatus.value = true;
+		console.log(store.planDetails)
+		if(options != null) {
+			console.log(options)
+			console.log("999")
+			keywords.value = options.param1
+			if(store.planDetails.isAmend == 1 || store.planDetails.isWasteRecycling ==1){
+				normalStatus.value = false;
+			}
+		}
+	
 		console.log(curPlan.value)
 		//废品回用的领料部门如果是当前工段，也要可以开始新批次
 		//查找当前计划单下的批次废品回用是当前工段

pages/sortProductionPlan/details.vue

@@ -0,0 +1,241 @@
+<template>
+	<view class="uni-column" style="padding: 24rpx">
+		<view class="box-bg uni-row">
+			<view class="input-view uni-row">
+				<uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
+				<input class="nav-bar-input" type="text" v-model="keywords" placeholder="输入搜索关键词" />
+			</view>
+			<view class="search" @click="handleSearch">搜索</view>
+		</view>
+		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
+			<text>暂无周转到该工段批次</text>
+		</view>
+		<view v-else style="height: calc(100% - 100rpx); overflow: auto;">
+			<view v-for="(item, index) in listData" :key="index"
+				class="list-item">
+				<view class="title-container uni-row">
+					<view class="title uni-row">
+						<text class="label">批次号</text>
+						<text class="label code">{{ item['lotCode'] }}</text>
+					</view>
+				</view>
+				<view class="item-info uni-row">
+					<text class="label">产品描述</text>
+					<text class="label right">{{ item['productDescription'] }}</text>
+				</view>
+				<view class="item-info uni-row">
+					<text class="label">箱号</text>
+					<text class="label right">{{ item['carrierCode'] }}</text>
+				</view>
+				<view class="item-info uni-row">
+					<text class="label">所在区域</text>
+					<text class="label right">{{ item['place'] }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		getCarrierTotalList
+	} from '@/api/business/dayWork.js'
+	import {
+		ref
+	} from 'vue'
+	import {
+		onReady,
+		onLoad,
+		onUnload,
+		onReachBottom,
+		onShow
+	} from '@dcloudio/uni-app'
+	import {
+		store
+	} from '@/store/index.js'
+
+
+	const listData = ref([])
+	const keywords = ref('')
+	const pageSize = ref(10)
+	const pageNum = ref(1)
+	const status = ref(true)
+
+	onShow(() => {
+		reflush();
+	})
+
+	function reflush() {
+		init();
+	}
+	onReachBottom(()=>{
+		console.log(status.value)
+		if(status.value) {
+		pageNum.value += 1
+
+		getCarrierTotalList({
+			deptId: Number(store.curDeptDetails.deptId),
+			keywords: keywords.value,
+			userId:store.userInfo.userId,
+			pageNum:pageNum.value,
+			pageSize:pageSize.value
+		}).then(res =>{
+		 const existingIds = new Set(listData.value.map(item => item.lotCode));
+		
+		  // 过滤出那些不在 existingIds 中的项，即新数据
+		  const newRows = res.data.filter(row => !existingIds.has(row.lotCode));
+		
+		  // 如果有新数据，将其添加到 listData
+		  if (newRows.length > 0) {
+		    listData.value = listData.value.concat(newRows);
+		  } else {
+		    // 如果没有新数据，更新状态表示没有更多数据
+		    status.value = false;
+		  }
+		})
+		}
+	})
+
+	function init(data) {
+		uni.showLoading({
+			title: '加载中'
+		});
+		getCarrierTotalList({
+			deptId: Number(store.curDeptDetails.deptId),
+			keywords: keywords.value,
+			userId:store.userInfo.userId,
+			pageNum:pageNum.value,
+			pageSize:pageSize.value
+		}).then(res => {
+			if (res.code == 200) {
+				listData.value = res.data;
+				uni.hideLoading();
+			}
+			uni.hideLoading();
+		})
+	}
+
+	function handleSearch() {
+		let reqParam = {
+			keywords: keywords.value
+		}
+		reqParam.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId;
+		pageNum.value = 1
+		status.value = true
+		init(reqParam)
+	}
+</script>
+
+<style lang="scss">
+	$nav-height: 60rpx;
+
+	.box-bg {
+		width: 100%;
+		background-color: #F5F5F5;
+		padding: 5rpx 0;
+		justify-content: space-around;
+		align-items: center;
+
+		.input-view {
+			width: 100%;
+			flex: 4;
+			background-color: #f8f8f8;
+			height: $nav-height;
+			border: 1rpx solid #999;
+			border-radius: 15rpx;
+			padding: 0 15rpx;
+			flex-wrap: nowrap;
+			margin: 0 10rpx 20rpx;
+			line-height: $nav-height;
+
+			.input-uni-icon {
+				line-height: $nav-height;
+			}
+
+			.nav-bar-input {
+				width: 80%;
+				height: $nav-height;
+				line-height: $nav-height;
+				padding: 0 5rpx;
+				background-color: #f8f8f8;
+			}
+		}
+
+		.search {
+			width: 20%;
+			text-align: center;
+			color: #808080;
+			margin-top: -20rpx;
+		}
+	}
+
+	.uni-column {
+		background-color: rgba(245, 245, 245, 1);
+		height: calc(100% - 40rpx);
+	}
+
+	.list-item {
+		background-color: #fff;
+		position: relative;
+		padding: 16rpx;
+		padding-bottom: 24rpx;
+		border-radius: 24rpx;
+		margin-bottom: 24rpx;
+
+		.title-container {
+			justify-content: space-between;
+			margin-top: 8rpx;
+			margin-bottom: 16rpx;
+
+			.title {
+				height: 48rpx;
+				align-items: center;
+
+				.label {
+					font-size: 32rpx;
+					font-weight: bold;
+
+					&.code {
+						margin-left: 8rpx;
+					}
+				}
+			}
+
+			.tag {
+				border: 1px solid #1ce5b0;
+				background-color: #f6fffd;
+				padding: 8rpx;
+				border-radius: 8rpx;
+
+				.label {
+					color: #1ce5b0;
+					font-size: 24rpx;
+				}
+
+				&.not-start {
+					border: 1px solid #bbbbbb;
+					background-color: #f5f5f5;
+
+					.label {
+						color: #bbbbbb;
+					}
+				}
+			}
+		}
+
+		.item-info {
+			margin-bottom: 8rpx;
+
+			.label {
+				font-size: 28rpx;
+				width: 220rpx;
+				color: #808080;
+
+				&.right {
+					flex: 1;
+					color: #000000;
+				}
+			}
+		}
+	}
+</style>

pages/sortProductionPlan/index.vue

@@ -10,13 +10,15 @@
 		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
 			<text>暂无生产计划</text>
 		</view>
-		<view v-else style="height: calc(100% - 100rpx); overflow: auto;">
+		<view v-else style="height: calc(100% - 100rpx); overflow: auto;padding-bottom: 100rpx;">
 			<view v-for="(item, index) in listData" :key="index" @click="handleToBatchReporting(item)"
 				class="list-item">
 				<view class="title-container uni-row">
 					<view class="title uni-row">
 						<text class="label">生产计划单号</text>
 						<text class="label code">{{ item['productionPlanNo'] }}</text>
+						<text class="label" style="margin-left: 20px;">序号</text>
+						<text class="label code">{{ item['lineNumber'] }}</text>
 					</view>
 					<view v-if="item['dayWorkList'].length > 0" class="tag"><text class="label">进行中</text></view>
 					<view v-else type="default" class="tag not-start"><text class="label">未开始</text></view>
@@ -43,12 +45,19 @@
 				</view>
 			</view>
 		</view>
+		<view class="bottom uni-row">
+			<button class="start-batch-btn" style="margin-right: 10rpx;background-color: #67c337;"
+				@click="handleScanCode">扫码报工</button>
+			<button class="start-batch-btn" type="primary" @click="handleSearchCode">查箱号</button>
+		</view>
+		<dialog-selectDaywork ref='selectDaywork'
+			@handleSelectDaywork='handleSelectDaywork'></dialog-selectDaywork>
 	</view>
 </template>
 
 <script setup>
 	import {
-		getPlanDetailsList
+		getPlanDetailsList,selectByCarrierCode,selectInfoByLotCode
 	} from '@/api/business/planDetails.js'
 	import {
 		ref
@@ -73,6 +82,8 @@
 
 	const listData = ref([])
 	const keywords = ref('')
+	const selectDaywork = ref(null)
+	const carrierCode = ref(null)
 
 	onLoad(() => {
 		// dayworkItem数据更改后刷新数据
@@ -108,6 +119,7 @@
 	})
 
 	function reflush() {
+		keywords.value = ''
 		init();
 	}
 
@@ -133,6 +145,30 @@
 			url: '/pages/sortBatchReporting/index'
 		})
 	}
+	//查箱号
+	function handleSearchCode() {
+		uni.navigateTo({
+			url: '/pages/sortProductionPlan/details'
+		})
+	}
+	//带回
+	function handleSelectDaywork(data) {
+		console.log(data)
+		//查询计划单信息跳转
+		selectInfoByLotCode({lotCode:data}).then(res=>{
+			store.planDetails = res.data
+			var code = encodeURIComponent(carrierCode.value);
+			// 构建查询参数字符串
+			var queryParam =
+				`param1=${code}`;
+			
+			// 使用模板字符串构建完整的URL
+		var navigateUrl = `/pages/sortBatchReporting/index?${queryParam}`;
+		uni.navigateTo({
+			url: navigateUrl
+		});
+	})
+	}
 
 	function handleSearch() {
 		let reqParam = {
@@ -141,6 +177,77 @@
 		reqParam.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId;
 		init(reqParam)
 	}
+	function handleScanCode() {
+		// 引入原生插件
+		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+		// const mpaasScanModule = null
+		if (mpaasScanModule) {
+			// 调用插件的 mpaasScan 方法
+			mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，
+					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+					scanType: ["qrCode", "barCode"],
+					// 是否隐藏相册，默认false不隐藏
+					hideAlbum: false,
+				},
+				(ret) => {
+					console.log(ret);
+					let vehicleObj = {
+						carrierCode: ret.resp_result
+					};
+					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
+						uni.showToast({
+							icon: "none",
+							title: "请扫载具码",
+							duration: 1000
+						})
+						return;
+					}
+					selectByCarrierCode({
+						carrierCode: vehicleObj.carrierCode,
+						deptId:Number(store.curDeptDetails.deptId)
+					}).then(response => {
+							carrierCode.value = vehicleObj.carrierCode
+						if (response.code == 200) {
+							if (response.data.length > 1) {
+								selectDaywork.value.open(response.data)	
+																		
+							} else {
+								handleSelectDaywork(response.data[0].lotCode)
+							}
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: response.msg,
+								duration: 2000
+							})
+						}
+					})
+				}
+			);
+		} else {
+			// 测试时用
+			selectByCarrierCode({
+				carrierCode: '000745',
+				deptId:Number(store.curDeptDetails.deptId)
+			}).then(response => {
+				if (response.code == 200) {
+					carrierCode.value = '000745'
+					if (response.data.length > 1) {
+						selectDaywork.value.open(response.data)								
+					} else {
+						handleSelectDaywork(response.data[0].lotCode)
+					}
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: response.msg,
+						duration: 2000
+					})
+				}
+			})
+		}
+	}
 </script>
 
 <style lang="scss">
@@ -255,4 +362,36 @@
 			}
 		}
 	}
+	.bottom {
+		height: 10%;
+		position: fixed;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		height: 100rpx;
+		border-top: 1px solid #999999;
+		padding: 16rpx 32rpx;
+		align-items: center;
+		background-color: #fff;
+		justify-content: space-evenly;
+	
+		.start-batch-btn {
+			flex: 1;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: 8rpx;
+			color: #FFFFFF;
+			font-size: 28rpx;
+		}
+	
+		.view-end-btn {
+			flex: 1;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: 8rpx;
+			color: #FFFFFF;
+			font-size: 28rpx;
+	
+		}
+	}
 </style>