库存

sd-business/src/main/java/com/sd/business/controller/inventory/InventoryIngredientsController.java

@@ -1,71 +0,0 @@
-package com.sd.business.controller.inventory;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.sd.business.entity.inventory.dto.InventoryIngredientsDto;
-import com.sd.business.entity.inventory.dto.InventoryIngredientsSelectDto;
-import com.sd.business.entity.inventory.vo.InventoryIngredientsVo;
-import com.sd.business.service.inventory.InventoryIngredientsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 原料库存 前端控制器
- * </p>
- *
- * @author
- * @since 2024-01-08
- */
-@RestController
-@RequestMapping("/inventoryIngredients")
-public class InventoryIngredientsController {
-
-    @Autowired
-    private InventoryIngredientsService inventoryIngredientsService;
-
-    /**
-     * 原料库存分页
-     */
-    @PostMapping("/page")
-    public Page<InventoryIngredientsVo> page(@RequestBody InventoryIngredientsSelectDto dto) {
-        return inventoryIngredientsService.getPage(dto);
-    }
-
-    /**
-     * 原料库存明细
-     */
-    @PostMapping("/detail")
-    public InventoryIngredientsVo detail(@RequestBody BaseSelectDto dto) {
-        return inventoryIngredientsService.detail(dto.getId());
-    }
-
-    /**
-     * 原料库存新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody InventoryIngredientsDto dto) {
-        inventoryIngredientsService.add(dto);
-    }
-
-    /**
-     * 原料库存编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody InventoryIngredientsDto dto) {
-        inventoryIngredientsService.edit(dto);
-    }
-
-    /**
-     * 原料库存删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        inventoryIngredientsService.delete(dto.getId());
-    }
-
-}

sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventoryIngredientsDto.java

@@ -1,17 +0,0 @@
-package com.sd.business.entity.inventory.dto;
-
-import com.sd.business.entity.inventory.po.InventoryIngredients;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 原料库存新增编辑入参实体
- *
- * @author
- * @since 2024-01-08
- */
-@Getter
-@Setter
-public class InventoryIngredientsDto extends InventoryIngredients {
-
-}

sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventoryIngredientsSelectDto.java

@@ -1,17 +0,0 @@
-package com.sd.business.entity.inventory.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 原料库存列表查询入参实体
- *
- * @author
- * @since 2024-01-08
- */
-@Getter
-@Setter
-public class InventoryIngredientsSelectDto extends BaseSelectDto {
-
-}

sd-business/src/main/java/com/sd/business/entity/inventory/po/InventoryBackup.java

@@ -1,13 +1,9 @@
 package com.sd.business.entity.inventory.po;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -21,7 +17,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("inventory_backup")
-public class InventoryBackup extends BasePo {
+public class InventoryBackup extends Inventory {
 
     /**
      * 库存id
@@ -29,23 +25,6 @@ public class InventoryBackup extends BasePo {
     private Long inventoryId;
 
     /**
-     * 仓库id
-     */
-    private Long warehouseId;
-
-    /**
-     * bom规格id
-     */
-    private Long bomSpecId;
-
-    /**
-     * 数量
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "可用库存", index = 3)
-    private BigDecimal quantity;
-
-    /**
      * 备份日期
      */
     private Date backupDate;

sd-business/src/main/java/com/sd/business/entity/inventory/po/InventoryIngredients.java

@@ -1,38 +0,0 @@
-package com.sd.business.entity.inventory.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 原料库存
- * </p>
- *
- * @author
- * @since 2024-01-08
- */
-@Getter
-@Setter
-@TableName("inventory_ingredients")
-public class InventoryIngredients extends BasePo {
-
-    /**
-     * bom规格id
-     */
-    private Long bomSpecId;
-
-    /**
-     * 数量
-     */
-    private Long quantity;
-
-    /**
-     * 米数
-     */
-    private BigDecimal meter;
-
-}

sd-business/src/main/java/com/sd/business/entity/inventory/vo/InventoryIngredientsVo.java

@@ -1,17 +0,0 @@
-package com.sd.business.entity.inventory.vo;
-
-import com.sd.business.entity.inventory.po.InventoryIngredients;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 原料库存列表查询返回值实体
- *
- * @author
- * @since 2024-01-08
- */
-@Getter
-@Setter
-public class InventoryIngredientsVo extends InventoryIngredients {
-
-}

sd-business/src/main/java/com/sd/business/mapper/inventory/InventoryIngredientsMapper.java

@@ -1,16 +0,0 @@
-package com.sd.business.mapper.inventory;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sd.business.entity.inventory.po.InventoryIngredients;
-
-/**
- * <p>
- * 原料库存 Mapper 接口
- * </p>
- *
- * @author
- * @since 2024-01-08
- */
-public interface InventoryIngredientsMapper extends BaseMapper<InventoryIngredients> {
-
-}

sd-business/src/main/java/com/sd/business/service/inventory/InventoryIngredientsService.java

@@ -1,46 +0,0 @@
-package com.sd.business.service.inventory;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.service.BaseService;
-import com.sd.business.entity.inventory.dto.InventoryIngredientsDto;
-import com.sd.business.entity.inventory.dto.InventoryIngredientsSelectDto;
-import com.sd.business.entity.inventory.po.InventoryIngredients;
-import com.sd.business.entity.inventory.vo.InventoryIngredientsVo;
-
-
-/**
- * <p>
- * 原料库存 服务类
- * </p>
- *
- * @author
- * @since 2024-01-08
- */
-public interface InventoryIngredientsService extends BaseService<InventoryIngredients> {
-
-    /**
-     * 原料库存分页
-     */
-    Page<InventoryIngredientsVo> getPage(InventoryIngredientsSelectDto dto);
-
-    /**
-     * 原料库存明细
-     */
-    InventoryIngredientsVo detail(Long id);
-
-    /**
-     * 原料库存新增
-     */
-    void add(InventoryIngredientsDto dto);
-
-    /**
-     * 原料库存编辑
-     */
-    void edit(InventoryIngredientsDto dto);
-
-    /**
-     * 原料库存删除
-     */
-    void delete(Long id);
-
-}

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryIngredientsServiceImpl.java

@@ -1,68 +0,0 @@
-package com.sd.business.service.inventory.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sd.business.entity.inventory.dto.InventoryIngredientsDto;
-import com.sd.business.entity.inventory.dto.InventoryIngredientsSelectDto;
-import com.sd.business.entity.inventory.po.InventoryIngredients;
-import com.sd.business.entity.inventory.vo.InventoryIngredientsVo;
-import com.sd.business.mapper.inventory.InventoryIngredientsMapper;
-import com.sd.business.service.inventory.InventoryIngredientsService;
-import com.sd.framework.util.Assert;
-import com.sd.framework.util.sql.Sql;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- * 原料库存 服务实现类
- * </p>
- *
- * @author
- * @since 2024-01-08
- */
-@Service
-public class InventoryIngredientsServiceImpl extends ServiceImpl<InventoryIngredientsMapper, InventoryIngredients> implements InventoryIngredientsService {
-
-    @Override
-    public Page<InventoryIngredientsVo> getPage(InventoryIngredientsSelectDto dto) {
-
-        Page<InventoryIngredientsVo> page = Sql.create(InventoryIngredientsVo.class)
-                .selectAll(InventoryIngredients.class)
-                .from(InventoryIngredients.class)
-                .orderByDesc(InventoryIngredients::getId)
-                .page(dto);
-
-        return page;
-    }
-
-    @Override
-    public InventoryIngredientsVo detail(Long id) {
-
-        InventoryIngredientsVo vo = Sql.create(InventoryIngredientsVo.class)
-                .selectAll(InventoryIngredients.class)
-                .from(InventoryIngredients.class)
-                .eq(InventoryIngredients::getId, id)
-                .one();
-
-        Assert.notNull(vo, "未知数据");
-
-        return vo;
-    }
-
-    @Override
-    public void add(InventoryIngredientsDto dto) {
-        save(dto);
-    }
-
-    @Override
-    public void edit(InventoryIngredientsDto dto) {
-        updateById(dto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        removeById(id);
-    }
-
-}

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

@@ -70,9 +70,6 @@ import com.sd.framework.util.Assert;
 import com.sd.framework.util.excel.util.ExcelUtil;
 import com.sd.framework.util.sql.Sql;
 import com.sd.framework.util.sql.Where;
-import com.sd.mq.config.ArtworkConfig;
-import com.sd.mq.entity.TempArtworkMessage;
-import com.sd.mq.util.RabbitMqUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -684,19 +681,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         ExcelUtil.export(response, exportVoList, OrderSkuExportVo.class);
     }
 
-    private void sendMq(OrderInfoDto dto) {
-        List<OrderSkuDto> orderSkuList = dto.getOrderSkuList();
-        for (OrderSkuDto orderSkuDto : orderSkuList) {
-            if (orderSkuDto.getArtworkLibraryId() == null || orderSkuDto.getArtworkLibraryId() == 0L) {
-                continue;
-            }
-            TempArtworkMessage tempArtworkMessage = new TempArtworkMessage();
-            tempArtworkMessage.setImgUrl(orderSkuDto.getBlueprint());
-            tempArtworkMessage.setFileUrl(orderSkuDto.getProductionDocument());
-            RabbitMqUtil.send(ArtworkConfig.DIRECT_EXCHANGE_NAME, ArtworkConfig.TEMP_ARTWORK_QUEUE_NAME, tempArtworkMessage);
-        }
-    }
-
     /**
      * 订单修改快递包材出入库操作
      */

sd-business/src/main/resources/mapper/inventory/InventoryIngredientsMapper.xml

@@ -1,5 +0,0 @@
-<?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.inventory.InventoryIngredientsMapper">
-
-</mapper>