bom和图稿库代码提交

sd-business/src/main/java/com/sd/business/entity/artwork/dto/ArtworkLibrarySelectDto.java

@@ -19,4 +19,9 @@ public class ArtworkLibrarySelectDto extends BaseSelectDto {
      */
     private String artworkName;
 
+    /**
+     * 类型 1-标准图稿，2-客户图稿
+     */
+    private Integer type;
+
 }

sd-business/src/main/java/com/sd/business/entity/artwork/po/ArtworkLibrary.java

@@ -24,6 +24,11 @@ public class ArtworkLibrary extends BasePo {
     private String artworkName;
 
     /**
+     * 类型 1-标准图稿，2-客户图稿
+     */
+    private Integer type;
+
+    /**
      * 图片id
      */
     private Long imgId;

sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSpecSelectDto.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * bom规格列表查询入参实体
  *
@@ -14,4 +16,43 @@ import lombok.Setter;
 @Setter
 public class BomSpecSelectDto extends BaseSelectDto {
 
+    /**
+     * bom分类分类编码 瑜伽垫裸垫-201.G 瑜伽砖裸砖-202.G 跳绳垫裸垫-203.G
+     */
+    private String bomClassifyCode;
+
+    /**
+     * 长 cm
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal width;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal height;
+
+    /**
+     * 色层 字典:bom_chromatophore
+     */
+    private String chromatophore;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
+     * 正面纹路 字典:bom_frontGrain
+     */
+    private String frontGrain;
+
+    /**
+     * 背面纹路 字典:bom_reverseGrain
+     */
+    private String reverseGrain;
 }

sd-business/src/main/java/com/sd/business/entity/bom/vo/BomSpecVo.java

@@ -14,4 +14,13 @@ import lombok.Setter;
 @Setter
 public class BomSpecVo extends BomSpec {
 
+    /**
+     * 正面纹路 字典:bom_frontGrain
+     */
+    private String frontGrain;
+
+    /**
+     * 背面纹路 字典:bom_reverseGrain
+     */
+    private String reverseGrain;
 }

sd-business/src/main/java/com/sd/business/entity/order/enums/ArtworkLogTypeEnum.java

@@ -0,0 +1,47 @@
+package com.sd.business.entity.order.enums;
+
+import com.ruoyi.common.exception.ServiceException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 图稿操作类型
+ */
+@Getter
+@AllArgsConstructor
+public enum ArtworkLogTypeEnum {
+    UPLOAD_BLUEPRINT(10, "上传设计图"),
+    UPLOAD_PROOFING_IMG(20, "上传打样图"),
+    UPLOAD_PROOFING_DOCUMENT(21, "上传打样图稿"),
+    REJECT_PROOFING_IMG(22, "驳回打样图稿"),
+    CONFIRM_PROOFING_IMG(30, "确认打样图"),
+    UPLOAD_PRODUCTION_DOCUMENT(40, "上传设计图稿"),
+
+    ;
+
+    private static final Map<Integer, ArtworkLogTypeEnum> map = new HashMap<>();
+
+    static {
+        for (ArtworkLogTypeEnum orderStatusEnum : values()) {
+            map.put(orderStatusEnum.getKey(), orderStatusEnum);
+        }
+    }
+
+    private final Integer key;
+    private final String value;
+
+    /**
+     * 通过key获取名称
+     */
+    public static ArtworkLogTypeEnum getEnum(Integer key) {
+        ArtworkLogTypeEnum orderStatusEnum = map.get(key);
+        if (orderStatusEnum == null) {
+            throw new ServiceException("未知操作类型：" + key);
+        }
+        return orderStatusEnum;
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/order/enums/OrderStatusEnum.java

@@ -0,0 +1,46 @@
+package com.sd.business.entity.order.enums;
+
+import com.ruoyi.common.exception.ServiceException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 订单状态
+ */
+@Getter
+@AllArgsConstructor
+public enum OrderStatusEnum {
+    ARTWORK_UNDER_REVIEW(11, "图稿待确认"),
+    STOCK_PREPARATION(20, "备料中"),
+    IN_PRODUCTION(30, "生产中"),
+    COMPLETION_PRODUCTION(40, "生产完成"),
+    HAVE_BEEN_SHIPPED(50, "已发货"),
+
+    ;
+
+    private static final Map<Integer, OrderStatusEnum> map = new HashMap<>();
+
+    static {
+        for (OrderStatusEnum orderStatusEnum : values()) {
+            map.put(orderStatusEnum.getKey(), orderStatusEnum);
+        }
+    }
+
+    private final Integer key;
+    private final String value;
+
+    /**
+     * 通过key获取名称
+     */
+    public static OrderStatusEnum getEnum(Integer key) {
+        OrderStatusEnum orderStatusEnum = map.get(key);
+        if (orderStatusEnum == null) {
+            throw new ServiceException("未知订单状态：" + key);
+        }
+        return orderStatusEnum;
+    }
+
+}

sd-business/src/main/java/com/sd/business/mapper/bom/BomSpecMapper.java

@@ -1,7 +1,11 @@
 package com.sd.business.mapper.bom;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.bom.vo.BomSpecVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.sd.business.entity.bom.po.BomSpec;
  */
 public interface BomSpecMapper extends BaseMapper<BomSpec> {
 
+    /**
+     * 分页
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Page<BomSpecVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<BomSpec> wrapper);
 }

sd-business/src/main/java/com/sd/business/service/artwork/impl/ArtworkLibraryServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.sd.business.entity.artwork.dto.ArtworkLibraryDto;
 import com.sd.business.entity.artwork.dto.ArtworkLibrarySelectDto;
 import com.sd.business.entity.artwork.po.ArtworkLibrary;
@@ -16,6 +17,7 @@ import com.sd.framework.util.sql.Sql;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.Objects;
 
 
 /**
@@ -36,6 +38,7 @@ public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper,
                 .selectAll(ArtworkLibrary.class)
                 .from(ArtworkLibrary.class)
                 .like(ArtworkLibrary::getArtworkName, dto.getArtworkName())
+                .eq(Objects.equals(dto.getType(), 2), ArtworkLibrary::getCreateUser, SecurityUtils.getUserId())
                 .orderByDesc(ArtworkLibrary::getId)
                 .page(dto.getPage());
 

sd-business/src/main/java/com/sd/business/service/bom/impl/BomSpecServiceImpl.java

@@ -2,14 +2,19 @@ package com.sd.business.service.bom.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.file.service.FileInfoService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.bom.dto.BomSpecDto;
 import com.sd.business.entity.bom.dto.BomSpecSelectDto;
+import com.sd.business.entity.bom.po.Bom;
+import com.sd.business.entity.bom.po.BomClassify;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.bom.vo.BomSpecVo;
 import com.sd.business.mapper.bom.BomSpecMapper;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.framework.util.Assert;
 import com.sd.framework.util.sql.Sql;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -26,14 +31,17 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
 
     @Override
     public Page<BomSpecVo> getPage(BomSpecSelectDto dto) {
-
-        Page<BomSpecVo> page = Sql.create(BomSpecVo.class)
-                .selectAll(BomSpec.class)
-                .from(BomSpec.class)
-                .orderByDesc(BomSpec::getId)
-                .page(dto.getPage());
-
-        return page;
+        IWrapper<BomSpec> wrapper = getWrapper();
+        wrapper.eq("bc", BomClassify::getCode, dto.getBomClassifyCode());
+        wrapper.eq("bs", BomSpec::getLength, dto.getLength());
+        wrapper.eq("bs", BomSpec::getWidth, dto.getWidth());
+        wrapper.eq("bs", BomSpec::getHeight, dto.getHeight());
+        wrapper.eq("bs", BomSpec::getColour, dto.getColour());
+        wrapper.eq("b", Bom::getChromatophore, dto.getChromatophore());
+        wrapper.eq("b", Bom::getFrontGrain, dto.getFrontGrain());
+        wrapper.eq("b", Bom::getReverseGrain, dto.getReverseGrain());
+        wrapper.orderByDesc(BomSpec::getId);
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
     @Override

sd-business/src/main/java/com/sd/business/util/CodeEnum.java

@@ -4,8 +4,10 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.exception.ServiceException;
+import com.sd.business.service.order.OrderService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -16,7 +18,8 @@ import java.util.Map;
 @AllArgsConstructor
 public enum CodeEnum {
 
-    ;
+    // 订单编号
+    ORDER_CODE("KX", "yyMMdd", "code", 6, OrderService.class);
 
     // 编码前缀
     private final String prefix;
@@ -29,6 +32,14 @@ public enum CodeEnum {
     // service
     private final IService<?> service;
 
+    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
+        this.prefix = prefix;
+        this.dateFormat = dateFormat;
+        this.length = length;
+        this.codeFieldName = codeFieldName;
+        this.service = SpringUtil.getBean(serviceCls);
+    }
+
     /**
      * 不够位数的在前面补0，保留num的长度位数字
      */

sd-business/src/main/resources/mapper/bom/BomSpecMapper.xml

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.bom.BomSpecMapper">
 
+    <select id="getPage" resultType="com.sd.business.entity.bom.vo.BomSpecVo">
+        select bs.id,
+               bs.bom_id,
+               bs.main_img_url,
+               bs.name,
+               bs.code,
+               bs.colour,
+               bs.cost_price,
+               bs.internal_selling_price,
+               bs.external_selling_price,
+               bs.safety_stock,
+               bs.length,
+               bs.width,
+               bs.height,
+               bs.net_weight,
+               bs.create_user,
+               bs.create_time,
+               bs.update_user,
+               bs.update_time,
+               b.front_grain,
+               b.reverse_grain
+        from bom_spec bs
+                inner join bom b on bs.bom_id = b.id
+                inner join bom_classify bc on b.bom_classify_id = bc.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>