Merge remote-tracking branch 'origin/master'

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

@@ -168,12 +168,12 @@ public class DailyBoardServiceImpl implements DailyBoardService {
             for (OrderSku orderSku : orderSkus) {
                 Long orderSkuId = orderSku.getSkuSpecId();
                 BomSpecBo bomSpecBo = bomSpecBoMap.get(orderSku.getBomSpecId());
-                if (bomSpecBo == null || !Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {
+                if (bomSpecBo != null && !Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {
                     continue;
                 }
                 OrderBomDifferenceVo bomDifferenceVo = differenceMap.computeIfAbsent(orderSku.getBomSpecId(), item -> {
                     OrderBomDifferenceVo tempOrderBomDifferenceVo = new OrderBomDifferenceVo();
-                    tempOrderBomDifferenceVo.setBomSpecCode(bomSpecBo.getBomSpecCode());
+                    tempOrderBomDifferenceVo.setBomSpecCode(bomSpecBo == null ? "未绑定" : bomSpecBo.getBomSpecCode());
                     tempOrderBomDifferenceVo.setMesQuantity(BigDecimal.ZERO);
                     tempOrderBomDifferenceVo.setWlnQuantity(BigDecimal.ZERO);
                     tempOrderBomDifferenceVo.setOrderWlnCodes(new ArrayList<>());
@@ -270,6 +270,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
                 }
                 BomSpecBo bomSpecBo = bomSpecBoMap.get(skuSpec.getBomSpecId());
                 if (bomSpecBo == null) {
+                    quantity = quantity.add(outboundOrder.getQuantity());
                     continue;
                 }
                 if (Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {
@@ -387,6 +388,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
             for (ProductionTask productionTask : productionTaskList) {
                 BomSpecBo bomSpecBo = bomSpecBoMap.get(productionTask.getBomSpecId());
                 if (bomSpecBo == null) {
+                    quantity = quantity.add(productionTask.getCompleteQuantity());
                     continue;
                 }
                 if (Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {