dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新代码

Browse Source
This commit is contained in:
xiao-fajia 2024-09-19 15:26:11 +08:00
parent 2086924387
commit 8b91ce834e
13 changed files with 151 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyController.java
View File

@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.company.entity.Company;
import cn.iocoder.yudao.module.company.vo.CompanyRespVO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.iocoder.yudao.module.company.vo.CompanyReqVO;
@ -56,6 +58,10 @@ public class CompanyController {
@Lazy
private DeptApi deptApi;
@Resource
@Lazy
private AdminUserApi adminUserApi;
@Autowired
private CompanyService companyService;

27
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java
View File

@ -2,16 +2,18 @@ package cn.iocoder.yudao.module.stockTransfer.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt;
import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStService;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStRespVO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
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;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/**
* 调拨单(DlRepairSt)表控制层
* @author 小李
@ -40,5 +42,22 @@ public class DlRepairStController{
return CommonResult.ok();
}
/**
* 调拨单（出库、入库） 分页
*
* @author 小李
* @date 9:20 2024/9/19
* @param repairStReqVO 查询对象
* @param pageNo 页码
* @param pageSize 条数
**/
@GetMapping("/page")
@Operation(summary = "调拨单（出库、入库） 分页")
public CommonResult<?> getStPage(DlRepairStReqVO repairStReqVO,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
Page<DlRepairSt> page = new Page<>(pageNo, pageSize);
return success(dlRepairStService.getStPage(repairStReqVO, page));
}
}

81
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java
View File

@ -1,12 +1,21 @@
package cn.iocoder.yudao.module.stockTransfer.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti;
import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/**
* 调拨单子表(DlRepairSti)表控制层
* @author 小李
@ -21,60 +30,22 @@ public class DlRepairStiController{
@Resource
private DlRepairStiService dlRepairStiService;
// /**
// * 分页查询所有数据
// *
// * @param page 分页对象
// * @param dlRepairSti 查询实体
// * @return 所有数据
// */
// @GetMapping
// public R selectAll(Page<DlRepairSti> page, DlRepairSti dlRepairSti) {
// return success(this.dlRepairStiService.page(page, new QueryWrapper<>(dlRepairSti)));
// }
//
// /**
// * 通过主键查询单条数据
// *
// * @param id 主键
// * @return 单条数据
// */
// @GetMapping("{id}")
// public R selectOne(@PathVariable Serializable id) {
// return success(this.dlRepairStiService.getById(id));
// }
//
// /**
// * 新增数据
// *
// * @param dlRepairSti 实体对象
// * @return 新增结果
// */
// @PostMapping
// public R insert(@RequestBody DlRepairSti dlRepairSti) {
// return success(this.dlRepairStiService.save(dlRepairSti));
// }
//
// /**
// * 修改数据
// *
// * @param dlRepairSti 实体对象
// * @return 修改结果
// */
// @PutMapping
// public R update(@RequestBody DlRepairSti dlRepairSti) {
// return success(this.dlRepairStiService.updateById(dlRepairSti));
// }
//
// /**
// * 删除数据
// *
// * @param idList 主键结合
// * @return 删除结果
// */
// @DeleteMapping
// public R delete(@RequestParam("idList") List<Long> idList) {
// return success(this.dlRepairStiService.removeByIds(idList));
// }
/**
* 调拨单子表 分页
*
* @author 小李
* @date 14:48 2024/9/19
* @param repairStiReqVO 查询对象
* @param pageNo 页码
* @param pageSize 条数
**/
@GetMapping("/page")
@Operation(summary = "调拨单子表 分页")
public CommonResult<?> getStiPage(DlRepairStiReqVO repairStiReqVO,
@RequestParam(value = "pageNo", defaultValue = "1")Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){
Page<DlRepairSti> page = new Page<>(pageNo, pageSize);
return success(dlRepairStiService.getStiPage(repairStiReqVO, page));
}
}

4
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java
View File

@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
@ -85,6 +87,8 @@ public class DlRepairSt extends TenantBaseDO {
/**
* 调拔时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date stTime;
/**

12
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java
View File

@ -1,8 +1,12 @@
package cn.iocoder.yudao.module.stockTransfer.mapper;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 针对表【dl_repair_st(调拨单)】的数据库操作Mapper
@ -13,6 +17,14 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DlRepairStMapper extends BaseMapper<DlRepairSt> {
/**
* 调拨单（出库、入库） 分页
*
* @author 小李
* @date 9:20 2024/9/19
* @param repairStReqVO 查询对象
**/
IPage<DlRepairSt> getStPage(@Param("map") DlRepairStReqVO repairStReqVO, Page<DlRepairSt> page);
}

12
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java
View File

@ -1,8 +1,12 @@
package cn.iocoder.yudao.module.stockTransfer.mapper;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 针对表【dl_repair_sti(调拨单子表)】的数据库操作Mapper
@ -13,6 +17,14 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DlRepairStiMapper extends BaseMapper<DlRepairSti> {
/**
* 调拨单子表 分页
*
* @author 小李
* @date 14:48 2024/9/19
* @param repairStiReqVO 查询对象
**/
IPage<DlRepairSti> getStiPage(@Param("map") DlRepairStiReqVO repairStiReqVO, Page<DlRepairSti> page);
}

12
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java
View File

@ -1,7 +1,10 @@
package cn.iocoder.yudao.module.stockTransfer.service;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@ -20,4 +23,13 @@ public interface DlRepairStService extends IService<DlRepairSt> {
* @param repairStRespVO 新增对象
**/
void createSt(DlRepairStRespVO repairStRespVO);
/**
* 调拨单（出库、入库） 分页
*
* @author 小李
* @date 9:20 2024/9/19
* @param repairStReqVO 查询对象
**/
IPage<DlRepairSt> getStPage(DlRepairStReqVO repairStReqVO, Page<DlRepairSt> page);
}

11
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java
View File

@ -1,6 +1,9 @@
package cn.iocoder.yudao.module.stockTransfer.service;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@ -10,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
**/
public interface DlRepairStiService extends IService<DlRepairSti> {
/**
* 调拨单子表 分页
*
* @author 小李
* @date 14:48 2024/9/19
* @param repairStiReqVO 查询对象
**/
IPage<DlRepairSti> getStiPage(DlRepairStiReqVO repairStiReqVO, Page<DlRepairSti> page);
}

15
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java
View File

@ -5,8 +5,11 @@ import cn.iocoder.yudao.common.RepairErrorCodeConstants;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt;
import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStRespVO;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStService;
import cn.iocoder.yudao.module.stockTransfer.mapper.DlRepairStMapper;
@ -51,6 +54,18 @@ public class DlRepairStServiceImpl extends ServiceImpl<DlRepairStMapper, DlRepai
repairStRespVO.getGoodsList().forEach(item -> item.setStId(repairStRespVO.getId()));
repairStiService.saveBatch(repairStRespVO.getGoodsList());
}
/**
* 调拨单（出库、入库） 分页
*
* @author 小李
* @date 9:20 2024/9/19
* @param repairStReqVO 查询对象
**/
@Override
public IPage<DlRepairSt> getStPage(DlRepairStReqVO repairStReqVO, Page<DlRepairSt> page){
return baseMapper.getStPage(repairStReqVO, page);
}
}

15
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java
View File

@ -3,6 +3,9 @@ package cn.iocoder.yudao.module.stockTransfer.service.impl;
import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti;
import cn.iocoder.yudao.module.stockTransfer.mapper.DlRepairStiMapper;
import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService;
import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@ -16,6 +19,18 @@ import org.springframework.stereotype.Service;
public class DlRepairStiServiceImpl extends ServiceImpl<DlRepairStiMapper, DlRepairSti>
implements DlRepairStiService {
/**
* 调拨单子表 分页
*
* @author 小李
* @date 14:48 2024/9/19
* @param repairStiReqVO 查询对象
**/
@Override
public IPage<DlRepairSti> getStiPage(DlRepairStiReqVO repairStiReqVO, Page<DlRepairSti> page){
return baseMapper.getStiPage(repairStiReqVO, page);
}
}

10
dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml
View File

@ -41,4 +41,14 @@
from dl_repair_st st
where st.deleted = '0'
</sql>
<select id="getStPage" resultMap="BaseResultMap">
<include refid="Base_SQL" />
<if test="map.outCorpId != null and map.outCorpId != ''">
and st.out_corp_id = #{map.outCorpId}
</if>
<if test="map.inCorpId != null and map.inCorpId != ''">
and st.in_corp_id = #{map.inCorpId}
</if>
</select>
</mapper>

4
dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml
View File

@ -23,4 +23,8 @@
from dl_repair_sti sti
where sti.deleted = '0'
</sql>
<select id="getStiPage" resultMap="BaseResultMap">
<include refid="Base_SQL" />
</select>
</mapper>

2
yudao-server/src/main/resources/application.yaml
View File

@ -68,7 +68,7 @@ flowable:
mybatis-plus:
configuration:
map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:
db-config:
id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。