lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java
@@ -1,6 +1,7 @@ package org.jeecg.modules.eam.controller; import java.util.Arrays; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -67,7 +68,10 @@ @ApiOperation(value = "备件库存信息-添加", notes = "备件库存信息-添加") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartInventory eamSparePartInventory) { eamSparePartInventoryService.save(eamSparePartInventory); List<EamSparePartInventory> eamSparePartInventories = eamSparePartInventory.getEamSparePartInventories(); for (EamSparePartInventory sparePartInventory : eamSparePartInventories) { eamSparePartInventoryService.save(sparePartInventory); } return Result.OK("添加成功！"); }
@@ -8,7 +8,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.modules.eam.entity.EamSparePartInventory; import org.jeecg.modules.eam.entity.EamSpareParts; import org.jeecg.modules.eam.service.IEamSparePartInventoryService; import org.jeecg.modules.eam.service.IEamSparePartsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,6 +39,9 @@ @Resource private IEamSparePartsService eamSparePartsService; @Autowired private IEamSparePartInventoryService eamSparePartInventoryService; /** * 分页列表查询 * @@ -55,6 +60,12 @@ QueryWrapper<EamSpareParts> queryWrapper = QueryGenerator.initQueryWrapper(eamSpareParts, req.getParameterMap()); Page<EamSpareParts> page = new Page<EamSpareParts>(pageNo, pageSize); IPage<EamSpareParts> pageList = eamSparePartsService.page(page, queryWrapper); for (EamSpareParts record : pageList.getRecords()) { QueryWrapper<EamSparePartInventory> wrapper = new QueryWrapper<>(); wrapper.eq("spare_part_id",record.getId()).select("sum(inventory) as inventory"); EamSparePartInventory one = eamSparePartInventoryService.getOne(wrapper); record.setTotalQuantity(one.getInventory().toString()); } return Result.OK(pageList); }
@@ -1,17 +1,20 @@ package org.jeecg.modules.eam.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.List; /** * @Description: 备件库存信息 @@ -34,6 +37,14 @@ @Excel(name = "备品备件ID", width = 15) @ApiModelProperty(value = "备品备件ID") private String sparePartId; /** * 来源类型 */ @Excel(name = "备件来源类型", width = 15) @ApiModelProperty(value = "备件来源类型") @Dict(dicCode = "spare_part_into_type") private String sparePartIntoType; /** * 批次号 */ @@ -68,4 +79,7 @@ @Excel(name = "存放位置", width = 15) @ApiModelProperty(value = "存放位置") private String location; @TableField(exist = false) private List<EamSparePartInventory> eamSparePartInventories; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java
@@ -1,11 +1,16 @@ package org.jeecg.modules.eam.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; @@ -31,8 +36,10 @@ * 删除标记 */ @Excel(name = "删除标记", width = 15) @ApiModelProperty(value = "删除标记") private Integer delFlag; @JsonIgnore @ApiModelProperty(value = "删除状态(0-正常,1-已删除)", hidden = true) @TableLogic private Integer delFlag = CommonConstant.DEL_FLAG_0; /** * 备件编码 */ @@ -50,6 +57,7 @@ */ @Excel(name = "备件分类", width = 15) @ApiModelProperty(value = "备件分类") @Dict(dicCode = "spare_part_category") private String partCategory; /** * 备件型号 @@ -111,4 +119,10 @@ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private String remark; /** * 库存总数量 */ @TableField(exist = false) private String totalQuantity; }
