2024-09-04 修改

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

@@ -172,7 +172,7 @@ public class ScreenComponent {
      */
     private List<Stock> getStockList(Integer type) {
         QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("sum(racket_num) as racket_num, securities_id, sum(box_num) as box_num, ware_cn, securities");
+        queryWrapper.select("sum(racket_num) as racket_num, securities_id, sum(box_num) as box_num, ware_cn, ware_id, securities");
         queryWrapper.gt(" ware_id", 200);
         queryWrapper.and(wq -> {
             wq.gt("racket_num", 0).or().gt("box_num", 0);
@@ -324,7 +324,7 @@ public class ScreenComponent {
             queryWrapper.eq(WorkshopAccount::getLocFrom, 1);
         }
         // 实物收发卡
-        queryWrapper.eq(WorkshopAccount::getStatType, 2);
+        queryWrapper.eq(WorkshopAccount::getStatType, 1);
         queryWrapper.between(WorkshopAccount::getCreateTime, DateUtils.getDayStartTime(date), DateUtils.getDayEndTime(date));
         List<WorkshopAccount> list = this.workshopAccountService.list(queryWrapper);
         return list;