From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期一, 20 十月 2025 08:23:58 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 40 ---------------------------------------- 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java index 416cba1..1106f24 100644 --- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java +++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java @@ -12,7 +12,6 @@ import com.core.common.R; import com.zy.asrs.entity.WrkDetlLog; import com.zy.asrs.service.WrkDetlLogService; -import com.zy.common.utils.RoleUtils; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -90,46 +89,7 @@ } else { wrapper.orderBy("appe_time", false); } - // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭� - RoleUtils.addRoleWrapperByBarcode(getUserId(), wrapper); return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper)); -// Integer wrkNo = null; -// String orderNo = null; -// String matnr = null; -// String specs = null; -// String zpallet = null; -// String batch = null; -// Double anfme = null; -// Date modiTimeStart = null, modiTimeEnd = null; -// for (Map.Entry<String, Object> entry : param.entrySet()) { -// String val = String.valueOf(entry.getValue()); -// if (Cools.isEmpty(val)) { -// continue; -// } -// if (val.contains(RANGE_TIME_LINK)) { -// String[] dates = val.split(RANGE_TIME_LINK); -// modiTimeStart = DateUtils.convert(dates[0]); -// modiTimeEnd = DateUtils.convert(dates[1]); -// } else if (entry.getKey().equals("wrk_no")) { -// wrkNo = Integer.parseInt(val); -// } else if (entry.getKey().equals("order_no")) { -// orderNo = val; -// } else if (entry.getKey().equals("specs")) { -// specs = val; -// } else if (entry.getKey().equals("zpallet")) { -// zpallet = val; -// } else if (entry.getKey().equals("batch")) { -// batch = val; -// } else if (entry.getKey().equals("anfme")) { -// anfme = Double.parseDouble(val); -// }else if (entry.getKey().equals("matnr")) { -// matnr = val; -// } -// } -// List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit); -// Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs); -// page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd)); -// return R.ok(page1); } catch (Exception e) { return R.error("寮傚父" + e); } -- Gitblit v1.9.1