update 初始化配方信息
parent
651c9b4d0a
commit
789c27cc87
@ -0,0 +1,117 @@
|
||||
package org.dromara.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeInfoBo;
|
||||
import org.dromara.mes.service.IProdRecipeInfoService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 配方-基础信息
|
||||
* 前端访问路由地址为:/mes/recipeInfo
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/recipeInfo")
|
||||
public class ProdRecipeInfoController extends BaseController {
|
||||
|
||||
private final IProdRecipeInfoService prodRecipeInfoService;
|
||||
|
||||
/**
|
||||
* 查询配方-基础信息列表
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdRecipeInfoVo> list(ProdRecipeInfoBo bo, PageQuery pageQuery) {
|
||||
return prodRecipeInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出配方-基础信息列表
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeInfo:export")
|
||||
@Log(title = "配方-基础信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdRecipeInfoBo bo, HttpServletResponse response) {
|
||||
List<ProdRecipeInfoVo> list = prodRecipeInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "配方-基础信息", ProdRecipeInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配方-基础信息详细信息
|
||||
*
|
||||
* @param recipeId 主键
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeInfo:query")
|
||||
@GetMapping("/{recipeId}")
|
||||
public R<ProdRecipeInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long recipeId) {
|
||||
return R.ok(prodRecipeInfoService.queryById(recipeId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增配方-基础信息
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeInfo:add")
|
||||
@Log(title = "配方-基础信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdRecipeInfoBo bo) {
|
||||
return toAjax(prodRecipeInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改配方-基础信息
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeInfo:edit")
|
||||
@Log(title = "配方-基础信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdRecipeInfoBo bo) {
|
||||
return toAjax(prodRecipeInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除配方-基础信息
|
||||
*
|
||||
* @param recipeIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeInfo:remove")
|
||||
@Log(title = "配方-基础信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{recipeIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] recipeIds) {
|
||||
return toAjax(prodRecipeInfoService.deleteWithValidByIds(List.of(recipeIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询配方-基础信息列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getProdRecipeInfoList")
|
||||
public R<List<ProdRecipeInfoVo>> getProdRecipeInfoList(ProdRecipeInfoBo bo) {
|
||||
List<ProdRecipeInfoVo> list = prodRecipeInfoService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,117 @@
|
||||
package org.dromara.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeMixingVo;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeMixingBo;
|
||||
import org.dromara.mes.service.IProdRecipeMixingService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 配方混炼信息
|
||||
* 前端访问路由地址为:/mes/recipeMixing
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/recipeMixing")
|
||||
public class ProdRecipeMixingController extends BaseController {
|
||||
|
||||
private final IProdRecipeMixingService prodRecipeMixingService;
|
||||
|
||||
/**
|
||||
* 查询配方混炼信息列表
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeMixing:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdRecipeMixingVo> list(ProdRecipeMixingBo bo, PageQuery pageQuery) {
|
||||
return prodRecipeMixingService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出配方混炼信息列表
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeMixing:export")
|
||||
@Log(title = "配方混炼信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdRecipeMixingBo bo, HttpServletResponse response) {
|
||||
List<ProdRecipeMixingVo> list = prodRecipeMixingService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "配方混炼信息", ProdRecipeMixingVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配方混炼信息详细信息
|
||||
*
|
||||
* @param mixingId 主键
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeMixing:query")
|
||||
@GetMapping("/{mixingId}")
|
||||
public R<ProdRecipeMixingVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long mixingId) {
|
||||
return R.ok(prodRecipeMixingService.queryById(mixingId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增配方混炼信息
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeMixing:add")
|
||||
@Log(title = "配方混炼信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdRecipeMixingBo bo) {
|
||||
return toAjax(prodRecipeMixingService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改配方混炼信息
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeMixing:edit")
|
||||
@Log(title = "配方混炼信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdRecipeMixingBo bo) {
|
||||
return toAjax(prodRecipeMixingService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除配方混炼信息
|
||||
*
|
||||
* @param mixingIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeMixing:remove")
|
||||
@Log(title = "配方混炼信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{mixingIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] mixingIds) {
|
||||
return toAjax(prodRecipeMixingService.deleteWithValidByIds(List.of(mixingIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询配方混炼信息列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getProdRecipeMixingList")
|
||||
public R<List<ProdRecipeMixingVo>> getProdRecipeMixingList(ProdRecipeMixingBo bo) {
|
||||
List<ProdRecipeMixingVo> list = prodRecipeMixingService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,117 @@
|
||||
package org.dromara.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeWeightVo;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeWeightBo;
|
||||
import org.dromara.mes.service.IProdRecipeWeightService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 配方称量信息
|
||||
* 前端访问路由地址为:/mes/recipeWeight
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/recipeWeight")
|
||||
public class ProdRecipeWeightController extends BaseController {
|
||||
|
||||
private final IProdRecipeWeightService prodRecipeWeightService;
|
||||
|
||||
/**
|
||||
* 查询配方称量信息列表
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeWeight:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdRecipeWeightVo> list(ProdRecipeWeightBo bo, PageQuery pageQuery) {
|
||||
return prodRecipeWeightService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出配方称量信息列表
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeWeight:export")
|
||||
@Log(title = "配方称量信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdRecipeWeightBo bo, HttpServletResponse response) {
|
||||
List<ProdRecipeWeightVo> list = prodRecipeWeightService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "配方称量信息", ProdRecipeWeightVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配方称量信息详细信息
|
||||
*
|
||||
* @param weightId 主键
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeWeight:query")
|
||||
@GetMapping("/{weightId}")
|
||||
public R<ProdRecipeWeightVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long weightId) {
|
||||
return R.ok(prodRecipeWeightService.queryById(weightId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增配方称量信息
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeWeight:add")
|
||||
@Log(title = "配方称量信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdRecipeWeightBo bo) {
|
||||
return toAjax(prodRecipeWeightService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改配方称量信息
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeWeight:edit")
|
||||
@Log(title = "配方称量信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdRecipeWeightBo bo) {
|
||||
return toAjax(prodRecipeWeightService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除配方称量信息
|
||||
*
|
||||
* @param weightIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("mes:recipeWeight:remove")
|
||||
@Log(title = "配方称量信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{weightIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] weightIds) {
|
||||
return toAjax(prodRecipeWeightService.deleteWithValidByIds(List.of(weightIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询配方称量信息列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getProdRecipeWeightList")
|
||||
public R<List<ProdRecipeWeightVo>> getProdRecipeWeightList(ProdRecipeWeightBo bo) {
|
||||
List<ProdRecipeWeightVo> list = prodRecipeWeightService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,136 @@
|
||||
package org.dromara.mes.domain.bo;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeMixing;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 配方混炼信息业务对象 prod_recipe_mixing
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = ProdRecipeMixing.class, reverseConvertGenerate = false)
|
||||
public class ProdRecipeMixingBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键标识
|
||||
*/
|
||||
private Long mixingId;
|
||||
|
||||
/**
|
||||
* 配方ID
|
||||
*/
|
||||
@NotNull(message = "配方ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long recipeId;
|
||||
|
||||
/**
|
||||
* 混炼序号
|
||||
*/
|
||||
private Long mixId;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
private Long edtCode;
|
||||
|
||||
/**
|
||||
* 条件编码
|
||||
*/
|
||||
private String condCode;
|
||||
|
||||
/**
|
||||
* 混炼时间
|
||||
*/
|
||||
private Long mixingTime;
|
||||
|
||||
/**
|
||||
* 混炼温度
|
||||
*/
|
||||
private BigDecimal mixingTemp;
|
||||
|
||||
/**
|
||||
* 混炼能量
|
||||
*/
|
||||
private BigDecimal mixingEnergy;
|
||||
|
||||
/**
|
||||
* 混炼功率
|
||||
*/
|
||||
private BigDecimal mixingPower;
|
||||
|
||||
/**
|
||||
* 混炼压力
|
||||
*/
|
||||
private BigDecimal mixingPress;
|
||||
|
||||
/**
|
||||
* 混炼转速
|
||||
*/
|
||||
private Long mixingSpeed;
|
||||
|
||||
/**
|
||||
* 动作编码
|
||||
*/
|
||||
private String actCode;
|
||||
|
||||
/**
|
||||
* 父级编码
|
||||
*/
|
||||
private String fatherCode;
|
||||
|
||||
/**
|
||||
* 子级编码
|
||||
*/
|
||||
private String childCode;
|
||||
|
||||
/**
|
||||
* 工步编码
|
||||
*/
|
||||
private String termCode;
|
||||
|
||||
/**
|
||||
* 设定时间
|
||||
*/
|
||||
private Long setTime;
|
||||
|
||||
/**
|
||||
* 设定温度
|
||||
*/
|
||||
private Long setTemp;
|
||||
|
||||
/**
|
||||
* 设定能量
|
||||
*/
|
||||
private BigDecimal setEnergy;
|
||||
|
||||
/**
|
||||
* 设定功率
|
||||
*/
|
||||
private BigDecimal setPower;
|
||||
|
||||
/**
|
||||
* 设定压力
|
||||
*/
|
||||
private BigDecimal setPres;
|
||||
|
||||
/**
|
||||
* 设定转速
|
||||
*/
|
||||
private Long setRota;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,115 @@
|
||||
package org.dromara.mes.domain.bo;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeWeight;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 配方称量信息业务对象 prod_recipe_weight
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = ProdRecipeWeight.class, reverseConvertGenerate = false)
|
||||
public class ProdRecipeWeightBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键标识
|
||||
*/
|
||||
@NotNull(message = "主键标识不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long weightId;
|
||||
|
||||
/**
|
||||
* 配方ID
|
||||
*/
|
||||
@NotNull(message = "配方ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long recipeId;
|
||||
|
||||
/**
|
||||
* 称量序号
|
||||
*/
|
||||
@NotNull(message = "称量序号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long weightSeq;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@NotNull(message = "机台ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
@NotNull(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long edtCode;
|
||||
|
||||
/**
|
||||
* 称量类型
|
||||
*/
|
||||
@NotBlank(message = "称量类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String weightType;
|
||||
|
||||
/**
|
||||
* 秤编码
|
||||
*/
|
||||
@NotNull(message = "秤编码不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long scaleCode;
|
||||
|
||||
/**
|
||||
* 动作编码
|
||||
*/
|
||||
@NotBlank(message = "动作编码不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String actCode;
|
||||
|
||||
/**
|
||||
* 设定重量
|
||||
*/
|
||||
@NotNull(message = "设定重量不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private BigDecimal setWeight;
|
||||
|
||||
/**
|
||||
* 误差允许
|
||||
*/
|
||||
@NotNull(message = "误差允许不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private BigDecimal errorAllow;
|
||||
|
||||
/**
|
||||
* 父级编码
|
||||
*/
|
||||
@NotBlank(message = "父级编码不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String fatherCode;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
@NotNull(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long unitId;
|
||||
|
||||
/**
|
||||
* 子级编码
|
||||
*/
|
||||
@NotBlank(message = "子级编码不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String childCode;
|
||||
|
||||
/**
|
||||
* 是否使用批次
|
||||
*/
|
||||
@NotBlank(message = "是否使用批次不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String ifUseBat;
|
||||
|
||||
/**
|
||||
* 最大比例
|
||||
*/
|
||||
@NotBlank(message = "最大比例不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String maxRate;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,165 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import org.dromara.mes.domain.ProdRecipeMixing;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 配方混炼信息视图对象 prod_recipe_mixing
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = ProdRecipeMixing.class)
|
||||
public class ProdRecipeMixingVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键标识
|
||||
*/
|
||||
@ExcelProperty(value = "主键标识")
|
||||
private Long mixingId;
|
||||
|
||||
/**
|
||||
* 配方ID
|
||||
*/
|
||||
@ExcelProperty(value = "配方ID")
|
||||
private Long recipeId;
|
||||
|
||||
/**
|
||||
* 混炼序号
|
||||
*/
|
||||
@ExcelProperty(value = "混炼序号")
|
||||
private Long mixId;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@ExcelProperty(value = "机台ID")
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
@ExcelProperty(value = "版本号")
|
||||
private Long edtCode;
|
||||
|
||||
/**
|
||||
* 条件编码
|
||||
*/
|
||||
@ExcelProperty(value = "条件编码")
|
||||
private String condCode;
|
||||
|
||||
/**
|
||||
* 混炼时间
|
||||
*/
|
||||
@ExcelProperty(value = "混炼时间")
|
||||
private Long mixingTime;
|
||||
|
||||
/**
|
||||
* 混炼温度
|
||||
*/
|
||||
@ExcelProperty(value = "混炼温度")
|
||||
private BigDecimal mixingTemp;
|
||||
|
||||
/**
|
||||
* 混炼能量
|
||||
*/
|
||||
@ExcelProperty(value = "混炼能量")
|
||||
private BigDecimal mixingEnergy;
|
||||
|
||||
/**
|
||||
* 混炼功率
|
||||
*/
|
||||
@ExcelProperty(value = "混炼功率")
|
||||
private BigDecimal mixingPower;
|
||||
|
||||
/**
|
||||
* 混炼压力
|
||||
*/
|
||||
@ExcelProperty(value = "混炼压力")
|
||||
private BigDecimal mixingPress;
|
||||
|
||||
/**
|
||||
* 混炼转速
|
||||
*/
|
||||
@ExcelProperty(value = "混炼转速")
|
||||
private Long mixingSpeed;
|
||||
|
||||
/**
|
||||
* 动作编码
|
||||
*/
|
||||
@ExcelProperty(value = "动作编码")
|
||||
private String actCode;
|
||||
|
||||
/**
|
||||
* 父级编码
|
||||
*/
|
||||
@ExcelProperty(value = "父级编码")
|
||||
private String fatherCode;
|
||||
|
||||
/**
|
||||
* 子级编码
|
||||
*/
|
||||
@ExcelProperty(value = "子级编码")
|
||||
private String childCode;
|
||||
|
||||
/**
|
||||
* 工步编码
|
||||
*/
|
||||
@ExcelProperty(value = "工步编码")
|
||||
private String termCode;
|
||||
|
||||
/**
|
||||
* 设定时间
|
||||
*/
|
||||
@ExcelProperty(value = "设定时间")
|
||||
private Long setTime;
|
||||
|
||||
/**
|
||||
* 设定温度
|
||||
*/
|
||||
@ExcelProperty(value = "设定温度")
|
||||
private Long setTemp;
|
||||
|
||||
/**
|
||||
* 设定能量
|
||||
*/
|
||||
@ExcelProperty(value = "设定能量")
|
||||
private BigDecimal setEnergy;
|
||||
|
||||
/**
|
||||
* 设定功率
|
||||
*/
|
||||
@ExcelProperty(value = "设定功率")
|
||||
private BigDecimal setPower;
|
||||
|
||||
/**
|
||||
* 设定压力
|
||||
*/
|
||||
@ExcelProperty(value = "设定压力")
|
||||
private BigDecimal setPres;
|
||||
|
||||
/**
|
||||
* 设定转速
|
||||
*/
|
||||
@ExcelProperty(value = "设定转速")
|
||||
private Long setRota;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,123 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import org.dromara.mes.domain.ProdRecipeWeight;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 配方称量信息视图对象 prod_recipe_weight
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = ProdRecipeWeight.class)
|
||||
public class ProdRecipeWeightVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键标识
|
||||
*/
|
||||
@ExcelProperty(value = "主键标识")
|
||||
private Long weightId;
|
||||
|
||||
/**
|
||||
* 配方ID
|
||||
*/
|
||||
@ExcelProperty(value = "配方ID")
|
||||
private Long recipeId;
|
||||
|
||||
/**
|
||||
* 称量序号
|
||||
*/
|
||||
@ExcelProperty(value = "称量序号")
|
||||
private Long weightSeq;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@ExcelProperty(value = "机台ID")
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
@ExcelProperty(value = "版本号")
|
||||
private Long edtCode;
|
||||
|
||||
/**
|
||||
* 称量类型
|
||||
*/
|
||||
@ExcelProperty(value = "称量类型")
|
||||
private String weightType;
|
||||
|
||||
/**
|
||||
* 秤编码
|
||||
*/
|
||||
@ExcelProperty(value = "秤编码")
|
||||
private Long scaleCode;
|
||||
|
||||
/**
|
||||
* 动作编码
|
||||
*/
|
||||
@ExcelProperty(value = "动作编码")
|
||||
private String actCode;
|
||||
|
||||
/**
|
||||
* 设定重量
|
||||
*/
|
||||
@ExcelProperty(value = "设定重量")
|
||||
private BigDecimal setWeight;
|
||||
|
||||
/**
|
||||
* 误差允许
|
||||
*/
|
||||
@ExcelProperty(value = "误差允许")
|
||||
private BigDecimal errorAllow;
|
||||
|
||||
/**
|
||||
* 父级编码
|
||||
*/
|
||||
@ExcelProperty(value = "父级编码")
|
||||
private String fatherCode;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
@ExcelProperty(value = "单位")
|
||||
private Long unitId;
|
||||
|
||||
/**
|
||||
* 子级编码
|
||||
*/
|
||||
@ExcelProperty(value = "子级编码")
|
||||
private String childCode;
|
||||
|
||||
/**
|
||||
* 是否使用批次
|
||||
*/
|
||||
@ExcelProperty(value = "是否使用批次")
|
||||
private String ifUseBat;
|
||||
|
||||
/**
|
||||
* 最大比例
|
||||
*/
|
||||
@ExcelProperty(value = "最大比例")
|
||||
private String maxRate;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeInfo;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 配方-基础信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
public interface ProdRecipeInfoMapper extends BaseMapperPlus<ProdRecipeInfo, ProdRecipeInfoVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeMixing;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeMixingVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 配方混炼信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
public interface ProdRecipeMixingMapper extends BaseMapperPlus<ProdRecipeMixing, ProdRecipeMixingVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeWeight;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeWeightVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 配方称量信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
public interface ProdRecipeWeightMapper extends BaseMapperPlus<ProdRecipeWeight, ProdRecipeWeightVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeInfo;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeInfoBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 配方-基础信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
public interface IProdRecipeInfoService {
|
||||
|
||||
/**
|
||||
* 查询配方-基础信息
|
||||
*
|
||||
* @param recipeId 主键
|
||||
* @return 配方-基础信息
|
||||
*/
|
||||
ProdRecipeInfoVo queryById(Long recipeId);
|
||||
|
||||
/**
|
||||
* 分页查询配方-基础信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 配方-基础信息分页列表
|
||||
*/
|
||||
TableDataInfo<ProdRecipeInfoVo> queryPageList(ProdRecipeInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的配方-基础信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 配方-基础信息列表
|
||||
*/
|
||||
List<ProdRecipeInfoVo> queryList(ProdRecipeInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增配方-基础信息
|
||||
*
|
||||
* @param bo 配方-基础信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdRecipeInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改配方-基础信息
|
||||
*
|
||||
* @param bo 配方-基础信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdRecipeInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除配方-基础信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeMixing;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeMixingVo;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeMixingBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 配方混炼信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
public interface IProdRecipeMixingService {
|
||||
|
||||
/**
|
||||
* 查询配方混炼信息
|
||||
*
|
||||
* @param mixingId 主键
|
||||
* @return 配方混炼信息
|
||||
*/
|
||||
ProdRecipeMixingVo queryById(Long mixingId);
|
||||
|
||||
/**
|
||||
* 分页查询配方混炼信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 配方混炼信息分页列表
|
||||
*/
|
||||
TableDataInfo<ProdRecipeMixingVo> queryPageList(ProdRecipeMixingBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的配方混炼信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 配方混炼信息列表
|
||||
*/
|
||||
List<ProdRecipeMixingVo> queryList(ProdRecipeMixingBo bo);
|
||||
|
||||
/**
|
||||
* 新增配方混炼信息
|
||||
*
|
||||
* @param bo 配方混炼信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdRecipeMixingBo bo);
|
||||
|
||||
/**
|
||||
* 修改配方混炼信息
|
||||
*
|
||||
* @param bo 配方混炼信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdRecipeMixingBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除配方混炼信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
import org.dromara.mes.domain.ProdRecipeWeight;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeWeightVo;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeWeightBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 配方称量信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
public interface IProdRecipeWeightService {
|
||||
|
||||
/**
|
||||
* 查询配方称量信息
|
||||
*
|
||||
* @param weightId 主键
|
||||
* @return 配方称量信息
|
||||
*/
|
||||
ProdRecipeWeightVo queryById(Long weightId);
|
||||
|
||||
/**
|
||||
* 分页查询配方称量信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 配方称量信息分页列表
|
||||
*/
|
||||
TableDataInfo<ProdRecipeWeightVo> queryPageList(ProdRecipeWeightBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的配方称量信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 配方称量信息列表
|
||||
*/
|
||||
List<ProdRecipeWeightVo> queryList(ProdRecipeWeightBo bo);
|
||||
|
||||
/**
|
||||
* 新增配方称量信息
|
||||
*
|
||||
* @param bo 配方称量信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdRecipeWeightBo bo);
|
||||
|
||||
/**
|
||||
* 修改配方称量信息
|
||||
*
|
||||
* @param bo 配方称量信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdRecipeWeightBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除配方称量信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,192 @@
|
||||
package org.dromara.mes.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeInfoBo;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
|
||||
import org.dromara.mes.domain.ProdRecipeInfo;
|
||||
import org.dromara.mes.mapper.ProdRecipeInfoMapper;
|
||||
import org.dromara.mes.service.IProdRecipeInfoService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 配方-基础信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdRecipeInfoServiceImpl implements IProdRecipeInfoService {
|
||||
|
||||
private final ProdRecipeInfoMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询配方-基础信息
|
||||
*
|
||||
* @param recipeId 主键
|
||||
* @return 配方-基础信息
|
||||
*/
|
||||
@Override
|
||||
public ProdRecipeInfoVo queryById(Long recipeId){
|
||||
return baseMapper.selectVoById(recipeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询配方-基础信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 配方-基础信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdRecipeInfoVo> queryPageList(ProdRecipeInfoBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdRecipeInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdRecipeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的配方-基础信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 配方-基础信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdRecipeInfoVo> queryList(ProdRecipeInfoBo bo) {
|
||||
MPJLambdaWrapper<ProdRecipeInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdRecipeInfo> buildQueryWrapper(ProdRecipeInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdRecipeInfo> lqw = JoinWrappers.lambda(ProdRecipeInfo.class)
|
||||
.selectAll(ProdRecipeInfo.class)
|
||||
.eq(bo.getRecipeId() != null, ProdRecipeInfo::getRecipeId, bo.getRecipeId())
|
||||
.eq(bo.getMachineId() != null, ProdRecipeInfo::getMachineId, bo.getMachineId())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialId()), ProdRecipeInfo::getMaterialId, bo.getMaterialId())
|
||||
.eq(bo.getEdtCode() != null, ProdRecipeInfo::getEdtCode, bo.getEdtCode())
|
||||
.eq(bo.getRecipeType() != null, ProdRecipeInfo::getRecipeType, bo.getRecipeType())
|
||||
.eq(StringUtils.isNotBlank(bo.getUserEdtCode()), ProdRecipeInfo::getUserEdtCode, bo.getUserEdtCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getRecipeState()), ProdRecipeInfo::getRecipeState, bo.getRecipeState())
|
||||
.eq(bo.getDoneTime() != null, ProdRecipeInfo::getDoneTime, bo.getDoneTime())
|
||||
.eq(bo.getShelfNum() != null, ProdRecipeInfo::getShelfNum, bo.getShelfNum())
|
||||
.eq(bo.getTotalWeight() != null, ProdRecipeInfo::getTotalWeight, bo.getTotalWeight())
|
||||
.eq(bo.getFillCoefficient() != null, ProdRecipeInfo::getFillCoefficient, bo.getFillCoefficient())
|
||||
.eq(StringUtils.isNotBlank(bo.getCbRecycleType()), ProdRecipeInfo::getCbRecycleType, bo.getCbRecycleType())
|
||||
.eq(bo.getCbRecycleTime() != null, ProdRecipeInfo::getCbRecycleTime, bo.getCbRecycleTime())
|
||||
.eq(bo.getOvertempMintime() != null, ProdRecipeInfo::getOvertempMintime, bo.getOvertempMintime())
|
||||
.eq(bo.getOvertimeTime() != null, ProdRecipeInfo::getOvertimeTime, bo.getOvertimeTime())
|
||||
.eq(bo.getOvertempTemp() != null, ProdRecipeInfo::getOvertempTemp, bo.getOvertempTemp())
|
||||
.eq(bo.getMaxInpolytemp() != null, ProdRecipeInfo::getMaxInpolytemp, bo.getMaxInpolytemp())
|
||||
.eq(bo.getMinInpolytemp() != null, ProdRecipeInfo::getMinInpolytemp, bo.getMinInpolytemp())
|
||||
.eq(bo.getInPolytime() != null, ProdRecipeInfo::getInPolytime, bo.getInPolytime())
|
||||
.eq(bo.getInCarbontime() != null, ProdRecipeInfo::getInCarbontime, bo.getInCarbontime())
|
||||
.eq(bo.getInOiltime() != null, ProdRecipeInfo::getInOiltime, bo.getInOiltime())
|
||||
.eq(bo.getInPowdertime() != null, ProdRecipeInfo::getInPowdertime, bo.getInPowdertime())
|
||||
.eq(bo.getRollSpeeddiff() != null, ProdRecipeInfo::getRollSpeeddiff, bo.getRollSpeeddiff())
|
||||
.eq(bo.getRamPressdiff() != null, ProdRecipeInfo::getRamPressdiff, bo.getRamPressdiff())
|
||||
.eq(StringUtils.isNotBlank(bo.getIsUseareatemp()), ProdRecipeInfo::getIsUseareatemp, bo.getIsUseareatemp())
|
||||
.eq(bo.getSideTemp() != null, ProdRecipeInfo::getSideTemp, bo.getSideTemp())
|
||||
.eq(bo.getSideTempdiff() != null, ProdRecipeInfo::getSideTempdiff, bo.getSideTempdiff())
|
||||
.eq(bo.getRollTemp() != null, ProdRecipeInfo::getRollTemp, bo.getRollTemp())
|
||||
.eq(bo.getRollTempdiff() != null, ProdRecipeInfo::getRollTempdiff, bo.getRollTempdiff())
|
||||
.eq(bo.getDdoorTemp() != null, ProdRecipeInfo::getDdoorTemp, bo.getDdoorTemp())
|
||||
.eq(bo.getDdoorTempdiff() != null, ProdRecipeInfo::getDdoorTempdiff, bo.getDdoorTempdiff())
|
||||
.eq(StringUtils.isNotBlank(bo.getOperCode()), ProdRecipeInfo::getOperCode, bo.getOperCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getMemNote()), ProdRecipeInfo::getMemNote, bo.getMemNote())
|
||||
.eq(StringUtils.isNotBlank(bo.getRecipeCode()), ProdRecipeInfo::getRecipeCode, bo.getRecipeCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getStartDatetime()), ProdRecipeInfo::getStartDatetime, bo.getStartDatetime())
|
||||
.eq(StringUtils.isNotBlank(bo.getEndDatetime()), ProdRecipeInfo::getEndDatetime, bo.getEndDatetime())
|
||||
.eq(StringUtils.isNotBlank(bo.getEquipPrior()), ProdRecipeInfo::getEquipPrior, bo.getEquipPrior())
|
||||
.eq(StringUtils.isNotBlank(bo.getRecipeTypecode()), ProdRecipeInfo::getRecipeTypecode, bo.getRecipeTypecode())
|
||||
.eq(StringUtils.isNotBlank(bo.getRubTypecode()), ProdRecipeInfo::getRubTypecode, bo.getRubTypecode())
|
||||
.eq(StringUtils.isNotBlank(bo.getRubType()), ProdRecipeInfo::getRubType, bo.getRubType())
|
||||
.eq(StringUtils.isNotBlank(bo.getMkindCode()), ProdRecipeInfo::getMkindCode, bo.getMkindCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getIkindCode()), ProdRecipeInfo::getIkindCode, bo.getIkindCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getConglRang()), ProdRecipeInfo::getConglRang, bo.getConglRang())
|
||||
.eq(bo.getSdsTemp() != null, ProdRecipeInfo::getSdsTemp, bo.getSdsTemp())
|
||||
.eq(bo.getMiniTime() != null, ProdRecipeInfo::getMiniTime, bo.getMiniTime())
|
||||
.eq(StringUtils.isNotBlank(bo.getAuditFlag()), ProdRecipeInfo::getAuditFlag, bo.getAuditFlag())
|
||||
.like(bo.getAuditName() != null, ProdRecipeInfo::getAuditName, bo.getAuditName())
|
||||
.eq(bo.getAuditDate() != null, ProdRecipeInfo::getAuditDate, bo.getAuditDate())
|
||||
.eq(StringUtils.isNotBlank(bo.getRecipeDic()), ProdRecipeInfo::getRecipeDic, bo.getRecipeDic())
|
||||
.eq(bo.getStayTime() != null, ProdRecipeInfo::getStayTime, bo.getStayTime())
|
||||
.eq(StringUtils.isNotBlank(bo.getRearchCode()), ProdRecipeInfo::getRearchCode, bo.getRearchCode())
|
||||
.eq(bo.getBlackReuse() != null, ProdRecipeInfo::getBlackReuse, bo.getBlackReuse())
|
||||
.eq(bo.getReuseTime() != null, ProdRecipeInfo::getReuseTime, bo.getReuseTime())
|
||||
.eq(bo.getExpireTime() != null, ProdRecipeInfo::getExpireTime, bo.getExpireTime())
|
||||
.eq(bo.getOverTemp() != null, ProdRecipeInfo::getOverTemp, bo.getOverTemp())
|
||||
.eq(bo.getMaxTemp() != null, ProdRecipeInfo::getMaxTemp, bo.getMaxTemp())
|
||||
.eq(bo.getMinTemp() != null, ProdRecipeInfo::getMinTemp, bo.getMinTemp())
|
||||
.eq(StringUtils.isNotBlank(bo.getIfNot()), ProdRecipeInfo::getIfNot, bo.getIfNot())
|
||||
.eq(bo.getZzTemp() != null, ProdRecipeInfo::getZzTemp, bo.getZzTemp())
|
||||
.eq(bo.getXlmTemp() != null, ProdRecipeInfo::getXlmTemp, bo.getXlmTemp())
|
||||
.eq(bo.getPjcontrl() != null, ProdRecipeInfo::getPjcontrl, bo.getPjcontrl())
|
||||
.orderByDesc(ProdRecipeInfo::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增配方-基础信息
|
||||
*
|
||||
* @param bo 配方-基础信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdRecipeInfoBo bo) {
|
||||
ProdRecipeInfo add = MapstructUtils.convert(bo, ProdRecipeInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setRecipeId(add.getRecipeId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改配方-基础信息
|
||||
*
|
||||
* @param bo 配方-基础信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdRecipeInfoBo bo) {
|
||||
ProdRecipeInfo update = MapstructUtils.convert(bo, ProdRecipeInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdRecipeInfo entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除配方-基础信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,153 @@
|
||||
package org.dromara.mes.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeMixingBo;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeMixingVo;
|
||||
import org.dromara.mes.domain.ProdRecipeMixing;
|
||||
import org.dromara.mes.mapper.ProdRecipeMixingMapper;
|
||||
import org.dromara.mes.service.IProdRecipeMixingService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 配方混炼信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdRecipeMixingServiceImpl implements IProdRecipeMixingService {
|
||||
|
||||
private final ProdRecipeMixingMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询配方混炼信息
|
||||
*
|
||||
* @param mixingId 主键
|
||||
* @return 配方混炼信息
|
||||
*/
|
||||
@Override
|
||||
public ProdRecipeMixingVo queryById(Long mixingId){
|
||||
return baseMapper.selectVoById(mixingId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询配方混炼信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 配方混炼信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdRecipeMixingVo> queryPageList(ProdRecipeMixingBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdRecipeMixing> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdRecipeMixingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的配方混炼信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 配方混炼信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdRecipeMixingVo> queryList(ProdRecipeMixingBo bo) {
|
||||
MPJLambdaWrapper<ProdRecipeMixing> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdRecipeMixing> buildQueryWrapper(ProdRecipeMixingBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdRecipeMixing> lqw = JoinWrappers.lambda(ProdRecipeMixing.class)
|
||||
.selectAll(ProdRecipeMixing.class)
|
||||
.eq(bo.getMixingId() != null, ProdRecipeMixing::getMixingId, bo.getMixingId())
|
||||
.eq(bo.getRecipeId() != null, ProdRecipeMixing::getRecipeId, bo.getRecipeId())
|
||||
.eq(bo.getMixId() != null, ProdRecipeMixing::getMixId, bo.getMixId())
|
||||
.eq(bo.getMachineId() != null, ProdRecipeMixing::getMachineId, bo.getMachineId())
|
||||
.eq(bo.getEdtCode() != null, ProdRecipeMixing::getEdtCode, bo.getEdtCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getCondCode()), ProdRecipeMixing::getCondCode, bo.getCondCode())
|
||||
.eq(bo.getMixingTime() != null, ProdRecipeMixing::getMixingTime, bo.getMixingTime())
|
||||
.eq(bo.getMixingTemp() != null, ProdRecipeMixing::getMixingTemp, bo.getMixingTemp())
|
||||
.eq(bo.getMixingEnergy() != null, ProdRecipeMixing::getMixingEnergy, bo.getMixingEnergy())
|
||||
.eq(bo.getMixingPower() != null, ProdRecipeMixing::getMixingPower, bo.getMixingPower())
|
||||
.eq(bo.getMixingPress() != null, ProdRecipeMixing::getMixingPress, bo.getMixingPress())
|
||||
.eq(bo.getMixingSpeed() != null, ProdRecipeMixing::getMixingSpeed, bo.getMixingSpeed())
|
||||
.eq(StringUtils.isNotBlank(bo.getActCode()), ProdRecipeMixing::getActCode, bo.getActCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getFatherCode()), ProdRecipeMixing::getFatherCode, bo.getFatherCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getChildCode()), ProdRecipeMixing::getChildCode, bo.getChildCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getTermCode()), ProdRecipeMixing::getTermCode, bo.getTermCode())
|
||||
.eq(bo.getSetTime() != null, ProdRecipeMixing::getSetTime, bo.getSetTime())
|
||||
.eq(bo.getSetTemp() != null, ProdRecipeMixing::getSetTemp, bo.getSetTemp())
|
||||
.eq(bo.getSetEnergy() != null, ProdRecipeMixing::getSetEnergy, bo.getSetEnergy())
|
||||
.eq(bo.getSetPower() != null, ProdRecipeMixing::getSetPower, bo.getSetPower())
|
||||
.eq(bo.getSetPres() != null, ProdRecipeMixing::getSetPres, bo.getSetPres())
|
||||
.eq(bo.getSetRota() != null, ProdRecipeMixing::getSetRota, bo.getSetRota())
|
||||
.orderByDesc(ProdRecipeMixing::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增配方混炼信息
|
||||
*
|
||||
* @param bo 配方混炼信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdRecipeMixingBo bo) {
|
||||
ProdRecipeMixing add = MapstructUtils.convert(bo, ProdRecipeMixing.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setMixingId(add.getMixingId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改配方混炼信息
|
||||
*
|
||||
* @param bo 配方混炼信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdRecipeMixingBo bo) {
|
||||
ProdRecipeMixing update = MapstructUtils.convert(bo, ProdRecipeMixing.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdRecipeMixing entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除配方混炼信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,146 @@
|
||||
package org.dromara.mes.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.mes.domain.bo.ProdRecipeWeightBo;
|
||||
import org.dromara.mes.domain.vo.ProdRecipeWeightVo;
|
||||
import org.dromara.mes.domain.ProdRecipeWeight;
|
||||
import org.dromara.mes.mapper.ProdRecipeWeightMapper;
|
||||
import org.dromara.mes.service.IProdRecipeWeightService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 配方称量信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2026-02-10
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdRecipeWeightServiceImpl implements IProdRecipeWeightService {
|
||||
|
||||
private final ProdRecipeWeightMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询配方称量信息
|
||||
*
|
||||
* @param weightId 主键
|
||||
* @return 配方称量信息
|
||||
*/
|
||||
@Override
|
||||
public ProdRecipeWeightVo queryById(Long weightId){
|
||||
return baseMapper.selectVoById(weightId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询配方称量信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 配方称量信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdRecipeWeightVo> queryPageList(ProdRecipeWeightBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdRecipeWeight> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdRecipeWeightVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的配方称量信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 配方称量信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdRecipeWeightVo> queryList(ProdRecipeWeightBo bo) {
|
||||
MPJLambdaWrapper<ProdRecipeWeight> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdRecipeWeight> buildQueryWrapper(ProdRecipeWeightBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdRecipeWeight> lqw = JoinWrappers.lambda(ProdRecipeWeight.class)
|
||||
.selectAll(ProdRecipeWeight.class)
|
||||
.eq(bo.getWeightId() != null, ProdRecipeWeight::getWeightId, bo.getWeightId())
|
||||
.eq(bo.getRecipeId() != null, ProdRecipeWeight::getRecipeId, bo.getRecipeId())
|
||||
.eq(bo.getWeightSeq() != null, ProdRecipeWeight::getWeightSeq, bo.getWeightSeq())
|
||||
.eq(bo.getMachineId() != null, ProdRecipeWeight::getMachineId, bo.getMachineId())
|
||||
.eq(bo.getEdtCode() != null, ProdRecipeWeight::getEdtCode, bo.getEdtCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getWeightType()), ProdRecipeWeight::getWeightType, bo.getWeightType())
|
||||
.eq(bo.getScaleCode() != null, ProdRecipeWeight::getScaleCode, bo.getScaleCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getActCode()), ProdRecipeWeight::getActCode, bo.getActCode())
|
||||
.eq(bo.getSetWeight() != null, ProdRecipeWeight::getSetWeight, bo.getSetWeight())
|
||||
.eq(bo.getErrorAllow() != null, ProdRecipeWeight::getErrorAllow, bo.getErrorAllow())
|
||||
.eq(StringUtils.isNotBlank(bo.getFatherCode()), ProdRecipeWeight::getFatherCode, bo.getFatherCode())
|
||||
.eq(bo.getUnitId() != null, ProdRecipeWeight::getUnitId, bo.getUnitId())
|
||||
.eq(StringUtils.isNotBlank(bo.getChildCode()), ProdRecipeWeight::getChildCode, bo.getChildCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getIfUseBat()), ProdRecipeWeight::getIfUseBat, bo.getIfUseBat())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaxRate()), ProdRecipeWeight::getMaxRate, bo.getMaxRate())
|
||||
.orderByDesc(ProdRecipeWeight::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增配方称量信息
|
||||
*
|
||||
* @param bo 配方称量信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdRecipeWeightBo bo) {
|
||||
ProdRecipeWeight add = MapstructUtils.convert(bo, ProdRecipeWeight.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setWeightId(add.getWeightId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改配方称量信息
|
||||
*
|
||||
* @param bo 配方称量信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdRecipeWeightBo bo) {
|
||||
ProdRecipeWeight update = MapstructUtils.convert(bo, ProdRecipeWeight.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdRecipeWeight entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除配方称量信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.mes.mapper.ProdRecipeInfoMapper">
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.mes.mapper.ProdRecipeMixingMapper">
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.mes.mapper.ProdRecipeWeightMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue