看板调整

sd-business/src/main/java/com/sd/business/service/board/impl/DailyBoardServiceImpl.java

@@ -218,7 +218,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
                     // 新增差异订单号
                     bomDifferenceVo.getOrderWlnCodes().add(wlnCode);
                 }
-                differenceMap.put(skuSpecId, bomDifferenceVo);
+                differenceMap.put(key, bomDifferenceVo);
             }
         }
         // 筛选出有差异的bom数据
@@ -357,7 +357,6 @@ public class DailyBoardServiceImpl implements DailyBoardService {
                 .eq(OrderInfo::getSource, 2)
                 .in(OrderInfo::getId, taskMap.keySet())
                 .in(OrderInfo::getDepartmentId, departmentIds));
-        vo.setSumOrderCount(orderList.size());
         if (ObjectUtil.isEmpty(orderList)) {
             return vo;
         }
@@ -387,7 +386,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
                 }
                 BomSpecBo bomSpecBo = bomSpecBoMap.get(orderSku.getBomSpecId());
                 if (bomSpecBo == null) {
-                    quantity = quantity.add(new BigDecimal(1));
+                    quantity = quantity.add(BigDecimal.ONE);
                     continue;
                 }
                 if (Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {
@@ -395,11 +394,15 @@ public class DailyBoardServiceImpl implements DailyBoardService {
                     bomVo.setBomSpecId(bomSpecBo.getBomSpecId());
                     bomVo.setBomSpecCode(bomSpecBo.getBomSpecCode());
                     bomVo.setBomSpecName(bomSpecBo.getBomSpecName());
-                    bomVo.setQuantity(new BigDecimal(1));
+                    bomVo.setQuantity(BigDecimal.ONE);
                     outStorageBomVoList.add(bomVo);
-                    quantity = quantity.add(new BigDecimal(1));
+                    quantity = quantity.add(BigDecimal.ONE);
                 }
             }
+            if (ObjectUtil.equals(quantity, BigDecimal.ZERO)) {
+                continue;
+            }
+
             // 保存bom数量
             vo.setSumBomCount(vo.getSumBomCount().add(quantity));
 
@@ -447,6 +450,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
                 vo.setSySumBomCount(vo.getSySumBomCount().add(quantity));
             }
         }
+        vo.setSumOrderCount(vo.getBzSumOrderCount() + vo.getSySumOrderCount());
         vo.setOutStorageBomList(new ArrayList<>(outStorageBomMap.values()));
         vo.setBzOutStorageBomList(new ArrayList<>(bzOutStorageBomMap.values()));
         vo.setSyOutStorageBomList(new ArrayList<>(syOutStorageBomMap.values()));