diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialTypeVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialTypeVo.java deleted file mode 100644 index 3b999cef..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialTypeVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.supervise.cyf.api.rawmaterialtype; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/5/4 14:29 - */ -@Data -@ApiModel(value = "原料类型信息 视图数据对象", description = "原料入库信息 视图数据对象") -public class RawMaterialTypeVo implements Vo { - private String id; - private String sid; - - //原料编号 - private String number; - //原料名称 - private String name; - //原料code - private String code; -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventory/RawMaterialInventoryMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventory/RawMaterialInventoryMapper.java deleted file mode 100644 index be9728e2..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventory/RawMaterialInventoryMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialinventory; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventory; -import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:37 - */ -@Mapper -public interface RawMaterialInventoryMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select(" SELECT" + - " *,t.name as typeName" + - " FROM" + - " raw_material_inventory r" + - " left join raw_material_type t on t.sid=r.typeSid ") - List inventoryList(); - @Select("select * from raw_material_inventory where sid=#{sid}") - RawMaterialInventory getInventoryBySid(@Param("sid")String sid); -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordMapper.java deleted file mode 100644 index aef5b12f..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialinventoryrecord; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecord; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:37 - */ -@Mapper -public interface RawMaterialInventoryRecordMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordRest.java deleted file mode 100644 index 738a8434..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordRest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialinventoryrecord; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordDto; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordQuery; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:38 - */ -@Api(tags = "盘库信息") -@RestController -@RequestMapping("cyf/rawrecord") -public class RawMaterialInventoryRecordRest { - @Autowired - RawMaterialInventoryRecordService RawMaterialInventoryRecordService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = RawMaterialInventoryRecordService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增") - @PostMapping("/save") - public ResultBean save (@RequestBody RawMaterialInventoryRecordDto dto){ - return RawMaterialInventoryRecordService.save(dto); - } - -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordService.java deleted file mode 100644 index fd946937..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialinventoryrecord; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecord; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordDto; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordQuery; -import com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:37 - */ -@Service -public class RawMaterialInventoryRecordService extends MybatisBaseService { - - - public PagerVo listPageVo(PagerQuery pq) { - RawMaterialInventoryRecordQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getDate())) { - qw.eq("STR_TO_DATE(r.inventoryDate,'%Y-%m-%d')", query.getDate()); - } - if (StringUtils.isNotBlank(query.getName())) { - qw.like("i.name", query.getName()); - } - if (StringUtils.isNotBlank(query.getType())) { - qw.eq("r.type", query.getType()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean save(RawMaterialInventoryRecordDto dto){ - ResultBean rb=new ResultBean(); - RawMaterialInventoryRecord entity=new RawMaterialInventoryRecord(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return rb.success().setMsg("新增成功"); - } - -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialoutbound/RawMaterialOutboundMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialoutbound/RawMaterialOutboundMapper.java deleted file mode 100644 index 788e5f2b..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialoutbound/RawMaterialOutboundMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialoutbound; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutbound; -import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:37 - */ -@Mapper -public interface RawMaterialOutboundMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select(" SELECT" + - " *,t.name as typeName,i.inventory as inventory" + - " FROM" + - " raw_material_outbound o" + - " left join raw_material_inventory i on i.sid=o.inventorySid" + - " left join raw_material_type t on t.sid=i.typeSid") - List outboundList(); - @Select("select * from tank_information where sid=#{sid}") - RawMaterialOutbound getOutboundBySid(@Param("sid")String sid); -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialstorage/RawMaterialStorageMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialstorage/RawMaterialStorageMapper.java deleted file mode 100644 index ea9d3678..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialstorage/RawMaterialStorageMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialstorage; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorage; -import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:37 - */ -@Mapper -public interface RawMaterialStorageMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select(" *,t.name as typeName,i.inventory as inventory" + - " FROM" + - " raw_material_storage s" + - " left join raw_material_inventory i on i.sid=s.inventorySid" + - " left join raw_material_type t on t.sid=i.typeSid") - List StorageList(); - @Select("select * from raw_material_storage where sid=#{sid}") - RawMaterialStorage getStorageBySid(@Param("sid")String sid); -} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialtype/RawMaterialTypeMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialtype/RawMaterialTypeMapper.java deleted file mode 100644 index 0c0a465d..00000000 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialtype/RawMaterialTypeMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yxt.supervise.cyf.biz.rawmaterialtype; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialType; -import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/5/4 14:37 - */ -@Mapper -public interface RawMaterialTypeMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from raw_material_type") - List typeList(); - @Select("select * from raw_material_type where sid=#{sid}") - RawMaterialType getTypeBySid(@Param("sid")String sid); -}