1

ZY

2024-08-19 fc3347a225114a8dbd37b451981109c8170b9dd4

 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java

@@ -83,6 +83,7 @@
            String specs = null;
            String zpallet = null;
            String batch = null;
            String model = null;
            Double anfme = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -106,13 +107,15 @@
                    batch = val;
                } else if (entry.getKey().equals("anfme")) {
                    anfme = Double.parseDouble(val);
                }else if (entry.getKey().equals("matnr")) {
                } else if (entry.getKey().equals("matnr")) {
                    matnr = val;
                } else if (entry.getKey().equals("model")) {
                    model = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, 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));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);