sku新增e10品号，库存屏蔽彩纸

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderSkuVo.java

@@ -98,4 +98,9 @@ public class OrderSkuVo extends OrderSku {
      */
     private String departmentName;
 
+    /**
+     * 订单外箱包装费
+     */
+    private BigDecimal outerBoxPackingFee;
+
 }

sd-business/src/main/java/com/sd/business/entity/sku/po/SkuSpec.java

@@ -66,6 +66,11 @@ public class SkuSpec extends BasePo {
     private String name;
 
     /**
+     * e10 品号
+     */
+    private String erpCode;
+
+    /**
      * 加工面板 字典:charge_item
      */
     private String machinedPanel;

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

@@ -137,19 +137,20 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
         Map<Long, String> map = inOutStorageErpExportVoList.stream()
                 .collect(Collectors.toMap(InOutStorageErpExportVo::getId, InOutStorageErpExportVo::getCode));
         Map<String, Integer> serialNumberMap = new HashMap<>();
-        List<InOutStorageBomErpExportVo> inOutStorageBomErpExportVoList = list.stream().map(item -> {
-            InOutStorageBomErpExportVo inOutStorageBomErpExportVo = new InOutStorageBomErpExportVo();
-            inOutStorageBomErpExportVo.setCode(map.get(item.getInOutStorageId()));
-            inOutStorageBomErpExportVo.setBomSpecCode(item.getBomSpecCode());
-            inOutStorageBomErpExportVo.setQuantity(item.getQuantity().toPlainString());
-            inOutStorageBomErpExportVo.setWarehouseCode(item.getWarehouseCode());
-            inOutStorageBomErpExportVo.setUnit("PCS");
-            inOutStorageBomErpExportVo.setPieces("0");
-            inOutStorageBomErpExportVo.setSourceRtk("OTHER");
-            inOutStorageBomErpExportVo.setUnitCost("0");
-            inOutStorageBomErpExportVo.setCostAmt("0");
-            return inOutStorageBomErpExportVo;
-        })
+        List<InOutStorageBomErpExportVo> inOutStorageBomErpExportVoList = list.stream()
+                .map(item -> {
+                    InOutStorageBomErpExportVo inOutStorageBomErpExportVo = new InOutStorageBomErpExportVo();
+                    inOutStorageBomErpExportVo.setCode(map.get(item.getInOutStorageId()));
+                    inOutStorageBomErpExportVo.setBomSpecCode(item.getBomSpecCode());
+                    inOutStorageBomErpExportVo.setQuantity(item.getQuantity().toPlainString());
+                    inOutStorageBomErpExportVo.setWarehouseCode(item.getWarehouseCode());
+                    inOutStorageBomErpExportVo.setUnit("PCS");
+                    inOutStorageBomErpExportVo.setPieces("0");
+                    inOutStorageBomErpExportVo.setSourceRtk("OTHER");
+                    inOutStorageBomErpExportVo.setUnitCost("0");
+                    inOutStorageBomErpExportVo.setCostAmt("0");
+                    return inOutStorageBomErpExportVo;
+                })
                 .sorted(comparing(InOutStorageBomErpExportVo::getCode))
                 .peek(item -> {
                     Integer serialNumber = serialNumberMap.get(item.getCode());

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"));
+        wrapper.notIn("bs", BomSpec::getCode, Arrays.asList("40904003", "409001", "40101010"));
         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/resources/mapper/order/OrderSkuMapper.xml

@@ -28,6 +28,7 @@
                oi.settlement_status orderSettlementStatus,
                oi.total_amount      orderTotalAmount,
                oi.wln_create_time,
+               oi.outer_box_packing_fee,
                ss.code              skuSpecCode,
                ss.name              skuSpecName,
                bs.name              bomSpecName,