Skip to content

张雷 / skboot-zhongye

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

kangwei: 工作进度统计:1、自营水厂和恩菲水厂分开展示，可以用tab切换 

         物料信息增加一个库存详情:点击【库存详情】，弹框显示这些库存具体都是哪个水厂、哪个仓库的库存清单
1 个父辈 c86f58f9
内嵌 并排
正在显示 13 个修改的文件 包含 259 行增加 和 26 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialAcceptanceFormController.java
......@@ -146,17 +146,7 @@ public class MaterialAcceptanceFormController {
if(StringUtils.isNotEmpty(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotEmpty(materialAcceptanceForm.getReceiverSign()) ){
materialAcceptanceForm.setConfirmStatus("9");
}
MaterialAcceptanceForm materialAcceptanceFormEntity = materialAcceptanceFormService.getById(materialAcceptanceForm.getId());
if(materialAcceptanceFormEntity==null) {
//result.error500("未找到对应实体");
materialAcceptanceFormService.save(materialAcceptanceForm);
}else {
materialAcceptanceFormService.updateById(materialAcceptanceForm);
}
MaterialIN materialIN =materialINService.getById(materialAcceptanceForm.getId());
materialIN.setConfirmStatus(materialAcceptanceForm.getConfirmStatus());
materialINService.updateById( materialIN);
materialAcceptanceFormService.saveOrUpdateMaterialAcceptanceForm(materialAcceptanceForm);
//TODO 返回false说明什么？
result.success("修改成功!");
return result;
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialAcceptanceFormMapper.java
......@@ -18,4 +18,11 @@ public interface MaterialAcceptanceFormMapper extends BaseMapper<MaterialAccepta
* @return
*/
public List<MaterialAcceptanceForm> queryArrivalRecordByList(MaterialIN materialIN);
/***
* 修改药剂入库的确认状态
* @param materialInId
* @param confirmStatus
*/
void updateMaterialINConfirmStatus(@Param("materialInId") String materialInId, @Param("confirmStatus")String confirmStatus);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialAcceptanceFormMapper.xml
......@@ -26,4 +26,9 @@
</where>
order by maf.create_time asc
</select>
</mapper>
\ No newline at end of file
<!-- 修改药剂入库的确认状态 -->
<update id="updateMaterialINConfirmStatus" >
update erp_material_in set confirm_status = #{confirmStatus} where id=#{materialInId}
</update>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialAcceptanceFormService.java
......@@ -18,4 +18,6 @@ public interface IMaterialAcceptanceFormService extends IService<MaterialAccepta
* @return
*/
List<MaterialAcceptanceForm> queryArrivalRecordByList(MaterialIN materialIN);
void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialAcceptanceFormServiceImpl.java
......@@ -7,6 +7,7 @@ import com.skua.modules.erp.service.IMaterialAcceptanceFormService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
......@@ -24,4 +25,19 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
public List<MaterialAcceptanceForm> queryArrivalRecordByList(MaterialIN materialIN){
return this.baseMapper.queryArrivalRecordByList(materialIN);
}
@Transactional
@Override
public void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm) {
MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.selectById(materialAcceptanceForm.getId());
if(materialAcceptanceFormEntity==null) {
//result.error500("未找到对应实体");
baseMapper.insert(materialAcceptanceForm);
}else {
baseMapper.updateById(materialAcceptanceForm);
}
//修改药剂入库的确认状态
baseMapper.updateMaterialINConfirmStatus(materialAcceptanceForm.getId(),materialAcceptanceForm.getConfirmStatus());
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WorkAnalysisController.java
......@@ -31,15 +31,21 @@ import java.util.List;
public class WorkAnalysisController {
@ApiOperation(value = "工作进度列表", notes = "工作进度列表 timeType = 1 表示月份，timeType=2 表示年")
@ApiOperation(value = "工作进度列表", notes = "工作进度列表 departType = 1 自营水厂 departType=2 表示恩菲水厂 timeType = 1 表示月份，timeType=2 表示年")
@GetMapping("/analysisByWorkProgress")
public Result<List<WorkProgressVO>> analysisByWorkProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
public Result<List<WorkProgressVO>> analysisByWorkProgress(@RequestParam(defaultValue = "1") Integer departType,@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
Result<List<WorkProgressVO>> result = new Result<>();
String month = DateUtils.formatDate(startTime,"YYYY-MM");
if(2 == timeType){//表示年
month = DateUtils.formatDate(startTime,"YYYY");
}
String departIds = null;//DAY(LAST_DAY('"+startTime+"'))
if(departType == 1){//自营水厂
departIds = getSelfDepartIds();
}
if(departType == 2){//恩菲水厂
departIds = getEFDepartIds();
}
String sql = "select d.id 'depart_id' , d.depart_name , (DATEDIFF('"+endTime+"', '"+startTime+"') +1) 'day_num' , (month('"+endTime+"') - month('"+startTime+"') + 1) month_num,ifnull(aaa.count,0) 'nh_num' ,ifnull(bbb.count,0) 'szsl_num' ,ifnull(ccc.count,0) 'hy_num' ,ifnull(ddd.count,0) 'yy_month_num',ifnull(fff.count,0) 'df_month_num' ,ifnull(ggg.count,0) 'year_target_num' from sys_depart d ";
sql += getWorkProgressSql(departIds, startTime, endTime, month);
sql += " where d.depart_type =1 ";
......@@ -48,7 +54,7 @@ public class WorkAnalysisController {
}
sql += " order by (ifnull(aaa.count,0) + ifnull(bbb.count,0)+ifnull(ccc.count,0) +ifnull(ddd.count,0)+ifnull(fff.count,0) +ifnull(ggg.count,0) ) asc ";
System.out.println("sql = "+sql);
// System.out.println("sql = "+sql);
JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
List<WorkProgressVO> dataList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<WorkProgressVO>(WorkProgressVO.class));
result.setResult(dataList);
......@@ -58,7 +64,7 @@ public class WorkAnalysisController {
@ApiOperation(value = "工作进度统计-数量统计", notes = "工作进度-数量统计 timeType = 1 表示月份，timeType=2 表示年")
@GetMapping("/analysisTotalByWorkProgress")
public Result<WorkProgressVO> analysisTotalByWorkProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
public Result<WorkProgressVO> analysisTotalByWorkProgress(@RequestParam(defaultValue = "1") Integer departType,@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
Result<WorkProgressVO> result = new Result<>();
WorkProgressVO workProgressVO = null;
String month = DateUtils.formatDate(startTime,"YYYY-MM");
......@@ -66,6 +72,12 @@ public class WorkAnalysisController {
month = DateUtils.formatDate(startTime,"YYYY");
}
String departIds = null;//DAY(LAST_DAY('"+startTime+"'))
if(departType == 1){//自营水厂
departIds = getSelfDepartIds();
}
if(departType == 2){//恩菲水厂
departIds = getEFDepartIds();
}
String sql = "select count(d.id) 'departNum', (DATEDIFF('"+endTime+"', '"+startTime+"') +1) 'day_num' , (month('"+endTime+"') - month('"+startTime+"') + 1) month_num,";
sql += " ifnull(sum(aaa.count),0) 'nh_num' ,ifnull(sum(bbb.count),0) 'szsl_num' ,ifnull(sum(ccc.count),0) 'hy_num' ,ifnull(sum(ddd.count),0) 'yy_month_num',ifnull(sum(fff.count),0) 'df_month_num' ,ifnull(sum(ggg.count),0) 'year_target_num' ";
sql += " from sys_depart d ";
......@@ -88,10 +100,16 @@ public class WorkAnalysisController {
@ApiOperation(value = "安全管理进度-数据列表", notes = "安全管理进度-数据列表 timeType = 1 表示月份，timeType=2 表示年")
@GetMapping("/analysisBySafeProgress")
public Result<List<SafeProgressVO>> analysisBySafeProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
public Result<List<SafeProgressVO>> analysisBySafeProgress(@RequestParam(defaultValue = "1") Integer departType,@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
Result<List<SafeProgressVO>> result = new Result<>();
JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
String departIds = null;
if(departType == 1){//自营水厂
departIds = getSelfDepartIds();
}
if(departType == 2){//恩菲水厂
departIds = getEFDepartIds();
}
String sql = "select d.id 'depart_id' , d.depart_name , ifnull(aaa.count,0) 'meet_num', ifnull(bbb.count,0) 'meet_total', ifnull(ccc.count,0) 'exam_num', ifnull(ddd.count,0) 'exam_total',ifnull(eee.count, 0) 'frequency_num' , ifnull(fff.count , 0) 'frequency_total'";
sql += " from sys_depart d ";
sql += getSafeProgressSql(departIds, startTime,endTime);
......@@ -108,9 +126,15 @@ public class WorkAnalysisController {
}
@ApiOperation(value = "安全管理进度统计-数量统计", notes = "安全管理进度-数量统计 timeType = 1 表示月份，timeType=2 表示年")
@GetMapping("/analysisTotalBySafeProgress")
public Result<SafeProgressVO> analysisTotalBySafeProgress(@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
public Result<SafeProgressVO> analysisTotalBySafeProgress(@RequestParam(defaultValue = "1") Integer departType,@RequestParam(defaultValue = "1") Integer timeType, String startTime, String endTime) {
Result<SafeProgressVO> result = new Result<>();
String departIds = null;//DAY(LAST_DAY('"+startTime+"'))
if(departType == 1){//自营水厂
departIds = getSelfDepartIds();
}
if(departType == 2){//恩菲水厂
departIds = getEFDepartIds();
}
String sql = "select count(d.id) 'departNum', ifnull(sum(aaa.count),0) 'meet_num' ,ifnull(sum(bbb.count),0) 'meet_total' ,ifnull(sum(ccc.count),0) 'exam_num' ,ifnull(sum(ddd.count),0) 'exam_total',ifnull(sum(eee.count),0) 'frequency_num' ,ifnull(sum(fff.count),0) 'frequency_total' ";
sql += " from sys_depart d ";
sql += getSafeProgressSql(departIds, startTime,endTime);
......@@ -164,7 +188,7 @@ public class WorkAnalysisController {
sql += " left join (select cc.depart_id ,count(1) 'count' from "+viewbffaSql+ " cc group by cc.depart_id )ccc on ccc.depart_id = d.id ";
//电费月报
sql += " left join( select ec.depart_id , ec.cost , count(1) 'count' from report_electric_cost ec where ec.month like '"+month+"%' group by ec.depart_id) ddd on ddd.depart_id = d.id ";
sql += " left join( select ec.depart_id , ec.cost , count(1) 'count' from report_electric_cost ec where ec.month like '"+month+"%' and ec.cost > '0' group by ec.depart_id ) ddd on ddd.depart_id = d.id ";
//生产运营月报表
String view4411Sql = ReportViewUtil.buildView(ReportConstant.view4411,"yyf,ysfsl",departIds,startTime,endTime);
......@@ -176,4 +200,18 @@ public class WorkAnalysisController {
return sql;
}
private String getSelfDepartIds(){
String sql = "select GROUP_CONCAT(id) 'departIds' from sys_depart where depart_type =1 and parent_id <> '1818215543140909056'";
return getJdbcTemplate().queryForObject(sql,String.class);
}
private String getEFDepartIds(){//获取恩菲水厂编号
String sql = "select GROUP_CONCAT(id) 'departIds' from sys_depart where depart_type =1 and parent_id = '1818215543140909056'";
return getJdbcTemplate().queryForObject(sql,String.class);
}
private JdbcTemplate getJdbcTemplate(){
JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
return jdbcTemplate;
}
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentSparepartController.java
......@@ -13,6 +13,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.EquipmentSparepartSearchVO;
import com.skua.tool.dfs.MapDFS;
import com.skua.tool.util.JSUtils;
......@@ -207,7 +208,35 @@ public class EquipmentSparepartController {
result.setResult(mapPage);
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,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
Result<IPage<EquipmentInOutDetailVO>> result = new Result<>();
Page<EquipmentInOutDetailVO> page = new Page<EquipmentInOutDetailVO>(pageNo, pageSize);
IPage<EquipmentInOutDetailVO> pageList = equipmentSparepartService.inOrderDetail(page,sparepartId,sparepartCode);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "备品备件表-出库详情")
@ApiOperation(value = "备品备件表-出库详情", notes = "备品备件表-出库详情")
@GetMapping(value = "/outOrderDetail")
public Result<IPage<EquipmentInOutDetailVO>> outOrderDetail(String sparepartId, String sparepartCode,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
Result<IPage<EquipmentInOutDetailVO>> result = new Result<>();
Page<EquipmentInOutDetailVO> page = new Page<EquipmentInOutDetailVO>(pageNo, pageSize);
IPage<EquipmentInOutDetailVO> pageList = equipmentSparepartService.outOrderDetail(page,sparepartId,sparepartCode);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* 分页列表查询
*
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentSparepartMapper.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.EquipmentSparepartSearchVO;
import com.skua.modules.equipment.vo.EquipmentSparepartVO;
import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
......@@ -27,4 +28,20 @@ public interface EquipmentSparepartMapper extends BaseMapper<EquipmentSparepart>
* @return
*/
IPage<EquipmentSparepartVO> queryPageRelationList(@Param("page")Page<EquipmentSparepartVO> page, @Param("param") EquipmentSparepartSearchVO sparepartSearchVO);
/***
* 备品备件表-入库详情
* @param page
* @param sparepartId
* @return
*/
IPage<EquipmentInOutDetailVO> inOrderDetail(@Param("page")Page<EquipmentInOutDetailVO> page, @Param("sparepartId") String sparepartId,@Param("sparepartCode") String sparepartCode);
/**
* 备品备件表-出库详情
* @param page
* @param sparepartId
* @return
*/
IPage<EquipmentInOutDetailVO> outOrderDetail(@Param("page")Page<EquipmentInOutDetailVO> page, @Param("sparepartId") String sparepartId,@Param("sparepartCode") String sparepartCode);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentSparepartMapper.xml
......@@ -12,11 +12,12 @@
left join sys_depart d on sw.depart_id = d.id
where es.supplies_warehouse_id = sw.id and sw.depart_id in (${param.departIds})
<if test="param.suppliesWarehouseId != null and param.suppliesWarehouseId !=''"> and es.supplies_warehouse_id =#{param.suppliesWarehouseId}</if>
<if test="param.sparepartCode != null and param.sparepartCode !=''">and es.sparepart_code like '%${param.sparepartCode}%'</if>
<if test="param.sparepartType != null and param.sparepartType !=''">and es.sparepart_type in (${param.sparepartType}) </if>
<if test="param.sparepartName != null and param.sparepartName !=''">and es.sparepart_name like '%${param.sparepartName}%'</if>
<if test="param.specification != null and param.specification !=''">and es.specification like '%${param.specification}%'</if>
<if test="param.sparepartAttribute != null and param.sparepartAttribute !=''">and es.sparepart_attribute like '%${param.sparepartAttribute}%'</if>
<if test="param.sparepartId != null and param.sparepartId !=''"> and es.supplies_id =#{param.sparepartId}</if>
<if test="param.sparepartCode != null and param.sparepartCode !=''"> and es.sparepart_code like '%${param.sparepartCode}%'</if>
<if test="param.sparepartType != null and param.sparepartType !=''"> and es.sparepart_type in (${param.sparepartType}) </if>
<if test="param.sparepartName != null and param.sparepartName !=''"> and es.sparepart_name like '%${param.sparepartName}%'</if>
<if test="param.specification != null and param.specification !=''"> and es.specification like '%${param.specification}%'</if>
<if test="param.sparepartAttribute != null and param.sparepartAttribute !=''"> and es.sparepart_attribute like '%${param.sparepartAttribute}%'</if>
order by sw.depart_id asc , es.inventory_update_time desc
</select>
......@@ -29,4 +30,24 @@
<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="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
from equipment_sparepart_supplies es
left join equipment_in_child eic on eic.sparepart_id = es.id
left join equipment_in ei on ei.id= eic.in_id
where 1=1
<if test="sparepartId != null and sparepartId !=''">and eic.sparepart_id = #{sparepartId}</if>
<if test="sparepartCode != null and sparepartCode !=''">and es.sparepart_code = #{sparepartCode}</if>
</select>
<!-- 分页查询：物料的入库详情 -->
<select id="outOrderDetail" resultType="com.skua.modules.equipment.vo.EquipmentInOutDetailVO">
select eoc.sparepart_id,es.sparepart_name,es.sparepart_code,es.depart_id ,'出库' as direction , eoc.out_num 'inOutNum' ,es.storage_num , eo.use_by as useBy ,eo.out_order as inOutOrder
from equipment_sparepart_supplies es
left join equipment_out_child eoc on eoc.sparepart_id = es.id
left join equipment_out eo on eo.id= eoc.out_id
where 1=1
<if test="sparepartId != null and sparepartId !=''">and eic.sparepart_id = #{sparepartId}</if>
<if test="sparepartCode != null and sparepartCode !=''">and es.sparepart_code = #{sparepartCode}</if>
</select>
</mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentSparepartService.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.EquipmentSparepartSearchVO;
import com.skua.modules.equipment.vo.EquipmentSparepartVO;
import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
......@@ -25,4 +26,20 @@ public interface IEquipmentSparepartService extends IService<EquipmentSparepart>
* @return
*/
IPage<EquipmentSparepartVO> queryPageRelationList(Page<EquipmentSparepartVO> page, EquipmentSparepartSearchVO sparepartSearchVO);
/***
* 备品备件表-入库详情
* @param page
* @param sparepartId
* @return
*/
IPage<EquipmentInOutDetailVO> inOrderDetail(Page<EquipmentInOutDetailVO> page, String sparepartId, String sparepartCode);
/**
* 备品备件表-出库详情
* @param page
* @param sparepartId
* @return
*/
IPage<EquipmentInOutDetailVO> outOrderDetail(Page<EquipmentInOutDetailVO> page, String sparepartId, String sparepartCode);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentSparepartServiceImpl.java
......@@ -3,13 +3,12 @@ package com.skua.modules.equipment.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.skua.modules.equipment.dto.EquipmentSparepartDTO;
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.EquipmentSparepartSearchVO;
import com.skua.modules.equipment.vo.EquipmentSparepartVO;
import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
import org.springframework.stereotype.Service;
/**
......@@ -41,4 +40,23 @@ 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<EquipmentInOutDetailVO> inOrderDetail(Page<EquipmentInOutDetailVO> page, String sparepartId, String sparepartCode){
return baseMapper.inOrderDetail(page,sparepartId,sparepartCode);
}
/**
* 备品备件表-出库详情
* @param page
* @param sparepartId
* @return
*/
public IPage<EquipmentInOutDetailVO> outOrderDetail(Page<EquipmentInOutDetailVO> page, String sparepartId, String sparepartCode){
return baseMapper.outOrderDetail(page,sparepartId,sparepartCode);
}
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentInOutDetailVO.java 0 → 100644
package com.skua.modules.equipment.vo;
import com.baomidou.mybatisplus.annotation.TableName;
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 lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
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 EquipmentInOutDetailVO {
/**
* 所属厂站
*/
@Excel(name = "所属厂站", width = 15)
@ApiModelProperty(value = "所属厂站")
@Dict(dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
private String departId;
@ApiModelProperty(value = "出入库说明")
private String direction;
@ApiModelProperty(value = "备件编号")
private String sparepartId;
/**
* 备件编号
*/
@ApiModelProperty(value = "备件编号")
private String sparepartCode;
/**
* 备件名称
*/
@ApiModelProperty(value = "备件名称")
private String sparepartName;
/**
* 备件类型
*/
@ApiModelProperty(value = "备件类型")
@Dict(dictTable = "equipment_sparepart_Type",dicCode = "id",dicText = "item_text")
@JoinSqlQueryAnno(joinSqlQueryEnum = JoinSqlQueryEnum.EQ)
private String sparepartType;
@ApiModelProperty(value = "当前库存")
private BigDecimal storageNum;
@ApiModelProperty(value = "出/入库单号")
private String inOutOrder;
@ApiModelProperty(value = "出/入库数量")
private BigDecimal inOutNum;
@ApiModelProperty(value = "经办人")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
private String useBy;
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentSparepartSearchVO.java
......@@ -25,9 +25,13 @@ public class EquipmentSparepartSearchVO {
@ApiModelProperty(value = "物料名称")
private String sparepartName;
@ApiModelProperty(value = "物料编号")
private String sparepartId;
@ApiModelProperty(value = "物料Code")
public String sparepartCode;
@ApiModelProperty(value = "权限下的部门编号集合")
private String departIds;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!