隐藏不干胶出入库记录

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -68,7 +68,7 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
         wrapper.ge("ios", InOutStorage::getInOutStorageTime, dto.getBeginTime());
         wrapper.le("ios", InOutStorage::getInOutStorageTime, dto.getEndTime());
         // 筛选吊牌、不干胶、彩纸出入库记录
-        wrapper.notIn("bs", BomSpec::getCode, "40904003", "409001", "40101010");
+        wrapper.notIn("bs", BomSpec::getCode, "40904003", "409001", "40101010", "40904002", "40904008", "40904062", "40904024");
         Page<InOutStorageBomVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java

@@ -663,7 +663,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         wrapper.like("bs", BomSpec::getColour, dto.getBomSpecColour());
         wrapper.like("bs", BomSpec::getLength, dto.getBomSpecLength());
         wrapper.like("bs", BomSpec::getWidth, dto.getBomSpecWidth());
-        wrapper.notIn("bs", BomSpec::getCode, Arrays.asList("40904003", "409001", "40101010"));
+        wrapper.notIn("bs", BomSpec::getCode, Arrays.asList("40904003", "409001", "40101010", "40904002", "40904008", "40904062", "40904024"));
         wrapper.eq("i", Inventory::getWarehouseId, dto.getWarehouseId());
         wrapper.eq("i", Inventory::getDepartmentId, dto.getDepartmentId());
         wrapper.eq("i", InventoryBackup::getBackupDate, dto.getBackupDate());

sd-business/src/main/java/com/sd/business/service/sku/impl/SkuSpecServiceImpl.java

@@ -253,6 +253,12 @@ public class SkuSpecServiceImpl extends ServiceImpl<SkuSpecMapper, SkuSpec> impl
                     }
                 }
             }
+            if (StrUtil.isBlank(skuSpec.getMachinedPanel()) && StrUtil.isBlank(machinedPanelFileStr)) {
+                artworkLibraryList.stream()
+                        .filter(item -> Objects.equals(item.getArtworkName(), "EMPTY"))
+                        .findFirst()
+                        .ifPresent(artworkLibrary -> skuSpec.setArtworkLibraryId(artworkLibrary.getId()));
+            }
             // 保存裸垫
             BomSpec bomSpec = bomSpecMap.get(dto.getBomSpecCode());
             if (bomSpec != null) {