2024-09-04 枚转箱修改

src/main/java/com/sy/coinage/workshop/component/ScreenComponent.java

@@ -125,11 +125,11 @@ public class ScreenComponent {
                 vo.setQty((stock.getBoxNum() == null ? 0 : stock.getBoxNum()) + (stock.getRacketNum() == null ? 0 : stock.getRacketNum()) * p.getBoxAmount());
                 if (accountListIn != null && accountListIn.size() > 0) {
                     Integer totalQty = accountListIn.stream().filter(item -> item.getWareId().intValue() == stock.getWareId().intValue() && item.getSecuritiesId().intValue() == stock.getSecuritiesId().intValue()).collect(Collectors.toList()).stream().mapToInt(item -> item.getIncomeQty()).sum();
-                    vo.setDayInQty(totalQty / p.getBoxAmount());
+                    vo.setDayInQty(totalQty / p.getAmountPerBox());
                 }
                 if (accountListOut != null && accountListOut.size() > 0) {
                     Integer totalQty = accountListOut.stream().filter(item -> item.getWareId().intValue() == stock.getWareId().intValue() && item.getSecuritiesId().intValue() == stock.getSecuritiesId().intValue()).collect(Collectors.toList()).stream().mapToInt(item -> item.getPayQty()).sum();
-                    vo.setDayOutQty(totalQty / p.getBoxAmount());
+                    vo.setDayOutQty(totalQty / p.getAmountPerBox());
                 }
                 list.add(vo);
             }
@@ -154,11 +154,11 @@ public class ScreenComponent {
                 vo.setQty((stock.getBoxNum() == null ? 0 : stock.getBoxNum()) + (stock.getRacketNum() == null ? 0 : stock.getRacketNum()) * p.getBoxAmount());
                 if (accountListIn != null && accountListIn.size() > 0) {
                     Integer totalQty = accountListIn.stream().filter(item -> item.getSecuritiesId().intValue() == stock.getSecuritiesId().intValue()).collect(Collectors.toList()).stream().mapToInt(item -> item.getIncomeQty()).sum();
-                    vo.setDayInQty(totalQty / p.getBoxAmount());
+                    vo.setDayInQty(totalQty / p.getAmountPerBox());
                 }
                 if (accountListOut != null && accountListOut.size() > 0) {
                     Integer totalQty = accountListOut.stream().filter(item -> item.getSecuritiesId().intValue() == stock.getSecuritiesId().intValue()).collect(Collectors.toList()).stream().mapToInt(item -> item.getPayQty()).sum();
-                    vo.setDayOutQty(totalQty / p.getBoxAmount());
+                    vo.setDayOutQty(totalQty / p.getAmountPerBox());
                 }
                 list.add(vo);
             }