hbx пре 3 дана
родитељ
комит
f81af2d625

+ 13 - 0
src/main/java/com/jeesite/modules/mes/web/MesMaterialCheckRecordController.java

@@ -98,11 +98,23 @@ public class MesMaterialCheckRecordController extends BaseController {
 	@RequestMapping(value = "listData")
 	@ResponseBody
 	public Page<MesMaterialCheckRecord> listData(MesMaterialCheckRecord mesMaterialCheckRecord, HttpServletRequest request, HttpServletResponse response) {
+		applySnLikeQuery(mesMaterialCheckRecord);
 		mesMaterialCheckRecord.setPage(new Page<>(request, response));
 		Page<MesMaterialCheckRecord> page = mesMaterialCheckRecordService.findPage(mesMaterialCheckRecord);
 		return page;
 	}
 
+	/**
+	 * 来料码改为模糊查询(仅用于列表查询/导出,PDA 扫码入库走 findInfo 精确匹配,不受影响)
+	 */
+	private void applySnLikeQuery(MesMaterialCheckRecord mesMaterialCheckRecord) {
+		String sn = mesMaterialCheckRecord.getSn();
+		if (StringUtils.isNotBlank(sn)) {
+			mesMaterialCheckRecord.setSn(null);
+			mesMaterialCheckRecord.getSqlMap().getWhere().and("a.sn", QueryType.LIKE, sn);
+		}
+	}
+
 
 	/**
 	 * 导出数据
@@ -110,6 +122,7 @@ public class MesMaterialCheckRecordController extends BaseController {
 	@RequiresPermissions("mes:mesMaterialCheckRecord:view")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesMaterialCheckRecord mesMaterialCheckRecord, HttpServletResponse response) {
+		applySnLikeQuery(mesMaterialCheckRecord);
 		List<MesMaterialCheckRecord> list = mesMaterialCheckRecordService.findList(mesMaterialCheckRecord);
 		String fileName = "来料检查记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("来料检查记录", MesMaterialCheckRecord.class)) {