| | |
| | | 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()) { |
| | |
| | | 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,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit); |
| | | List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,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)); |
| | | page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd)); |
| | | return R.ok(page1); |
| | | } catch (Exception e) { |
| | | return R.error("异常" + e); |