wk/mdc_wk.git - Gitblit

			@@ -207,10 +207,10 @@
			sb.append(String.format("设备编码[%s]使用车间或设备管理员为空，无法导入\n\n", eamEquipment.getEquipmentCode()));
			continue;
			}
			if (eamEquipment.getAcceptanceCheckDate() == null) {
			sb.append(String.format("设备编码[%s]验收为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
			continue;
			}
			// if (eamEquipment.getAcceptanceCheckDate() == null) {
			// sb.append(String.format("设备编码[%s]验收为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
			// continue;
			// }
			if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
			sb.append(String.format("设备编码[%s]技术状态为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
			continue;

			@@ -61,7 +61,8 @@
			queryWrapper.in("e.equipment_code", equipArr);
			} else {
			//没有选择设备，根据车间过滤设备
			queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId()); }
			queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
			}
			if(eamMaintenanceStandard != null) {
			//编码模糊查询
			if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardCode())) {

	lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史