Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
62896a7c 由 康伟
选项

kangwei: 备品备件---入库记录、出库记录

1 个父辈 9a72d6f5
内嵌 并排
正在显示 6 个修改的文件 包含 213 行增加 和 3 行删除
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentSparepartController.java
......@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.equipment.vo.EquipmentInOutDetailVO;
import com.skua.modules.equipment.vo.EquipmentInOutRecordVO;
import com.skua.modules.equipment.vo.EquipmentSparepartSearchVO;
import com.skua.tool.dfs.MapDFS;
import com.skua.tool.util.JSUtils;
......@@ -208,8 +209,40 @@ public class EquipmentSparepartController {
result.setResult(mapPage);
return result;
}
@AutoLog(value = "备品备件表-入库详情")
@ApiOperation(value = "备品备件表-入库详情", notes = "备品备件表-入库详情")
@AutoLog(value = "备品备件表-入库记录列表")
@ApiOperation(value = "备品备件表-入库记录列表", notes = "备品备件表-入库记录列表")
@GetMapping(value = "/queryEquipmentInList")
public Result<IPage<EquipmentInOutRecordVO>> queryEquipmentInList(String sparepartId,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
Result<IPage<EquipmentInOutRecordVO>> result = new Result<>();
Page<EquipmentInOutRecordVO> page = new Page<EquipmentInOutRecordVO>(pageNo, pageSize);
IPage<EquipmentInOutRecordVO> pageList = equipmentSparepartService.queryEquipmentInList(page,sparepartId);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "备品备件表-出库记录列表")
@ApiOperation(value = "备品备件表-出库记录列表", notes = "备品备件表-出库记录列表")
@GetMapping(value = "/queryEquipmentOutList")
public Result<IPage<EquipmentInOutRecordVO>> queryEquipmentOutList(String sparepartId,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
Result<IPage<EquipmentInOutRecordVO>> result = new Result<>();
Page<EquipmentInOutRecordVO> page = new Page<EquipmentInOutRecordVO>(pageNo, pageSize);
IPage<EquipmentInOutRecordVO> pageList = equipmentSparepartService.queryEquipmentOutList(page,sparepartId);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "备品备件表-入库库存详情")
@ApiOperation(value = "备品备件表-入库库存详情", notes = "备品备件表-入库库存详情")
@GetMapping(value = "/inOrderDetail")
public Result<IPage<EquipmentInOutDetailVO>> inOrderDetail(String sparepartId,String sparepartCode,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
......@@ -223,7 +256,7 @@ public class EquipmentSparepartController {
return result;
}
@AutoLog(value = "备品备件表-出库详情")
@ApiOperation(value = "备品备件表-出库详情", notes = "备品备件表-出库详情")
@ApiOperation(value = "备品备件表-出库库存详情", notes = "备品备件表-出库库存详情")
@GetMapping(value = "/outOrderDetail")
public Result<IPage<EquipmentInOutDetailVO>> outOrderDetail(String sparepartId, String sparepartCode,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentSparepartMapper.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.equipment.dto.EquipmentSparepartDTO;
import com.skua.modules.equipment.entity.EquipmentSparepart;
import com.skua.modules.equipment.vo.EquipmentInOutDetailVO;
import com.skua.modules.equipment.vo.EquipmentInOutRecordVO;
import com.skua.modules.equipment.vo.EquipmentSparepartSearchVO;
import com.skua.modules.equipment.vo.EquipmentSparepartVO;
import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
......@@ -30,6 +31,21 @@ public interface EquipmentSparepartMapper extends BaseMapper<EquipmentSparepart>
IPage<EquipmentSparepartVO> queryPageRelationList(@Param("page")Page<EquipmentSparepartVO> page, @Param("param") EquipmentSparepartSearchVO sparepartSearchVO);
/***
* 备品备件表-入库记录列表
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutRecordVO> queryEquipmentInList(Page<EquipmentInOutRecordVO> page, @Param("sparepartId") String sparepartId);
/***
* 备品备件表-出库记录列表
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutRecordVO> queryEquipmentOutList(Page<EquipmentInOutRecordVO> page, @Param("sparepartId") String sparepartId);
/***
* 备品备件表-入库详情
* @param page
* @param sparepartId
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentSparepartMapper.xml
......@@ -30,6 +30,35 @@
<if test="param.specification != null and param.specification !=''">and es.specification like '%${param.specification}%'</if>
order by es.inventory_update_time desc
</select>
<!-- 备品备件（入库单列表） -->
<select id="queryEquipmentInList" resultType="com.skua.modules.equipment.vo.EquipmentInOutRecordVO">
select ei.depart_id,ei.in_order 'in_out_order' ,ei.in_type,ei.in_date 'inOutDate',ei.use_by,ei.choose_time,ei.supplies_warehouse_id,sw.warehouse_name,
mic.sparepart_id , mic.cur_storage_num 'storageNum', mic.in_num 'inOutNum' ,mic.quality,mic.batch_num,
ss.sparepart_code,ss.sparepart_name, ss.specification,ss.measuring_unit,st.item_text as 'sparepart_type_name'
from equipment_in_child mic
left join equipment_in ei on ei.id = mic.in_id
left join supplies_warehouse sw on sw.id = ei.supplies_warehouse_id
left join equipment_sparepart_supplies ss on ss.id = mic.sparepart_id
left join equipment_sparepart_type st on st.id = ss.sparepart_type
where mic.sparepart_id = #{sparepartId}
</select>
<select id="queryEquipmentOutList" resultType="com.skua.modules.equipment.vo.EquipmentInOutRecordVO">
select eo.depart_id,eo.out_order 'in_out_order' ,eo.out_date 'inOutDate' ,eo.use_by,eo.choose_time,eo.supplies_warehouse_id,sw.warehouse_name,
moc.sparepart_id , moc.actual_num 'storageNum',moc.out_num 'inOutNum',moc.batch_num,
ss.sparepart_code,ss.sparepart_name, ss.specification,ss.measuring_unit,st.item_text as 'sparepart_type_name'
from equipment_out_child moc
left join equipment_out eo on eo.id = moc.out_id
left join supplies_warehouse sw on sw.id = eo.supplies_warehouse_id
left join equipment_sparepart_supplies ss on ss.id = moc.sparepart_id
left join equipment_sparepart_type st on st.id = ss.sparepart_type
where moc.sparepart_id = #{sparepartId}
</select>
<!-- 分页查询：物料的入库详情 -->
<select id="inOrderDetail" resultType="com.skua.modules.equipment.vo.EquipmentInOutDetailVO">
select eic.sparepart_id,es.sparepart_name,es.sparepart_code,es.depart_id ,'入库' as direction , eic.in_num 'inOutNum' ,es.storage_num , ei.use_by as useBy ,ei.in_order as inOutOrder
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentSparepartService.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.equipment.dto.EquipmentSparepartDTO;
import com.skua.modules.equipment.entity.EquipmentSparepart;
import com.skua.modules.equipment.vo.EquipmentInOutDetailVO;
import com.skua.modules.equipment.vo.EquipmentInOutRecordVO;
import com.skua.modules.equipment.vo.EquipmentSparepartSearchVO;
import com.skua.modules.equipment.vo.EquipmentSparepartVO;
import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
......@@ -27,6 +28,23 @@ public interface IEquipmentSparepartService extends IService<EquipmentSparepart>
*/
IPage<EquipmentSparepartVO> queryPageRelationList(Page<EquipmentSparepartVO> page, EquipmentSparepartSearchVO sparepartSearchVO);
/***
* 备品备件表-入库记录列表
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutRecordVO> queryEquipmentInList(Page<EquipmentInOutRecordVO> page, String sparepartId);
/***
* 备品备件表-出库记录列表
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutRecordVO> queryEquipmentOutList(Page<EquipmentInOutRecordVO> page, String sparepartId);
/***
* 备品备件表-入库详情
* @param page
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentSparepartServiceImpl.java
......@@ -7,6 +7,7 @@ import com.skua.modules.equipment.entity.EquipmentSparepart;
import com.skua.modules.equipment.mapper.EquipmentSparepartMapper;
import com.skua.modules.equipment.service.IEquipmentSparepartService;
import com.skua.modules.equipment.vo.EquipmentInOutDetailVO;
import com.skua.modules.equipment.vo.EquipmentInOutRecordVO;
import com.skua.modules.equipment.vo.EquipmentSparepartSearchVO;
import com.skua.modules.equipment.vo.EquipmentSparepartVO;
import org.springframework.stereotype.Service;
......@@ -40,6 +41,27 @@ public class EquipmentSparepartServiceImpl extends ServiceImpl<EquipmentSparepar
public IPage<EquipmentSparepartVO> queryPageRelationList(Page<EquipmentSparepartVO> page, EquipmentSparepartSearchVO sparepartSearchVO){
return baseMapper.queryPageRelationList(page,sparepartSearchVO);
}
/***
* 备品备件表-入库记录列表
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutRecordVO> queryEquipmentInList(Page<EquipmentInOutRecordVO> page, String sparepartId){
return baseMapper.queryEquipmentInList(page,sparepartId);
}
/***
* 备品备件表-出库记录列表
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutRecordVO> queryEquipmentOutList(Page<EquipmentInOutRecordVO> page, String sparepartId){
return baseMapper.queryEquipmentOutList(page,sparepartId);
}
/***
* 备品备件表-入库详情
* @param page
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentInOutRecordVO.java 0 → 100644
package com.skua.modules.equipment.vo;
import com.skua.core.aspect.annotation.Dict;
import com.skua.tool.annotation.BeanAnno;
import com.skua.tool.annotation.JoinSqlQueryAnno;
import com.skua.tool.enums.JoinSqlQueryEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.math.BigDecimal;
/**
* @auther kangwei
* @create 2025-02-17-11:00
*/
@Data
@ApiModel(value = "物料出入库记录", description = "物料出入库记录")
public class EquipmentInOutRecordVO {
/**
* 所属厂站
*/
@Excel(name = "所属厂站", width = 15)
@ApiModelProperty(value = "所属厂站")
@Dict(dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
private String departId;
@ApiModelProperty(value = "出/入库单号")
private String inOutOrder;
@ApiModelProperty(value = "入库时间")
private String inOutDate;
@ApiModelProperty(value = "经办人")
@BeanAnno(targetFieldName = "useByName")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
private String useBy;
@ApiModelProperty(value = "经办时间")
private String chooseTime;
@ApiModelProperty(value = "所属仓库")
private String suppliesWarehouseId;
@ApiModelProperty(value = "所属仓库名称")
private String warehouseName;
@Excel(name = "当前库存量", width = 15)
@ApiModelProperty(value = "当前库存量")
private String storageNum;
@ApiModelProperty(value = "出/入库数量")
private String inOutNum;
/**
* 批次号
*/
@Excel(name = "批次号", width = 15)
@ApiModelProperty(value = "批次号")
private String batchNum;;
@ApiModelProperty(value = "备件编号")
private String sparepartId;
/**
* 备件编号
*/
@ApiModelProperty(value = "备件编号")
private String sparepartCode;
/**
* 备件名称
*/
@ApiModelProperty(value = "备件名称")
private String sparepartName;
/**
* 备件类型
*/
@ApiModelProperty(value = "备件类型")
private String sparepartType;
@ApiModelProperty(value = "备件类型名称")
private String sparepartTypeName;
@ApiModelProperty(value = "规格型号")
private String specification;
@ApiModelProperty(value = "计量单位")
private String measuringUnit;
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!