字段新增

sd-business/src/main/java/com/sd/business/entity/bom/po/Bom.java

@@ -123,4 +123,8 @@ public class Bom extends BasePo {
      */
     private String detailText;
 
+    /**
+     * mes系统id
+     */
+    private Long mesId;
 }

sd-business/src/main/java/com/sd/business/entity/bom/po/BomSpec.java

@@ -85,4 +85,10 @@ public class BomSpec extends BasePo {
      */
     private BigDecimal netWeight;
 
+    /**
+     * mes系统id
+     */
+    private Long mesId;
+
+
 }

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

@@ -23,4 +23,14 @@ public class BomSpecVo extends BomSpec {
      * 背面纹路 字典:bom_reverseGrain
      */
     private String reverseGrain;
+
+    /**
+     * 色层 字典:bom_chromatophore
+     */
+    private String chromatophore;
+
+    /**
+     * 种类 字典:bom_species
+     */
+    private String species;
 }

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

@@ -13,10 +13,10 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum OrderStatusEnum {
-    ARTWORK_UNDER_REVIEW(11, "图稿待确认"),
-    STOCK_PREPARATION(20, "备料中"),
-    IN_PRODUCTION(30, "生产中"),
-    COMPLETION_PRODUCTION(40, "生产完成"),
+    TO_BE_PAID(10, "待支付"),
+    CANCEL_PAYMENT(20, "取消支付"),
+    ARTWORK_UNDER_REVIEW(30, "图稿待确认"),
+    WAIT_FOR_DELIVERY(40, "待发货"),
     HAVE_BEEN_SHIPPED(50, "已发货"),
 
     ;

sd-business/src/main/java/com/sd/business/entity/order/po/OrderSku.java

@@ -74,6 +74,11 @@ public class OrderSku extends BasePo {
     private String blueprint;
 
     /**
+     * 设计图详情 json格式
+     */
+    private String blueprintDetails;
+
+    /**
      * 生产文件
      */
     private String productionDocument;

sd-business/src/main/java/com/sd/business/entity/order/po/OrderSkuArtworkLog.java

@@ -36,6 +36,11 @@ public class OrderSkuArtworkLog extends BasePo {
     private Integer type;
 
     /**
+     * 操作人
+     */
+    private String operator;
+
+    /**
      * 备注
      */
     private String remark;

sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuUserSelectDto.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 用户专属sku列表查询入参实体
  *
@@ -24,5 +26,19 @@ public class SkuUserSelectDto extends BaseSelectDto {
      */
     private String name;
 
+    /**
+     * 长 cm
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal width;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal height;
 
 }

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

@@ -17,11 +17,4 @@ import org.apache.ibatis.annotations.Param;
  */
 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

@@ -38,6 +38,7 @@ public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper,
                 .selectAll(ArtworkLibrary.class)
                 .from(ArtworkLibrary.class)
                 .like(ArtworkLibrary::getArtworkName, dto.getArtworkName())
+                .eq(ArtworkLibrary::getType, dto.getType())
                 .eq(Objects.equals(dto.getType(), 2), ArtworkLibrary::getCreateUser, SecurityUtils.getUserId())
                 .orderByDesc(ArtworkLibrary::getId)
                 .page(dto);

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

@@ -2,8 +2,6 @@ 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;
@@ -14,7 +12,6 @@ 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;
 
 
@@ -31,17 +28,26 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
 
     @Override
     public Page<BomSpecVo> getPage(BomSpecSelectDto dto) {
-        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);
+        Page<BomSpecVo> page = Sql.create(BomSpecVo.class)
+                .selectAll(BomSpec.class)
+                .select(Bom::getFrontGrain)
+                .select(Bom::getReverseGrain)
+                .select(Bom::getChromatophore)
+                .from(BomSpec.class)
+                .innerJoin(Bom.class, Bom::getId, BomSpec::getBomId)
+                .innerJoin(BomClassify.class, BomClassify::getId, Bom::getBomClassifyId)
+                .eq(BomClassify::getCode, dto.getBomClassifyCode())
+                .eq(BomSpec::getLength, dto.getLength())
+                .eq(BomSpec::getWidth, dto.getWidth())
+                .eq(BomSpec::getHeight, dto.getHeight())
+                .eq(BomSpec::getColour, dto.getColour())
+                .eq(Bom::getChromatophore, dto.getChromatophore())
+                .eq(Bom::getFrontGrain, dto.getFrontGrain())
+                .eq(Bom::getReverseGrain, dto.getReverseGrain())
+                .orderByDesc(BomSpec::getId)
+                .page(dto);
+
+        return page;
     }
 
     @Override
@@ -49,7 +55,12 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
 
         BomSpecVo vo = Sql.create(BomSpecVo.class)
                 .selectAll(BomSpec.class)
+                .select(Bom::getFrontGrain)
+                .select(Bom::getReverseGrain)
+                .select(Bom::getChromatophore)
+                .select(Bom::getSpecies)
                 .from(BomSpec.class)
+                .innerJoin(Bom.class, Bom::getId, BomSpec::getBomId)
                 .eq(BomSpec::getId, id)
                 .one();
 

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

@@ -3,6 +3,7 @@ package com.sd.business.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderInfoSelectDto;
 import com.sd.business.entity.order.dto.OrderSkuDto;
@@ -102,6 +103,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             orderSkuArtworkLog.setOrderId(dto.getId());
             orderSkuArtworkLog.setOrderSkuId(item.getId());
             orderSkuArtworkLog.setType(ArtworkLogTypeEnum.UPLOAD_BLUEPRINT.getKey());
+            orderSkuArtworkLog.setOperator(SecurityUtils.getLoginUser().getUser().getNickName());
             return orderSkuArtworkLog;
         }).collect(Collectors.toList());
         orderSkuArtworkLogService.saveBatch(orderSkuArtworkLogList);

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

@@ -42,6 +42,9 @@ public class SkuUserServiceImpl extends ServiceImpl<SkuUserMapper, SkuUser> impl
                 .eq(SkuUser::getCreateUser, SecurityUtils.getUserId())
                 .like(SkuUser::getCode, dto.getCode())
                 .like(SkuUser::getName, dto.getName())
+                .eq(SkuUser::getLength, dto.getLength())
+                .eq(SkuUser::getHeight, dto.getHeight())
+                .eq(SkuUser::getWidth, dto.getWidth())
                 .orderByDesc(SkuUser::getId)
                 .page(dto);
 

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

@@ -2,30 +2,4 @@
 <!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>