YiWuProject.git

			@@ -183,8 +183,9 @@
			<el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" />
			<el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" />
			<el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
			<el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
			<el-table-column prop="filmsid" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
			<el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
			<el-table-column prop="createTime" align="center" :label="$t('workOrder.time')" min-width="120" />
			<el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200">
			<!-- <template #default="scope">
			{{ scope.row.status==0?"未磨边":scope.row.status==1?"磨边中":"已磨边" }}

			@@ -31,8 +31,8 @@
			LambdaQueryWrapper<LoadGlassDeviceTaskHistory> wrapper = new LambdaQueryWrapper<LoadGlassDeviceTaskHistory>()
			.like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
			.like(StringUtils.isNotBlank(request.getRawGlassHeight()), LoadGlassDeviceTaskHistory::getRawGlassHeight, request.getRawGlassHeight())
			.like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
			.like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
			.like(StringUtils.isNotBlank(request.getRawGlassThickness()), LoadGlassDeviceTaskHistory::getRawGlassThickness, request.getRawGlassThickness())
			.like(StringUtils.isNotBlank(request.getRawGlassfilmsId()), LoadGlassDeviceTaskHistory::getRawGlassFilmsId, request.getRawGlassfilmsId())
			.eq(request.getStation() != 0, LoadGlassDeviceTaskHistory::getStation, request.getStation())
			.eq(request.getSlot() != 0, LoadGlassDeviceTaskHistory::getSlot, request.getSlot())
			.in(CollectionUtil.isNotEmpty(request.getTaskStateList()), LoadGlassDeviceTaskHistory::getTaskState, request.getTaskStateList())

	UI-Project/src/views/StockBasicData/stockBasicData.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史