新增订单sku图稿制作、字典配置表

sd-business/src/main/java/com/sd/business/controller/dict/DictConfigDataController.java

@@ -0,0 +1,77 @@
+package com.sd.business.controller.dict;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.dict.vo.DictConfigDataVo;
+import com.sd.business.entity.dict.dto.DictConfigDataSelectDto;
+import com.sd.business.entity.dict.dto.DictConfigDataDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.service.dict.DictConfigDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字典配置数据 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+@RestController
+@RequestMapping("/dictConfigData")
+public class DictConfigDataController {
+
+    @Autowired
+    private DictConfigDataService dictConfigDataService;
+
+    /**
+     * 字典配置数据列表
+     */
+    @PostMapping("/list")
+    public List<DictConfigDataVo> list(@RequestBody DictConfigDataSelectDto dto) {
+        return dictConfigDataService.getList(dto);
+    }
+
+    /**
+     * 字典配置数据分页
+     */
+    @PostMapping("/page")
+    public Page<DictConfigDataVo> page(@RequestBody DictConfigDataSelectDto dto) {
+        return dictConfigDataService.getPage(dto);
+    }
+
+    /**
+     * 字典配置数据明细
+     */
+    @PostMapping("/detail")
+    public DictConfigDataVo detail(@RequestBody BaseSelectDto dto) {
+        return dictConfigDataService.detail(dto.getId());
+    }
+
+    /**
+     * 字典配置数据新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody DictConfigDataDto dto) {
+        dictConfigDataService.add(dto);
+    }
+
+    /**
+     * 字典配置数据编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody DictConfigDataDto dto) {
+        dictConfigDataService.edit(dto);
+    }
+
+    /**
+     * 字典配置数据删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        dictConfigDataService.delete(dto.getId());
+    }
+
+}

sd-business/src/main/java/com/sd/business/controller/order/OrderSkuArtworkMakeController.java

@@ -0,0 +1,53 @@
+package com.sd.business.controller.order;
+
+import com.sd.business.entity.order.dto.OrderSkuArtworkMakeDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderSkuArtworkMakeVo;
+import com.sd.business.entity.order.dto.OrderSkuArtworkMakeSelectDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.service.order.OrderSkuArtworkMakeService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 订单sku图稿制作 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+@RestController
+@RequestMapping("/orderSkuArtworkMake")
+public class OrderSkuArtworkMakeController {
+
+    @Autowired
+    private OrderSkuArtworkMakeService orderSkuArtworkMakeService;
+
+    /**
+     * 订单sku图稿制作分页
+     */
+    @PostMapping("/page")
+    public Page<OrderSkuArtworkMakeVo> page(@RequestBody OrderSkuArtworkMakeSelectDto dto) {
+        return orderSkuArtworkMakeService.getPage(dto);
+    }
+
+    /**
+     * 订单sku图稿制作明细
+     */
+    @PostMapping("/detail")
+    public OrderSkuArtworkMakeVo detail(@RequestBody BaseSelectDto dto) {
+        return orderSkuArtworkMakeService.detail(dto.getId());
+    }
+
+    /**
+     * 订单sku图稿制作编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@Validated @RequestBody OrderSkuArtworkMakeDto orderSkuArtworkMakeDto) {
+        orderSkuArtworkMakeService.edit(orderSkuArtworkMakeDto);
+    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.sd.business.entity.dict.dto;
+
+import com.sd.business.entity.dict.po.DictConfigData;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 字典配置数据新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+@Getter
+@Setter
+public class DictConfigDataDto extends DictConfigData {
+
+}

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

@@ -0,0 +1,26 @@
+package com.sd.business.entity.dict.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 字典配置数据列表查询入参实体
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+@Getter
+@Setter
+public class DictConfigDataSelectDto extends BaseSelectDto {
+
+    /**
+     * 字典编码
+     */
+    private String dictCode;
+
+    /**
+     * 字典key
+     */
+    private String dictKey;
+}

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

@@ -0,0 +1,53 @@
+package com.sd.business.entity.dict.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 字典配置数据
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+@Getter
+@Setter
+@TableName("dict_config_data")
+public class DictConfigData extends BasePo {
+
+    /**
+     * 字典编码
+     */
+    private String dictCode;
+
+    /**
+     * key
+     */
+    private String dictKey;
+
+    /**
+     * value
+     */
+    private String dictValue;
+
+    /**
+     * 图片id
+     */
+    private Long imgId;
+
+    /**
+     * 图片链接
+     */
+    private String imgUrl;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}

sd-business/src/main/java/com/sd/business/entity/dict/vo/DictConfigDataVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.dict.vo;
+
+import com.sd.business.entity.dict.po.DictConfigData;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 字典配置数据列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+@Getter
+@Setter
+public class DictConfigDataVo extends DictConfigData {
+
+}

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuArtworkMakeDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.order.dto;
+
+import com.sd.business.entity.order.po.OrderSkuArtworkMake;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单sku图稿制作新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+@Getter
+@Setter
+public class OrderSkuArtworkMakeDto extends OrderSkuArtworkMake {
+
+}

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuArtworkMakeSelectDto.java

@@ -0,0 +1,36 @@
+package com.sd.business.entity.order.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单sku图稿制作列表查询入参实体
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+@Getter
+@Setter
+public class OrderSkuArtworkMakeSelectDto extends BaseSelectDto {
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * sku品号
+     */
+    private String skuCode;
+
+    /**
+     * bom品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 图稿状态 0待制作 1待确认 2已驳回 3已确认
+     */
+    private Integer status;
+}

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

@@ -0,0 +1,63 @@
+package com.sd.business.entity.order.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 订单sku图稿制作
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+@Getter
+@Setter
+@TableName("order_sku_artwork_make")
+public class OrderSkuArtworkMake extends BasePo {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单sku id
+     */
+    private Long orderSkuId;
+
+    /**
+     * 设计图
+     */
+    private String blueprint;
+
+    /**
+     * 设计图详情 json
+     */
+    private String blueprintDetails;
+
+    /**
+     * 生产文件
+     */
+    private String productionDocument;
+
+    /**
+     * 打样图
+     */
+    private String proofingImg;
+
+    /**
+     * 图稿状态 0待制作 1待确认 2已驳回 3已确认
+     */
+    private Integer status;
+
+    /**
+     * 图稿确认时间
+     */
+    private Date artworkConfirmTime;
+
+}

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

@@ -0,0 +1,73 @@
+package com.sd.business.entity.order.vo;
+
+import com.sd.business.entity.order.po.OrderSkuArtworkMake;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单sku图稿制作列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+@Getter
+@Setter
+public class OrderSkuArtworkMakeVo extends OrderSkuArtworkMake {
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * sku品号
+     */
+    private String skuCode;
+
+    /**
+     * bom品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * bom品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 长 cm
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal width;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal height;
+
+    /**
+     * 设计图
+     */
+    private String blueprint;
+
+    /**
+     * 设计图详情 json
+     */
+    private String blueprintDetails;
+
+    /**
+     * 生产文件
+     */
+    private String productionDocument;
+
+    /**
+     * 打样图
+     */
+    private String proofingImg;
+}

sd-business/src/main/java/com/sd/business/mapper/dict/DictConfigDataMapper.java

@@ -0,0 +1,16 @@
+package com.sd.business.mapper.dict;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sd.business.entity.dict.po.DictConfigData;
+
+/**
+ * <p>
+ * 字典配置数据 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+public interface DictConfigDataMapper extends BaseMapper<DictConfigData> {
+
+}

sd-business/src/main/java/com/sd/business/mapper/order/OrderSkuArtworkMakeMapper.java

@@ -0,0 +1,16 @@
+package com.sd.business.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sd.business.entity.order.po.OrderSkuArtworkMake;
+
+/**
+ * <p>
+ * 订单sku图稿制作 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+public interface OrderSkuArtworkMakeMapper extends BaseMapper<OrderSkuArtworkMake> {
+
+}

sd-business/src/main/java/com/sd/business/service/dict/DictConfigDataService.java

@@ -0,0 +1,52 @@
+package com.sd.business.service.dict;
+
+import com.sd.business.entity.dict.po.DictConfigData;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.dict.vo.DictConfigDataVo;
+import com.sd.business.entity.dict.dto.DictConfigDataSelectDto;
+import com.sd.business.entity.dict.dto.DictConfigDataDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字典配置数据 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+public interface DictConfigDataService extends BaseService<DictConfigData> {
+
+    /**
+     * 字典配置数据列表
+     */
+    List<DictConfigDataVo> getList(DictConfigDataSelectDto dto);
+
+    /**
+     * 字典配置数据分页
+     */
+    Page<DictConfigDataVo> getPage(DictConfigDataSelectDto dto);
+
+    /**
+     * 字典配置数据明细
+     */
+    DictConfigDataVo detail(Long id);
+
+    /**
+     * 字典配置数据新增
+     */
+    void add(DictConfigDataDto dto);
+
+    /**
+     * 字典配置数据编辑
+     */
+    void edit(DictConfigDataDto dto);
+
+    /**
+     * 字典配置数据删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,98 @@
+package com.sd.business.service.dict.impl;
+
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.sd.business.entity.dict.po.DictConfigData;
+import com.sd.business.mapper.dict.DictConfigDataMapper;
+import com.sd.business.service.dict.DictConfigDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.dict.vo.DictConfigDataVo;
+import com.sd.business.entity.dict.dto.DictConfigDataSelectDto;
+import com.sd.business.entity.dict.dto.DictConfigDataDto;
+import com.sd.framework.util.sql.Sql;
+import com.sd.framework.util.Assert;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ * 字典配置数据 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-05
+ */
+@Service
+public class DictConfigDataServiceImpl extends ServiceImpl<DictConfigDataMapper, DictConfigData> implements DictConfigDataService {
+
+    @Override
+    public List<DictConfigDataVo> getList(DictConfigDataSelectDto dto) {
+
+        List<DictConfigDataVo> list = Sql.create(DictConfigDataVo.class)
+                .selectAll(DictConfigData.class)
+                .from(DictConfigData.class)
+                .eq(DictConfigData::getDictCode, dto.getDictCode())
+                .eq(DictConfigData::getDictKey, dto.getDictKey())
+                .orderByDesc(DictConfigData::getId)
+                .list();
+
+        return list;
+    }
+
+    @Override
+    public Page<DictConfigDataVo> getPage(DictConfigDataSelectDto dto) {
+
+        Page<DictConfigDataVo> page = Sql.create(DictConfigDataVo.class)
+                .selectAll(DictConfigData.class)
+                .from(DictConfigData.class)
+                .eq(DictConfigData::getDictCode, dto.getDictCode())
+                .eq(DictConfigData::getDictKey, dto.getDictKey())
+                .orderByDesc(DictConfigData::getId)
+                .page(dto);
+
+        return page;
+    }
+
+    @Override
+    public DictConfigDataVo detail(Long id) {
+
+        DictConfigDataVo vo = Sql.create(DictConfigDataVo.class)
+                .selectAll(DictConfigData.class)
+                .from(DictConfigData.class)
+                .eq(DictConfigData::getId, id)
+                .one();
+
+        Assert.notNull(vo, "未知数据");
+
+        return vo;
+    }
+
+    @Override
+    public void add(DictConfigDataDto dto) {
+        this.save(dto);
+
+        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);
+
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+        ObsFileUtil.removeFile(id);
+    }
+
+}

sd-business/src/main/java/com/sd/business/service/order/OrderSkuArtworkMakeService.java

@@ -0,0 +1,35 @@
+package com.sd.business.service.order;
+
+import com.sd.business.entity.order.dto.OrderSkuArtworkMakeDto;
+import com.sd.business.entity.order.po.OrderSkuArtworkMake;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderSkuArtworkMakeVo;
+import com.sd.business.entity.order.dto.OrderSkuArtworkMakeSelectDto;
+
+
+/**
+ * <p>
+ * 订单sku图稿制作 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+public interface OrderSkuArtworkMakeService extends BaseService<OrderSkuArtworkMake> {
+
+    /**
+     * 订单sku图稿制作分页
+     */
+    Page<OrderSkuArtworkMakeVo> getPage(OrderSkuArtworkMakeSelectDto dto);
+
+    /**
+     * 订单sku图稿制作明细
+     */
+    OrderSkuArtworkMakeVo detail(Long id);
+
+    /**
+     * 订单sku图稿制作编辑
+     */
+    void edit(OrderSkuArtworkMakeDto orderSkuArtworkMakeDto);
+}

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

@@ -0,0 +1,130 @@
+package com.sd.business.service.order.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.order.dto.OrderSkuArtworkMakeDto;
+import com.sd.business.entity.order.enums.ArtworkLogTypeEnum;
+import com.sd.business.entity.order.po.OrderInfo;
+import com.sd.business.entity.order.po.OrderSku;
+import com.sd.business.entity.order.po.OrderSkuArtworkLog;
+import com.sd.business.entity.order.po.OrderSkuArtworkMake;
+import com.sd.business.entity.sku.po.SkuUser;
+import com.sd.business.mapper.order.OrderSkuArtworkMakeMapper;
+import com.sd.business.service.order.OrderSkuArtworkLogService;
+import com.sd.business.service.order.OrderSkuArtworkMakeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderSkuArtworkMakeVo;
+import com.sd.business.entity.order.dto.OrderSkuArtworkMakeSelectDto;
+import com.sd.framework.util.sql.Sql;
+import com.sd.framework.util.Assert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+
+/**
+ * <p>
+ * 订单sku图稿制作 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-07
+ */
+@Service
+public class OrderSkuArtworkMakeServiceImpl extends ServiceImpl<OrderSkuArtworkMakeMapper, OrderSkuArtworkMake> implements OrderSkuArtworkMakeService {
+
+    @Autowired
+    private OrderSkuArtworkLogService orderSkuArtworkLogService;
+
+    @Override
+    public Page<OrderSkuArtworkMakeVo> getPage(OrderSkuArtworkMakeSelectDto dto) {
+
+        Page<OrderSkuArtworkMakeVo> page = Sql.create(OrderSkuArtworkMakeVo.class)
+                .selectAll(OrderSkuArtworkMake.class)
+                .selectAs(OrderInfo::getCode, OrderSkuArtworkMakeVo::getOrderCode)
+                .selectAs(SkuUser::getCode, OrderSkuArtworkMakeVo::getSkuCode)
+                .selectAs(BomSpec::getCode, OrderSkuArtworkMakeVo::getBomSpecCode)
+                .from(OrderSkuArtworkMake.class)
+                .innerJoin(OrderInfo.class, OrderInfo::getId, OrderSkuArtworkMake::getOrderId)
+                .innerJoin(OrderSku.class, OrderSku::getId, OrderSkuArtworkMake::getOrderSkuId)
+                .leftJoin(BomSpec.class, BomSpec::getId, OrderSku::getBomSpecId)
+                .leftJoin(SkuUser.class, SkuUser::getId, OrderSku::getSkuUserId)
+                .eq(OrderSkuArtworkMake::getStatus, dto.getStatus())
+                .like(OrderInfo::getCode, dto.getOrderCode())
+                .like(SkuUser::getCode, dto.getSkuCode())
+                .like(BomSpec::getCode, dto.getBomSpecCode())
+                .orderByDesc(OrderSkuArtworkMake::getId)
+                .page(dto);
+
+        return page;
+    }
+
+    @Override
+    public OrderSkuArtworkMakeVo detail(Long id) {
+
+        OrderSkuArtworkMakeVo vo = Sql.create(OrderSkuArtworkMakeVo.class)
+                .selectAll(OrderSkuArtworkMake.class)
+                .selectAs(OrderInfo::getCode, OrderSkuArtworkMakeVo::getOrderCode)
+                .selectAs(SkuUser::getCode, OrderSkuArtworkMakeVo::getSkuCode)
+                .selectAs(BomSpec::getCode, OrderSkuArtworkMakeVo::getBomSpecCode)
+                .selectAs(BomSpec::getName, OrderSkuArtworkMakeVo::getBomSpecName)
+                .select(BomSpec::getLength)
+                .select(BomSpec::getWidth)
+                .select(BomSpec::getHeight)
+                .from(OrderSkuArtworkMake.class)
+                .innerJoin(OrderInfo.class, OrderInfo::getId, OrderSkuArtworkMake::getOrderId)
+                .innerJoin(OrderSku.class, OrderSku::getId, OrderSkuArtworkMake::getOrderSkuId)
+                .leftJoin(BomSpec.class, BomSpec::getId, OrderSku::getBomSpecId)
+                .leftJoin(SkuUser.class, SkuUser::getId, OrderSku::getSkuUserId)
+                .eq(OrderSkuArtworkMake::getId, id)
+                .one();
+
+        Assert.notNull(vo, "未知数据");
+
+        return vo;
+    }
+
+    @Override
+    public void edit(OrderSkuArtworkMakeDto orderSkuArtworkMakeDto) {
+        OrderSkuArtworkMake orderSkuArtworkMake = this.getById(orderSkuArtworkMakeDto.getId());
+        Assert.notNull(orderSkuArtworkMake, "未知数据");
+
+        List<OrderSkuArtworkLog> orderSkuArtworkLogList = new ArrayList<>();
+
+        if (StrUtil.isNotBlank(orderSkuArtworkMakeDto.getProofingImg())
+                && !Objects.equals(orderSkuArtworkMake.getProofingImg(), orderSkuArtworkMakeDto.getProofingImg())) {
+            // 新增图稿日志 上传打样图
+            OrderSkuArtworkLog orderSkuArtworkLog = new OrderSkuArtworkLog();
+            orderSkuArtworkLog.setOrderId(orderSkuArtworkMakeDto.getOrderId());
+            orderSkuArtworkLog.setOrderSkuId(orderSkuArtworkMakeDto.getOrderSkuId());
+            orderSkuArtworkLog.setType(ArtworkLogTypeEnum.UPLOAD_PROOFING_IMG.getKey());
+            orderSkuArtworkLog.setOperator(SecurityUtils.getLoginUser().getUser().getNickName());
+            orderSkuArtworkLogList.add(orderSkuArtworkLog);
+            // 打样图有调整时，状态不为已确认，都修改为待确认
+            if (!Objects.equals(orderSkuArtworkMake.getStatus(), 3)) {
+                orderSkuArtworkMakeDto.setStatus(1);
+            }
+        }
+        if (StrUtil.isNotBlank(orderSkuArtworkMakeDto.getProductionDocument())
+                && !Objects.equals(orderSkuArtworkMake.getProductionDocument(), orderSkuArtworkMakeDto.getProductionDocument())) {
+            // 新增图稿日志 上传设计图稿
+            OrderSkuArtworkLog orderSkuArtworkLog = new OrderSkuArtworkLog();
+            orderSkuArtworkLog.setOrderId(orderSkuArtworkMakeDto.getOrderId());
+            orderSkuArtworkLog.setOrderSkuId(orderSkuArtworkMakeDto.getOrderSkuId());
+            orderSkuArtworkLog.setType(ArtworkLogTypeEnum.UPLOAD_PRODUCTION_DOCUMENT.getKey());
+            orderSkuArtworkLog.setOperator(SecurityUtils.getLoginUser().getUser().getNickName());
+            orderSkuArtworkLogList.add(orderSkuArtworkLog);
+        }
+
+        this.updateById(orderSkuArtworkMakeDto);
+        if (!orderSkuArtworkLogList.isEmpty()) {
+            orderSkuArtworkLogService.saveBatch(orderSkuArtworkLogList);
+        }
+    }
+
+}

sd-business/src/main/resources/mapper/dict/DictConfigDataMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.dict.DictConfigDataMapper">
+
+</mapper>

sd-business/src/main/resources/mapper/order/OrderSkuArtworkMakeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.order.OrderSkuArtworkMakeMapper">
+
+</mapper>