Merge remote-tracking branch 'origin/smf-core-21088' into smf-core-21088

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/TicketSortingController.java

@@ -95,11 +95,11 @@ public class TicketSortingController {
 
         for (int i = 1; i < 7; i++) {
             List<Object> list = new ArrayList<>();
-            list.add(BoxHandleUtil.getCountByPartition(allCountMap, box + "-0"+i));    //隔口总的数量
             list.add(BoxHandleUtil.getCountByPartition(needOutCountMap, box + "-0"+i)); //隔口出库的数量
+            list.add(BoxHandleUtil.getCountByPartition(allCountMap, box + "-0"+i));    //隔口总的数量
+            list.add(i); //隔口号
             String pn = pnMap.get(box+"-0"+i) == null ? "": pnMap.get(box+"-0"+i); //隔口pn
             list.add(pn);
-            list.add(i); //隔口号
             boxInfoList.add(list);
         }