push

src/main/java/com/yxproject/start/api/TaskListApi.java

@@ -205,7 +205,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情（历史）
      * (辅助库)
-     *（下发、数据核验、预订位、平压、冲切）
+     *（创建、下发、数据核验、预订位、平压、冲切）
      * @param process 工序
      * @param resp
      * @return
@@ -216,6 +216,21 @@ public class TaskListApi {
         return objects;
     }
 
+    /**
+     * 查询任务单详情（历史）
+     * (辅助库)
+     *（分拣）
+     * @param resp
+     * @return
+     */
+    @RequestMapping("queryHistoryTaskAtAuxiliary2")
+    public List<Object> queryHistoryTaskAtAuxiliary2(@RequestParam("date") String date, HttpServletResponse resp) {
+        List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary2(date);
+        return objects;
+    }
+
+
+
 
 
 

src/main/java/com/yxproject/start/service/TaskListService.java

@@ -31,6 +31,8 @@ public interface TaskListService {
 
     public List selectHistoryTaskAtAuxiliary(long process,String date);
 
+    public List selectHistoryTaskAtAuxiliary2(String date);
+
     public Map selectByCountyAtAuxiliary2(long process);
 
     public List<Object> selectByCountyAtAuxiliary3(long process);

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -302,7 +302,6 @@ public class TaskListServiceImpl implements TaskListService {
      */
     @Override
     public List selectHistoryTaskAtAuxiliary(long process, String date) {
-        String str = "";
         int pro = (int)process;
         List<Map<String,Object>> mapList = new ArrayList<>();
         switch (pro){
@@ -310,49 +309,49 @@ public class TaskListServiceImpl implements TaskListService {
                 //查询历史任务单 大批证
                 mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common0( date);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast0(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast0(date));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind0(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind0(date));
                 break;
             case 1:
                 //查询历史任务单 大批证
                 mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common1( date);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast1(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast1(date));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind1(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind1(date));
                 break;
             case 2:
                 //查询历史任务单 大批证
                 mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common2( date);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast2(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast2(date));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind2(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind2(date));
                 break;
             case 3:
                 //查询历史任务单 大批证
                 mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common3( date);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast3(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast3(date));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(date));
                 break;
             case 4:
                 //查询历史任务单 大批证
                 mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common4( date);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast4(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast4(date));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind4(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind4(date));
                 break;
             case 5:
                 //查询历史任务单 大批证
                 mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common5( date);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(str));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date));
                 break;
                 default:
                     break;
@@ -363,6 +362,28 @@ public class TaskListServiceImpl implements TaskListService {
         return mapList1;
     }
 
+    /**
+     * 查询历史任务单详情
+     * （辅助库）
+     * （分拣）
+     * @param date 查询时间
+     * @return
+     */
+    @Override
+    public List selectHistoryTaskAtAuxiliary2( String date) {
+        List<Map<String,Object>> mapList = new ArrayList<>();
+                //查询历史任务单 大批证
+                mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common5( date);
+                //查询历史任务单 快证
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date));
+                //查询历史任务单 余证
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date));
+        List<Map<String, Object>> mapList1 = formateMap3(mapList);
+
+
+        return mapList1;
+    }
+
     /**
      * 查询组号信息
      * 受理库