1

dubin

8 天以前 b78ae7e1682002001305bb5a300785f14aca27f9

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

@@ -79,6 +79,12 @@
        try {
            Integer wrkNo = null;
            String orderNo = null;
            String matnr = null;
            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()) {
                String val = String.valueOf(entry.getValue());
@@ -91,13 +97,25 @@
                    modiTimeEnd = DateUtils.convert(dates[1]);
                } else if (entry.getKey().equals("wrk_no")) {
                    wrkNo = Integer.parseInt(val);
                } else if (entry.getKey().equals("condition")) {
                } 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;
                } else if (entry.getKey().equals("model")) {
                    model = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, 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, 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);