售后单不计算背带类包材

sd-business/src/main/java/com/sd/business/service/order/impl/OrderExchangeServiceImpl.java

@@ -185,8 +185,7 @@ public class OrderExchangeServiceImpl extends ServiceImpl<OrderExchangeMapper, O
                 .filter(item -> {
                     BomSpecBo bomSpecBo = bomSpecBoMap.get(item.getBomSpecId());
                     if (bomSpecBo == null
-                            || !(Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG)
-                                || Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.SUSPENDERS))) {
+                            || !(Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG))) {
                         return false;
                     }
                     return true;
@@ -380,8 +379,7 @@ public class OrderExchangeServiceImpl extends ServiceImpl<OrderExchangeMapper, O
                     .filter(item -> {
                         BomSpecBo bomSpecBo = bomSpecBoMap.get(item.getBomSpecId());
                         if (bomSpecBo == null
-                                || Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG)
-                                    || Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.SUSPENDERS)) {
+                                || Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG)) {
                             return false;
                         }
                         return true;

sd-business/src/main/java/com/sd/business/service/statement/impl/StatementOfAccountServiceImpl.java

@@ -1133,8 +1133,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                 .filter(item -> {
                     BomSpecBo bomSpecBo = bomSpecBoMap.get(item.getBomSpecId());
                     if (bomSpecBo == null
-                            || !(Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG)
-                                || Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.SUSPENDERS))) {
+                            || !(Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG))) {
                         return false;
                     }
                     return true;

sd-wln/src/main/java/com/sd/wln/service/impl/WLnSalesReturnStockInServiceImpl.java

@@ -159,8 +159,7 @@ public class WLnSalesReturnStockInServiceImpl implements WlnSalesReturnStockInSe
                         .map(b -> {
                             BomSpecBo bomSpecBo = bomSpecBoMap.get(b.getBomSpecId());
                             if (bomSpecBo == null
-                                    || !(Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG)
-                                    || Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.SUSPENDERS))) {
+                                    || !Objects.equals(bomSpecBo.getClassifyId(), BomClassifyConstant.MESH_BAG)) {
                                 return BigDecimal.ZERO;
                             }
                             return b.getUnitPrice().multiply(b.getQuantity());

sd-wln/src/main/java/com/sd/wln/service/impl/WlnReturnOrderServiceImpl.java

@@ -29,7 +29,7 @@ public class WlnReturnOrderServiceImpl implements WlnReturnOrderService {
         // 获取万里牛数据
         List<JSONObject> wlnReturnOrderList = getWlnReturnOrder();
         // 筛选条件
-        List<Integer> wlnTypeList = Arrays.asList(0, 4);
+        List<Integer> wlnTypeList = Arrays.asList(0, 1, 4);
         List<Integer> wlnStatusList = Arrays.asList(0, 1);
 
         if (ObjectUtil.isEmpty(wlnReturnOrderList)) {