chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

原材料检验项目功能、原材料检验标准功能

Browse Source
This commit is contained in:
chenx
2026-05-12 14:09:41 +08:00
parent b737dddb2a
commit f5ba828eff
27 changed files with 1338 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesRawMaterialInspectItemController.java Normal file
View File

@@ -0,0 +1,96 @@
package org.jeecg.modules.mes.material.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectItem;
import org.jeecg.modules.mes.material.service.IMesRawMaterialInspectItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@Slf4j
@Tag(name = "MES-原材料检验项目")
@RestController
@RequestMapping("/mes/material/rawMaterialInspectItem")
public class MesRawMaterialInspectItemController
extends JeecgController<MesRawMaterialInspectItem, IMesRawMaterialInspectItemService> {
@Autowired private IMesRawMaterialInspectItemService mesRawMaterialInspectItemService;
@GetMapping("/list")
public Result<IPage<MesRawMaterialInspectItem>> queryPageList(
MesRawMaterialInspectItem model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesRawMaterialInspectItem> queryWrapper =
QueryGenerator.initQueryWrapper(model, req.getParameterMap());
IPage<MesRawMaterialInspectItem> pageList =
mesRawMaterialInspectItemService.page(new Page<>(pageNo, pageSize), queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES-原材料检验项目-添加")
@Operation(summary = "MES-原材料检验项目-添加")
@RequiresPermissions("mes:mes_raw_material_inspect_item:add")
@PostMapping("/add")
public Result<String> add(@RequestBody MesRawMaterialInspectItem model) {
mesRawMaterialInspectItemService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES-原材料检验项目-编辑")
@Operation(summary = "MES-原材料检验项目-编辑")
@RequiresPermissions("mes:mes_raw_material_inspect_item:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesRawMaterialInspectItem model) {
mesRawMaterialInspectItemService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES-原材料检验项目-通过id删除")
@Operation(summary = "MES-原材料检验项目-通过id删除")
@RequiresPermissions("mes:mes_raw_material_inspect_item:delete")
@DeleteMapping("/delete")
public Result<String> delete(@RequestParam(name = "id") String id) {
mesRawMaterialInspectItemService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES-原材料检验项目-批量删除")
@Operation(summary = "MES-原材料检验项目-批量删除")
@RequiresPermissions("mes:mes_raw_material_inspect_item:deleteBatch")
@DeleteMapping("/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
mesRawMaterialInspectItemService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@GetMapping("/queryById")
public Result<MesRawMaterialInspectItem> queryById(@RequestParam(name = "id") String id) {
return Result.OK(mesRawMaterialInspectItemService.getById(id));
}
@RequiresPermissions("mes:mes_raw_material_inspect_item:exportXls")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesRawMaterialInspectItem model) {
return super.exportXls(request, model, MesRawMaterialInspectItem.class, "MES原材料检验项目");
}
@RequiresPermissions("mes:mes_raw_material_inspect_item:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesRawMaterialInspectItem.class);
}
}

128
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesRawMaterialInspectStdController.java Normal file
View File

@@ -0,0 +1,128 @@
package org.jeecg.modules.mes.material.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine;
import org.jeecg.modules.mes.material.service.IMesRawMaterialInspectStdService;
import org.jeecg.modules.mes.material.vo.MesRawMaterialInspectStdPage;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@Slf4j
@Tag(name = "MES-原材料检验标准")
@RestController
@RequestMapping("/mes/material/rawMaterialInspectStd")
public class MesRawMaterialInspectStdController extends JeecgController<MesRawMaterialInspectStd, IMesRawMaterialInspectStdService> {
@Autowired private IMesRawMaterialInspectStdService mesRawMaterialInspectStdService;
@GetMapping("/list")
public Result<IPage<MesRawMaterialInspectStd>> queryPageList(
MesRawMaterialInspectStd model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesRawMaterialInspectStd> queryWrapper =
QueryGenerator.initQueryWrapper(model, req.getParameterMap());
IPage<MesRawMaterialInspectStd> pageList =
mesRawMaterialInspectStdService.page(new Page<>(pageNo, pageSize), queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES-原材料检验标准-添加")
@Operation(summary = "MES-原材料检验标准-添加")
@RequiresPermissions("mes:mes_raw_material_inspect_std:add")
@PostMapping("/add")
public Result<String> add(@RequestBody MesRawMaterialInspectStdPage page) {
MesRawMaterialInspectStd main = new MesRawMaterialInspectStd();
BeanUtils.copyProperties(page, main);
mesRawMaterialInspectStdService.saveMain(main, page.getLineList());
return Result.OK("添加成功！");
}
@AutoLog(value = "MES-原材料检验标准-编辑")
@Operation(summary = "MES-原材料检验标准-编辑")
@RequiresPermissions("mes:mes_raw_material_inspect_std:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesRawMaterialInspectStdPage page) {
MesRawMaterialInspectStd main = new MesRawMaterialInspectStd();
BeanUtils.copyProperties(page, main);
mesRawMaterialInspectStdService.updateMain(main, page.getLineList());
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES-原材料检验标准-通过id删除")
@Operation(summary = "MES-原材料检验标准-通过id删除")
@RequiresPermissions("mes:mes_raw_material_inspect_std:delete")
@DeleteMapping("/delete")
public Result<String> delete(@RequestParam(name = "id") String id) {
mesRawMaterialInspectStdService.delMain(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES-原材料检验标准-批量删除")
@Operation(summary = "MES-原材料检验标准-批量删除")
@RequiresPermissions("mes:mes_raw_material_inspect_std:deleteBatch")
@DeleteMapping("/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
mesRawMaterialInspectStdService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@GetMapping("/queryById")
public Result<MesRawMaterialInspectStd> queryById(@RequestParam(name = "id") String id) {
return Result.OK(mesRawMaterialInspectStdService.getById(id));
}
@GetMapping("/queryLineListByStdId")
public Result<java.util.List<MesRawMaterialInspectStdLine>> queryLineListByStdId(
@RequestParam(name = "id") String id) {
return Result.OK(mesRawMaterialInspectStdService.selectLinesByStdId(id));
}
@AutoLog(value = "MES-原材料检验标准-启用停用")
@Operation(summary = "MES-原材料检验标准-启用停用")
@RequiresPermissions("mes:mes_raw_material_inspect_std:enable")
@PostMapping("/setEnable")
public Result<String> setEnable(@RequestBody java.util.Map<String, Object> body) {
String id = body.get("id") == null ? null : body.get("id").toString();
int flag = body.get("enableFlag") == null ? 0 : Integer.parseInt(body.get("enableFlag").toString());
if (StringUtils.isBlank(id)) {
return Result.error("id不能为空");
}
MesRawMaterialInspectStd db = mesRawMaterialInspectStdService.getById(id);
if (db == null) {
return Result.error("记录不存在");
}
mesRawMaterialInspectStdService.setEnable(id, flag);
return Result.OK(flag == 1 ? "已启用" : "已停用");
}
@RequiresPermissions("mes:mes_raw_material_inspect_std:exportXls")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesRawMaterialInspectStd model) {
return super.exportXls(request, model, MesRawMaterialInspectStd.class, "MES原材料检验标准");
}
@RequiresPermissions("mes:mes_raw_material_inspect_std:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesRawMaterialInspectStd.class);
}
}

56
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectItem.java Normal file
View File

@@ -0,0 +1,56 @@
package org.jeecg.modules.mes.material.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@Data
@TableName("mes_raw_material_inspect_item")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES原材料检验项目")
public class MesRawMaterialInspectItem implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "检验项目名称", width = 22)
private String inspectItemName;
@Excel(name = "英文名称", width = 22)
private String inspectItemNameEn;
@Excel(name = "单位", width = 12)
private String unitName;
@Excel(name = "标记", width = 15)
private String itemMark;
@Excel(name = "试验标准编号", width = 18)
private String testStandardNo;
@Excel(name = "备注", width = 25)
private String remark;
private Integer tenantId;
private String sysOrgCode;
private String createBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String updateBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private Integer delFlag;
}

74
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectStd.java Normal file
View File

@@ -0,0 +1,74 @@
package org.jeecg.modules.mes.material.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@Data
@TableName("mes_raw_material_inspect_std")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES原材料检验标准")
public class MesRawMaterialInspectStd implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "标准编号", width = 18)
private String standardNo;
private String mixerMaterialId;
@Excel(name = "物料名称", width = 22)
private String materialName;
@Excel(name = "物料描述", width = 28)
private String materialDesc;
@Excel(name = "种类", width = 20)
private String materialKind;
@Excel(name = "版本", width = 12)
private String versionNo;
@Excel(name = "发行编号", width = 15)
private String issueNo;
@Excel(name = "版本状态", width = 12)
private String versionStatus;
@Excel(name = "启用", width = 8)
private Integer enableFlag;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生效日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
private Date effectiveDate;
private Integer tenantId;
private String sysOrgCode;
private String createBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String updateBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private Integer delFlag;
}

54
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectStdLine.java Normal file
View File

@@ -0,0 +1,54 @@
package org.jeecg.modules.mes.material.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@Data
@TableName("mes_raw_material_inspect_std_line")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES原材料检验标准-检验项明细")
public class MesRawMaterialInspectStdLine implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
private String stdId;
private String inspectItemId;
private String inspectItemName;
private BigDecimal allowMin;
private Integer includeMinFlag;
private BigDecimal allowMax;
private Integer includeMaxFlag;
private Integer sortNo;
private String createBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String updateBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

6
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/mapper/MesRawMaterialInspectItemMapper.java Normal file
View File

@@ -0,0 +1,6 @@
package org.jeecg.modules.mes.material.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectItem;
public interface MesRawMaterialInspectItemMapper extends BaseMapper<MesRawMaterialInspectItem> {}

6
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/mapper/MesRawMaterialInspectStdLineMapper.java Normal file
View File

@@ -0,0 +1,6 @@
package org.jeecg.modules.mes.material.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine;
public interface MesRawMaterialInspectStdLineMapper extends BaseMapper<MesRawMaterialInspectStdLine> {}

6
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/mapper/MesRawMaterialInspectStdMapper.java Normal file
View File

@@ -0,0 +1,6 @@
package org.jeecg.modules.mes.material.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd;
public interface MesRawMaterialInspectStdMapper extends BaseMapper<MesRawMaterialInspectStd> {}

6
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/IMesRawMaterialInspectItemService.java Normal file
View File

@@ -0,0 +1,6 @@
package org.jeecg.modules.mes.material.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectItem;
public interface IMesRawMaterialInspectItemService extends IService<MesRawMaterialInspectItem> {}

23
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/IMesRawMaterialInspectStdService.java Normal file
View File

@@ -0,0 +1,23 @@
package org.jeecg.modules.mes.material.service;
import com.baomidou.mybatisplus.extension.service.IService;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine;
public interface IMesRawMaterialInspectStdService extends IService<MesRawMaterialInspectStd> {
void saveMain(MesRawMaterialInspectStd main, List<MesRawMaterialInspectStdLine> lineList);
void updateMain(MesRawMaterialInspectStd main, List<MesRawMaterialInspectStdLine> lineList);
void delMain(String id);
void delBatchMain(Collection<? extends Serializable> idList);
List<MesRawMaterialInspectStdLine> selectLinesByStdId(String stdId);
void setEnable(String id, int enableFlag);
}

12
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/impl/MesRawMaterialInspectItemServiceImpl.java Normal file
View File

@@ -0,0 +1,12 @@
package org.jeecg.modules.mes.material.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectItem;
import org.jeecg.modules.mes.material.mapper.MesRawMaterialInspectItemMapper;
import org.jeecg.modules.mes.material.service.IMesRawMaterialInspectItemService;
import org.springframework.stereotype.Service;
@Service
public class MesRawMaterialInspectItemServiceImpl
extends ServiceImpl<MesRawMaterialInspectItemMapper, MesRawMaterialInspectItem>
implements IMesRawMaterialInspectItemService {}

121
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/impl/MesRawMaterialInspectStdServiceImpl.java Normal file
View File

@@ -0,0 +1,121 @@
package org.jeecg.modules.mes.material.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectItem;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine;
import org.jeecg.modules.mes.material.mapper.MesRawMaterialInspectStdLineMapper;
import org.jeecg.modules.mes.material.mapper.MesRawMaterialInspectStdMapper;
import org.jeecg.modules.mes.material.service.IMesRawMaterialInspectItemService;
import org.jeecg.modules.mes.material.service.IMesRawMaterialInspectStdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@Service
public class MesRawMaterialInspectStdServiceImpl extends ServiceImpl<MesRawMaterialInspectStdMapper, MesRawMaterialInspectStd>
implements IMesRawMaterialInspectStdService {
@Autowired private MesRawMaterialInspectStdLineMapper mesRawMaterialInspectStdLineMapper;
@Autowired private IMesRawMaterialInspectItemService mesRawMaterialInspectItemService;
@Override
@Transactional(rollbackFor = Exception.class)
public void saveMain(MesRawMaterialInspectStd main, List<MesRawMaterialInspectStdLine> lineList) {
if (main.getEnableFlag() == null) {
main.setEnableFlag(0);
}
this.save(main);
insertLines(main.getId(), lineList);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMain(MesRawMaterialInspectStd main, List<MesRawMaterialInspectStdLine> lineList) {
this.updateById(main);
mesRawMaterialInspectStdLineMapper.delete(
new LambdaQueryWrapper<MesRawMaterialInspectStdLine>().eq(MesRawMaterialInspectStdLine::getStdId, main.getId()));
insertLines(main.getId(), lineList);
}
private void insertLines(String stdId, List<MesRawMaterialInspectStdLine> lineList) {
if (CollectionUtils.isEmpty(lineList)) {
return;
}
int sort = 0;
for (MesRawMaterialInspectStdLine line : lineList) {
line.setId(null);
line.setStdId(stdId);
if (line.getIncludeMinFlag() == null) {
line.setIncludeMinFlag(0);
}
if (line.getIncludeMaxFlag() == null) {
line.setIncludeMaxFlag(0);
}
line.setSortNo(sort++);
fillInspectItemName(line);
mesRawMaterialInspectStdLineMapper.insert(line);
}
}
private void fillInspectItemName(MesRawMaterialInspectStdLine line) {
if (StringUtils.isBlank(line.getInspectItemId())) {
return;
}
if (StringUtils.isNotBlank(line.getInspectItemName())) {
return;
}
MesRawMaterialInspectItem item = mesRawMaterialInspectItemService.getById(line.getInspectItemId());
if (item != null) {
line.setInspectItemName(item.getInspectItemName());
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delMain(String id) {
mesRawMaterialInspectStdLineMapper.delete(
new LambdaQueryWrapper<MesRawMaterialInspectStdLine>().eq(MesRawMaterialInspectStdLine::getStdId, id));
this.removeById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delBatchMain(Collection<? extends Serializable> idList) {
for (Serializable id : idList) {
delMain(id.toString());
}
}
@Override
public List<MesRawMaterialInspectStdLine> selectLinesByStdId(String stdId) {
return mesRawMaterialInspectStdLineMapper.selectList(
new LambdaQueryWrapper<MesRawMaterialInspectStdLine>()
.eq(MesRawMaterialInspectStdLine::getStdId, stdId)
.orderByAsc(MesRawMaterialInspectStdLine::getSortNo));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void setEnable(String id, int enableFlag) {
MesRawMaterialInspectStd entity = this.getById(id);
if (entity == null) {
return;
}
if (enableFlag == 1) {
entity.setEnableFlag(1);
entity.setEffectiveDate(new Date());
} else {
entity.setEnableFlag(0);
entity.setEffectiveDate(null);
}
this.updateById(entity);
}
}

14
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/vo/MesRawMaterialInspectStdPage.java Normal file
View File

@@ -0,0 +1,14 @@
package org.jeecg.modules.mes.material.vo;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd;
import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine;
@Data
@EqualsAndHashCode(callSuper = true)
public class MesRawMaterialInspectStdPage extends MesRawMaterialInspectStd {
private List<MesRawMaterialInspectStdLine> lineList;
}