日计划排产 日计划查询

src/main/java/com/letian/modules/base/controller/BoardController.java

@@ -74,11 +74,9 @@ public class BoardController {
     @ResponseBody
     public Object getNewScheduledTableData(@PathVariable("number") int number){
         Map<String, Object> map = new HashMap<>();
-        try {
-            List<NewScheduledData> result = boardService.getNewScheduledTableData(number);
+         try {
+             map = boardService.getNewScheduledTableData(number);
             map.put("success", true);
-            map.put("rows", result);
-            map.put("total", result.size());
         } catch (Exception e) {
             map.put("success", false);
             map.put("msg", e.getMessage());

src/main/java/com/letian/modules/base/service/BoardService.java

@@ -18,7 +18,7 @@ public interface BoardService {
     String getTime() ;
 
 
-    List<NewScheduledData> getNewScheduledTableData( int number);
+    Map<String, Object>  getNewScheduledTableData( int number);
 
     /**
      *@Description 获取看板刷新时间

src/main/java/com/letian/modules/base/service/Impl/BoardServiceImpl.java

@@ -24,7 +24,8 @@ public class BoardServiceImpl implements BoardService {
 
 
     @Override
-    public List<NewScheduledData> getNewScheduledTableData(int number){
+    public Map<String, Object>  getNewScheduledTableData(int number){
+        Map<String, Object> map = new HashMap<>();
         String date = DateUtil.getStringDate(new Date());
         // String date="2022-05-22";
         List<NewScheduledData> tableList =boardDao.getNewScheduledTableList(date);
@@ -34,7 +35,9 @@ public class BoardServiceImpl implements BoardService {
             tableList.add(tableData);
         }
         if(tableList.size()<=5){
-            return tableList;
+            map.put("rows", tableList);
+            map.put("num", 0);
+            map.put("total", tableList.size());
         }else {
             int max=(tableList.size()+4)/5;
             if(number>=max){
@@ -45,15 +48,22 @@ public class BoardServiceImpl implements BoardService {
                 for (int i = 0; i +5*number< tableList.size(); i++) {
                     result.add(tableList.get(i +5*number));
                 }
-                return result;
+                map.put("rows", result);
+                map.put("num", number+1);
+                map.put("total", result.size());
             }else {
                 List<NewScheduledData> result=new ArrayList<>();
                 for (int i = 0; i < 5; i++) {
                     result.add(tableList.get(i +5*number));
                 }
-                return result;
+                map.put("rows", result);
+                map.put("num", number+1);
+                map.put("total", result.size());
             }
+
+
         }
+        return  map;
     }
 
     @Override

src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java

@@ -223,7 +223,7 @@ public class PalletServiceImpl implements PalletService {
         if(!"已装货".equals(check.get(0).getStatus())){
             throw new RuntimeException("该栈板状态不为已装货无法入库！");
         }
-
+        //乐天需要每个订单生成一条单据 通过查到的orderNo区分
         Map<String, List<StockDataInData>> collect = inLists.stream().collect(Collectors.groupingBy(StockDataInData::getOrderNo));
 
         for(String key : collect.keySet()){
@@ -246,6 +246,7 @@ public class PalletServiceImpl implements PalletService {
             if(qtyLists.size()==0){
                 throw new RuntimeException("该栈板下不存在货物！");
             }
+            //先把栈板中含有的所有订单找出来 再通过orderNo区分
             for (int i = 0; i < qtyLists.size(); i++) {
                 if(qtyLists.get(i).getOrderNo().equals(inList.get(0).getOrderNo())){
                     qtyList.add(qtyLists.get(i));