sku列表

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

@@ -1,5 +1,6 @@
 package com.sd.business.entity.sku.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -71,6 +72,7 @@ public class SkuDefaultPackage extends BasePo {
     /**
      * 吊牌
      */
+    @TableField("`drop`")
     private Integer drop;
 
     /**

sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuDefaultPackageSpecVo.java

@@ -14,4 +14,64 @@ import lombok.Setter;
 @Setter
 public class SkuDefaultPackageSpecVo extends SkuDefaultPackageSpec {
 
+    /**
+     * 彩纸Code
+     */
+    private String colouredPaperCode;
+
+    /**
+     * OPP膜Code
+     */
+    private String oppMembraneCode;
+
+    /**
+     * PE袋Code
+     */
+    private String peBagCode;
+
+    /**
+     * 网包Code
+     */
+    private String meshBagCode;
+
+    /**
+     * 纸箱Code
+     */
+    private String paperBoxCode;
+
+    /**
+     * 气泡袋Code
+     */
+    private String bubblePackCode;
+
+    /**
+     * 快递包材Code
+     */
+    private String logisticsPackagingMaterialCode;
+
+    /**
+     * 其他包材Code
+     */
+    private String otherPackingMaterialCode;
+
+    /**
+     * 不干胶Code
+     */
+    private String selfAdhesiveStickerCode;
+
+    /**
+     * 吊牌Code
+     */
+    private String dropCode;
+
+    /**
+     * 背带Code
+     */
+    private String suspendersCode;
+
+    /**
+     * 辅料Code
+     */
+    private String accessoryCode;
+
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.common.po.CommonPackingBomDetail;
 import com.sd.business.entity.common.vo.CommonPackingBomDetailVo;
 import com.sd.business.entity.sku.dto.SkuDefaultPackageSpecDto;
@@ -27,6 +28,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -58,6 +60,69 @@ public class SkuDefaultPackageSpecServiceImpl extends ServiceImpl<SkuDefaultPack
         wrapper.orderByDesc("sdps", SkuDefaultPackageSpec::getId);
         wrapper.like("sdps", SkuDefaultPackageSpec::getSpec, dto.getSpec());
         Page<SkuDefaultPackageSpecVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        List<SkuDefaultPackageSpecVo> records = page.getRecords();
+
+        List<Long> tempBomSpecIdList = new ArrayList<>();
+        for (SkuDefaultPackageSpecVo record : records) {
+            tempBomSpecIdList.add(record.getColouredPaperId());
+            tempBomSpecIdList.add(record.getOppMembraneId());
+            tempBomSpecIdList.add(record.getPeBagId());
+            tempBomSpecIdList.add(record.getMeshBagId());
+            tempBomSpecIdList.add(record.getPaperBoxId());
+            tempBomSpecIdList.add(record.getBubblePackId());
+            tempBomSpecIdList.add(record.getLogisticsPackagingMaterialId());
+            tempBomSpecIdList.add(record.getOtherPackingMaterialId());
+            tempBomSpecIdList.add(record.getSelfAdhesiveStickerId());
+            tempBomSpecIdList.add(record.getDropId());
+            tempBomSpecIdList.add(record.getSuspendersId());
+            tempBomSpecIdList.add(record.getAccessoryId());
+        }
+
+        List<Long> bomSpecIdList = tempBomSpecIdList.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList());
+
+        Map<Long, String> map = bomSpecService.mapKV(BaseIdPo::getId, BomSpec::getCode, q -> q.in(BaseIdPo::getId, bomSpecIdList));
+
+        for (SkuDefaultPackageSpecVo record : records) {
+            if (record.getColouredPaperId() != null) {
+                record.setColouredPaperCode(map.get(record.getColouredPaperId()));
+            }
+            if (record.getOppMembraneId() != null) {
+                record.setOppMembraneCode(map.get(record.getOppMembraneId()));
+            }
+            if (record.getPeBagId() != null) {
+                record.setPeBagCode(map.get(record.getPeBagId()));
+            }
+            if (record.getMeshBagId() != null) {
+                record.setMeshBagCode(map.get(record.getMeshBagId()));
+            }
+            if (record.getPaperBoxId() != null) {
+                record.setPaperBoxCode(map.get(record.getPaperBoxId()));
+            }
+            if (record.getBubblePackId() != null) {
+                record.setBubblePackCode(map.get(record.getBubblePackId()));
+            }
+            if (record.getLogisticsPackagingMaterialId() != null) {
+                record.setLogisticsPackagingMaterialCode(map.get(record.getLogisticsPackagingMaterialId()));
+            }
+            if (record.getOtherPackingMaterialId() != null) {
+                record.setOtherPackingMaterialCode(map.get(record.getOtherPackingMaterialId()));
+            }
+            if (record.getSelfAdhesiveStickerId() != null) {
+                record.setSelfAdhesiveStickerCode(map.get(record.getSelfAdhesiveStickerId()));
+            }
+            if (record.getDropId() != null) {
+                record.setDropCode(map.get(record.getDropId()));
+            }
+            if (record.getSuspendersId() != null) {
+                record.setSuspendersCode(map.get(record.getSuspendersId()));
+            }
+            if (record.getAccessoryId() != null) {
+                record.setAccessoryCode(map.get(record.getAccessoryId()));
+            }
+        }
+
+
         return page;
     }
 
@@ -65,6 +130,59 @@ public class SkuDefaultPackageSpecServiceImpl extends ServiceImpl<SkuDefaultPack
     public SkuDefaultPackageSpecVo detail(Long id) {
         SkuDefaultPackageSpec skuDefaultPackageSpec = this.getById(id);
         SkuDefaultPackageSpecVo result = BeanUtil.toBean(skuDefaultPackageSpec, SkuDefaultPackageSpecVo.class);
+
+        List<Long> tempBomSpecIdList = new ArrayList<>();
+        tempBomSpecIdList.add(result.getColouredPaperId());
+        tempBomSpecIdList.add(result.getOppMembraneId());
+        tempBomSpecIdList.add(result.getPeBagId());
+        tempBomSpecIdList.add(result.getMeshBagId());
+        tempBomSpecIdList.add(result.getPaperBoxId());
+        tempBomSpecIdList.add(result.getBubblePackId());
+        tempBomSpecIdList.add(result.getLogisticsPackagingMaterialId());
+        tempBomSpecIdList.add(result.getOtherPackingMaterialId());
+        tempBomSpecIdList.add(result.getSelfAdhesiveStickerId());
+        tempBomSpecIdList.add(result.getDropId());
+        tempBomSpecIdList.add(result.getSuspendersId());
+        tempBomSpecIdList.add(result.getAccessoryId());
+
+        List<Long> bomSpecIdList = tempBomSpecIdList.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList());
+        Map<Long, String> map = bomSpecService.mapKV(BaseIdPo::getId, BomSpec::getCode, q -> q.in(BaseIdPo::getId, bomSpecIdList));
+        if (result.getColouredPaperId() != null) {
+            result.setColouredPaperCode(map.get(result.getColouredPaperId()));
+        }
+        if (result.getOppMembraneId() != null) {
+            result.setOppMembraneCode(map.get(result.getOppMembraneId()));
+        }
+        if (result.getPeBagId() != null) {
+            result.setPeBagCode(map.get(result.getPeBagId()));
+        }
+        if (result.getMeshBagId() != null) {
+            result.setMeshBagCode(map.get(result.getMeshBagId()));
+        }
+        if (result.getPaperBoxId() != null) {
+            result.setPaperBoxCode(map.get(result.getPaperBoxId()));
+        }
+        if (result.getBubblePackId() != null) {
+            result.setBubblePackCode(map.get(result.getBubblePackId()));
+        }
+        if (result.getLogisticsPackagingMaterialId() != null) {
+            result.setLogisticsPackagingMaterialCode(map.get(result.getLogisticsPackagingMaterialId()));
+        }
+        if (result.getOtherPackingMaterialId() != null) {
+            result.setOtherPackingMaterialCode(map.get(result.getOtherPackingMaterialId()));
+        }
+        if (result.getSelfAdhesiveStickerId() != null) {
+            result.setSelfAdhesiveStickerCode(map.get(result.getSelfAdhesiveStickerId()));
+        }
+        if (result.getDropId() != null) {
+            result.setDropCode(map.get(result.getDropId()));
+        }
+        if (result.getSuspendersId() != null) {
+            result.setSuspendersCode(map.get(result.getSuspendersId()));
+        }
+        if (result.getAccessoryId() != null) {
+            result.setAccessoryCode(map.get(result.getAccessoryId()));
+        }
         return result;
     }
 

sd-business/src/main/resources/mapper/sku/SkuDefaultPackageMapper.xml

@@ -13,7 +13,7 @@
                sdp.logistics_packaging_material,
                sdp.other_packing_material,
                sdp.self_adhesive_sticker,
-               sdp.drop,
+               sdp.`drop`,
                sdp.suspenders,
                sdp.accessory,
                sdp.create_user,