lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
@@ -16,8 +16,10 @@ import org.jeecg.modules.eam.constant.BusinessCodeConst; import org.jeecg.modules.eam.entity.EamEquipmentLeanOut; import org.jeecg.modules.eam.entity.EamSparePartRequisition; import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail; import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest; import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest; import org.jeecg.modules.eam.service.IEamSparePartRequisitionDetailService; import org.jeecg.modules.eam.service.IEamSparePartRequisitionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -47,6 +49,9 @@ @Resource private IEamSparePartRequisitionService eamSparePartRequisitionService; @Resource private IEamSparePartRequisitionDetailService eamSparePartRequisitionDetailService; /** * 分页列表查询 * @@ -65,6 +70,11 @@ QueryWrapper<EamSparePartRequisition> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartRequisition, req.getParameterMap()); Page<EamSparePartRequisition> page = new Page<EamSparePartRequisition>(pageNo, pageSize); IPage<EamSparePartRequisition> pageList = eamSparePartRequisitionService.page(page, queryWrapper); for (EamSparePartRequisition record : pageList.getRecords()) { List<EamSparePartRequisitionDetail> details = eamSparePartRequisitionDetailService.lambdaQuery() .eq(EamSparePartRequisitionDetail::getSpareRequisitionId, record.getId()).list(); record.setSparePartRequisitionDetails(details); } return Result.OK(pageList); } @@ -82,6 +92,11 @@ String realName = user.getRealname(); eamSparePartRequisition.setReportUser(realName); eamSparePartRequisitionService.save(eamSparePartRequisition); for (EamSparePartRequisitionDetail sparePartRequisitionDetail : eamSparePartRequisition.getSparePartRequisitionDetails()) { sparePartRequisitionDetail.setSpareRequisitionId(eamSparePartRequisition.getId()); eamSparePartRequisitionDetailService.saveOrUpdate(sparePartRequisitionDetail); } return Result.OK("添加成功！"); } @@ -95,6 +110,18 @@ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartRequisition eamSparePartRequisition) { eamSparePartRequisitionService.updateById(eamSparePartRequisition); List<EamSparePartRequisitionDetail> details = eamSparePartRequisitionDetailService.lambdaQuery() .eq(EamSparePartRequisitionDetail::getSpareRequisitionId, eamSparePartRequisition.getId()).list(); for (EamSparePartRequisitionDetail detail : details) { eamSparePartRequisitionDetailService.removeById(detail.getId()); } for (EamSparePartRequisitionDetail sparePartRequisitionDetail : eamSparePartRequisition.getSparePartRequisitionDetails()) { sparePartRequisitionDetail.setSpareRequisitionId(eamSparePartRequisition.getId()); eamSparePartRequisitionDetailService.saveOrUpdate(sparePartRequisitionDetail); } return Result.OK("编辑成功!"); } @@ -107,6 +134,11 @@ @ApiOperation(value = "备件请购单-通过id删除", notes = "备件请购单-通过id删除") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { List<EamSparePartRequisitionDetail> details = eamSparePartRequisitionDetailService.lambdaQuery() .eq(EamSparePartRequisitionDetail::getSpareRequisitionId, id).list(); for (EamSparePartRequisitionDetail detail : details) { eamSparePartRequisitionDetailService.removeById(detail.getId()); } eamSparePartRequisitionService.removeById(id); return Result.OK("删除成功!"); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionDetailController.java
@@ -9,6 +9,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail; import org.jeecg.modules.eam.entity.EamSpareParts; import org.jeecg.modules.eam.service.IEamSparePartRequisitionDetailService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.eam.service.IEamSparePartsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -37,6 +39,9 @@ @Resource private IEamSparePartRequisitionDetailService eamSparePartRequisitionDetailService; @Resource private IEamSparePartsService eamSparePartsService; /** * 分页列表查询 * @@ -55,6 +60,13 @@ QueryWrapper<EamSparePartRequisitionDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartRequisitionDetail, req.getParameterMap()); Page<EamSparePartRequisitionDetail> page = new Page<EamSparePartRequisitionDetail>(pageNo, pageSize); IPage<EamSparePartRequisitionDetail> pageList = eamSparePartRequisitionDetailService.page(page, queryWrapper); for (EamSparePartRequisitionDetail record : pageList.getRecords()) { String partId = record.getPartId(); EamSpareParts part = eamSparePartsService.getById(partId); record.setPartCode(part.getPartCode()); record.setPartName(part.getPartName()); record.setPartModel(part.getPartModel()); } return Result.OK(pageList); }
@@ -8,6 +8,7 @@ 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; @@ -36,8 +37,8 @@ * 删除标记 */ @Excel(name = "删除标记", width = 15) @ApiModelProperty(value = "删除标记") private Integer delFlag; @ApiModelProperty(value = "删除状态(0-正常,1-已删除)") private Integer delFlag = CommonConstant.DEL_FLAG_0; /** * 请购单编码 */ @@ -81,5 +82,11 @@ @TableField(exist = false) private List<Map<String, Object>> sparePartRequisitionDetailList; @TableField(exist = false) private List<EamSparePartRequisitionDetail> sparePartRequisitionDetails; @TableField(exist = false) private List<EamSparePartRequisitionDetail> removeDetailList; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisitionDetail.java
@@ -1,6 +1,7 @@ package org.jeecg.modules.eam.entity; 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 io.swagger.annotations.ApiModel; @@ -8,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; @@ -33,8 +35,8 @@ * 删除标记 */ @Excel(name = "删除标记", width = 15) @ApiModelProperty(value = "删除标记") private Integer delFlag; @ApiModelProperty(value = "删除状态(0-正常,1-已删除)") private Integer delFlag = CommonConstant.DEL_FLAG_0; /** * 备件请购单ID */ @@ -53,4 +55,13 @@ @Excel(name = "请购数量", width = 15) @ApiModelProperty(value = "请购数量") private BigDecimal requisitionNum; @TableField(exist = false) private String partCode; @TableField(exist = false) private String partName; @TableField(exist = false) private String partModel; }
