字典配置调整

sd-business/src/main/java/com/sd/business/entity/dict/dto/DictConfigDataSelectDto.java

@@ -20,7 +20,7 @@ public class DictConfigDataSelectDto extends BaseSelectDto {
     private String dictCode;
 
     /**
-     * 字典key
+     * 字典Value
      */
-    private String dictKey;
+    private String dictValue;
 }

sd-business/src/main/java/com/sd/business/entity/dict/po/DictConfigData.java

@@ -46,6 +46,11 @@ public class DictConfigData extends BasePo {
     private String imgUrl;
 
     /**
+     * rgb编码
+     */
+    private String rgbCode;
+
+    /**
      * 排序
      */
     private Integer sort;

sd-business/src/main/java/com/sd/business/service/dict/impl/DictConfigDataServiceImpl.java

@@ -35,7 +35,7 @@ public class DictConfigDataServiceImpl extends ServiceImpl<DictConfigDataMapper,
                 .selectAll(DictConfigData.class)
                 .from(DictConfigData.class)
                 .eq(DictConfigData::getDictCode, dto.getDictCode())
-                .eq(DictConfigData::getDictKey, dto.getDictKey())
+                .like(DictConfigData::getDictValue, dto.getDictValue())
                 .orderByDesc(DictConfigData::getId)
                 .list();
 
@@ -49,7 +49,7 @@ public class DictConfigDataServiceImpl extends ServiceImpl<DictConfigDataMapper,
                 .selectAll(DictConfigData.class)
                 .from(DictConfigData.class)
                 .eq(DictConfigData::getDictCode, dto.getDictCode())
-                .eq(DictConfigData::getDictKey, dto.getDictKey())
+                .like(DictConfigData::getDictValue, dto.getDictValue())
                 .orderByDesc(DictConfigData::getId)
                 .page(dto);
 
@@ -74,19 +74,21 @@ public class DictConfigDataServiceImpl extends ServiceImpl<DictConfigDataMapper,
     public void add(DictConfigDataDto dto) {
         this.save(dto);
 
-        ObsFile imgFile = new ObsFile();
-        imgFile.setId(dto.getImgId());
-        ObsFileUtil.saveFile(Collections.singletonList(imgFile), dto.getId(), 1);
+        if (dto.getImgId() != null) {
+            ObsFile imgFile = new ObsFile();
+            imgFile.setId(dto.getImgId());
+            ObsFileUtil.saveFile(Collections.singletonList(imgFile), dto.getId(), 1);
+        }
     }
 
     @Override
     public void edit(DictConfigDataDto dto) {
         this.updateById(dto);
-
-        ObsFile imgFile = new ObsFile();
-        imgFile.setId(dto.getImgId());
-        ObsFileUtil.editFile(Collections.singletonList(imgFile), dto.getId(), 1);
-
+        if (dto.getImgId() != null) {
+            ObsFile imgFile = new ObsFile();
+            imgFile.setId(dto.getImgId());
+            ObsFileUtil.editFile(Collections.singletonList(imgFile), dto.getId(), 1);
+        }
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.SecurityUtils;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.order.dto.BulkOrderConfirmDto;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -234,11 +236,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         BeanUtil.copyProperties(dto, orderMessage);
         orderMessage.setOperator(SecurityUtils.getLoginUser().getUser().getNickName());
 
-        List<OrderSkuDetail> orderSkuDetailList = BeanUtil.copyToList(dto.getOrderSkuList(), OrderSkuDetail.class);
-        // 赋值mes系统bom id
-        bomSpecService.attributeAssign(orderSkuDetailList, OrderSkuDetail::getBomSpecId, (item, bomSpec) -> {
-            item.setBomSpecId(bomSpec.getMesId());
-        });
+        List<OrderSkuDto> orderSkuList = dto.getOrderSkuList();
+        List<Long> bomSpecIds = orderSkuList.stream().map(OrderSku::getBomSpecId).collect(Collectors.toList());
+        Map<Long, Long> bomSpecMap = bomSpecService.mapKV(BaseIdPo::getId, BomSpec::getMesId, q -> q.in(BaseIdPo::getId, bomSpecIds));
+
+        List<OrderSkuDetail> orderSkuDetailList = orderSkuList.stream().map(item -> {
+            OrderSkuDetail orderSkuDetail = new OrderSkuDetail();
+            orderSkuDetail.setBomSpecId(bomSpecMap.get(item.getBomSpecId()));
+            orderSkuDetail.setPackagingSet(item.getPackagingSet());
+            orderSkuDetail.setQuantity(item.getQuantity());
+            orderSkuDetail.setPrintType(item.getPrintType());
+            orderSkuDetail.setBlueprint(item.getProofingImg());
+            orderSkuDetail.setProductionDocument(item.getProductionDocument());
+            return orderSkuDetail;
+        }).collect(Collectors.toList());
         orderMessage.setOrderSkuDetailList(orderSkuDetailList);
         RabbitMqUtil.send(OrderConfig.DIRECT_EXCHANGE_NAME, OrderConfig.KX_ORDER_ADD_NAME, orderMessage);
     }

sd-mq/src/main/java/com/sd/mq/entity/OrderSkuDetail.java

@@ -28,21 +28,11 @@ public class OrderSkuDetail implements Serializable {
     private String blueprint;
 
     /**
-     * 设计图详情 json格式
-     */
-    private String blueprintDetails;
-
-    /**
      * 生产文件
      */
     private String productionDocument;
 
     /**
-     * 打样图
-     */
-    private String proofingImg;
-
-    /**
      * 数量
      */
     private BigDecimal quantity;