初始化

dubin

1 天以前 dd76858f35bb4fdd76d5976465e9bd96267b0f0b

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

@@ -80,7 +80,7 @@
            Integer wrkNo = null;
            String orderNo = null;
            String matnr = null;
            String specs = null;
            String model = null;
            String zpallet = null;
            String batch = null;
            String frozen = null;
@@ -99,8 +99,8 @@
                    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("model")) {
                    model = val;
                } else if (entry.getKey().equals("zpallet")) {
                    zpallet = val;
                } else if (entry.getKey().equals("batch")) {
@@ -113,9 +113,9 @@
                    frozen = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, frozen, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, frozen, 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,frozen));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd,frozen));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);