#

Administrator

15 小时以前 c8d0aaf6a77a28d8d934d6ccbcae3560296b3c09

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

@@ -84,6 +84,8 @@
            String zpallet = null;
            String batch = null;
            String model = null;
            String unit = null;
            String brand = null;
            Double anfme = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -111,11 +113,15 @@
                    matnr = val;
                }else if (entry.getKey().equals("model")) {
                    model = val;
                }else if (entry.getKey().equals("unit")) {
                    unit = val;
                }else if (entry.getKey().equals("brand")) {
                    brand = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd, curr, limit);
            Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);