diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerMaterialSubstituteController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerMaterialSubstituteController.java new file mode 100644 index 0000000..e09cccf --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerMaterialSubstituteController.java @@ -0,0 +1,172 @@ +package org.jeecg.modules.xslmes.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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 java.util.HashMap; +import java.util.Map; +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.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.mes.material.entity.MesMixerMaterial; +import org.jeecg.modules.mes.material.service.IMesMixerMaterialService; +import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute; +import org.jeecg.modules.xslmes.service.IMesXslMixerMaterialSubstituteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +/** + * MES 密炼物料替代对应关系 + */ +@Tag(name = "MES密炼物料替代对应关系") +@RestController +@RequestMapping("/xslmes/mesXslMixerMaterialSubstitute") +@Slf4j +public class MesXslMixerMaterialSubstituteController + extends JeecgController { + + @Autowired + private IMesXslMixerMaterialSubstituteService mesXslMixerMaterialSubstituteService; + + @Autowired + private IMesMixerMaterialService mesMixerMaterialService; + + @Operation(summary = "MES密炼物料替代对应关系-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList( + MesXslMixerMaterialSubstitute model, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + customeRuleMap.put("mixerMaterialId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("substituteMaterialId", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = + QueryGenerator.initQueryWrapper(model, req.getParameterMap(), customeRuleMap); + queryWrapper.orderByAsc("serial_no"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = mesXslMixerMaterialSubstituteService.page(page, queryWrapper); + return Result.OK(pageList); + } + + @AutoLog(value = "MES密炼物料替代对应关系-添加") + @Operation(summary = "MES密炼物料替代对应关系-添加") + @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:add") + @PostMapping(value = "/add") + public Result add(@RequestBody MesXslMixerMaterialSubstitute model) { + //update-begin---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】保存前校验与物料冗余回填----------- + String err = validateAndFillMaterials(model, false); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】保存前校验与物料冗余回填----------- + mesXslMixerMaterialSubstituteService.saveWithSerialNo(model); + return Result.OK("添加成功!"); + } + + @AutoLog(value = "MES密炼物料替代对应关系-编辑") + @Operation(summary = "MES密炼物料替代对应关系-编辑") + @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody MesXslMixerMaterialSubstitute model) { + //update-begin---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】保存前校验与物料冗余回填----------- + String err = validateAndFillMaterials(model, true); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】保存前校验与物料冗余回填----------- + mesXslMixerMaterialSubstituteService.updateById(model); + return Result.OK("编辑成功!"); + } + + @AutoLog(value = "MES密炼物料替代对应关系-删除") + @Operation(summary = "MES密炼物料替代对应关系-通过id删除") + @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + mesXslMixerMaterialSubstituteService.removeById(id); + return Result.OK("删除成功!"); + } + + @AutoLog(value = "MES密炼物料替代对应关系-批量删除") + @Operation(summary = "MES密炼物料替代对应关系-批量删除") + @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + mesXslMixerMaterialSubstituteService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + @Operation(summary = "MES密炼物料替代对应关系-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + MesXslMixerMaterialSubstitute entity = mesXslMixerMaterialSubstituteService.getById(id); + if (entity == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(entity); + } + + @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MesXslMixerMaterialSubstitute model) { + return super.exportXls(request, model, MesXslMixerMaterialSubstitute.class, "密炼物料替代对应关系"); + } + + @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, MesXslMixerMaterialSubstitute.class); + } + + //update-begin---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】保存前校验与物料冗余回填----------- + private String validateAndFillMaterials(MesXslMixerMaterialSubstitute model, boolean isUpdate) { + if (oConvertUtils.isEmpty(model.getMixerMaterialId())) { + return "请选择密炼物料"; + } + if (oConvertUtils.isEmpty(model.getSubstituteMaterialId())) { + return "请选择替代密炼物料"; + } + if (model.getMixerMaterialId().equals(model.getSubstituteMaterialId())) { + return "密炼物料与替代密炼物料不能相同"; + } + + MesMixerMaterial mixerMaterial = mesMixerMaterialService.getById(model.getMixerMaterialId()); + if (mixerMaterial == null) { + return "所选密炼物料不存在,请重新选择"; + } + MesMixerMaterial substituteMaterial = mesMixerMaterialService.getById(model.getSubstituteMaterialId()); + if (substituteMaterial == null) { + return "所选替代密炼物料不存在,请重新选择"; + } + + model.setMixerMaterialCode(mixerMaterial.getMaterialCode()); + model.setMixerMaterialName(mixerMaterial.getMaterialName()); + model.setSubstituteMaterialCode(substituteMaterial.getMaterialCode()); + model.setSubstituteMaterialName(substituteMaterial.getMaterialName()); + + LambdaQueryWrapper dupQw = new LambdaQueryWrapper<>(); + dupQw.eq(MesXslMixerMaterialSubstitute::getMixerMaterialId, model.getMixerMaterialId()) + .eq(MesXslMixerMaterialSubstitute::getSubstituteMaterialId, model.getSubstituteMaterialId()); + if (isUpdate && oConvertUtils.isNotEmpty(model.getId())) { + dupQw.ne(MesXslMixerMaterialSubstitute::getId, model.getId()); + } + if (mesXslMixerMaterialSubstituteService.count(dupQw) > 0) { + return "该密炼物料与替代密炼物料的对应关系已存在"; + } + return null; + } + //update-end---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】保存前校验与物料冗余回填----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java new file mode 100644 index 0000000..36030fa --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java @@ -0,0 +1,181 @@ +package org.jeecg.modules.xslmes.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.math.BigDecimal; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +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.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.mes.material.entity.MesMaterial; +import org.jeecg.modules.mes.material.service.IMesMaterialService; +import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam; +import org.jeecg.modules.xslmes.service.IMesXslOpenMillParamService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +/** + * MES 开炼机参数维护 + */ +@Tag(name = "MES开炼机参数维护") +@RestController +@RequestMapping("/xslmes/mesXslOpenMillParam") +@Slf4j +public class MesXslOpenMillParamController extends JeecgController { + + @Autowired + private IMesXslOpenMillParamService mesXslOpenMillParamService; + + @Autowired + private IMesMaterialService mesMaterialService; + + @Operation(summary = "MES开炼机参数维护-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList( + MesXslOpenMillParam model, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + customeRuleMap.put("materialId", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = + QueryGenerator.initQueryWrapper(model, req.getParameterMap(), customeRuleMap); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = mesXslOpenMillParamService.page(page, queryWrapper); + return Result.OK(pageList); + } + + @AutoLog(value = "MES开炼机参数维护-添加") + @Operation(summary = "MES开炼机参数维护-添加") + @RequiresPermissions("xslmes:mes_xsl_open_mill_param:add") + @PostMapping(value = "/add") + public Result add(@RequestBody MesXslOpenMillParam model) { + //update-begin---author:jiangxh ---date:20260520 for:【开炼机参数维护】保存前校验与胶料冗余回填----------- + String err = validateAndFillMaterial(model); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260520 for:【开炼机参数维护】保存前校验与胶料冗余回填----------- + mesXslOpenMillParamService.save(model); + return Result.OK("添加成功!"); + } + + @AutoLog(value = "MES开炼机参数维护-编辑") + @Operation(summary = "MES开炼机参数维护-编辑") + @RequiresPermissions("xslmes:mes_xsl_open_mill_param:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody MesXslOpenMillParam model) { + //update-begin---author:jiangxh ---date:20260520 for:【开炼机参数维护】保存前校验与胶料冗余回填----------- + String err = validateAndFillMaterial(model); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260520 for:【开炼机参数维护】保存前校验与胶料冗余回填----------- + mesXslOpenMillParamService.updateById(model); + return Result.OK("编辑成功!"); + } + + @AutoLog(value = "MES开炼机参数维护-删除") + @Operation(summary = "MES开炼机参数维护-通过id删除") + @RequiresPermissions("xslmes:mes_xsl_open_mill_param:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + mesXslOpenMillParamService.removeById(id); + return Result.OK("删除成功!"); + } + + @AutoLog(value = "MES开炼机参数维护-批量删除") + @Operation(summary = "MES开炼机参数维护-批量删除") + @RequiresPermissions("xslmes:mes_xsl_open_mill_param:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + mesXslOpenMillParamService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + @Operation(summary = "MES开炼机参数维护-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + MesXslOpenMillParam entity = mesXslOpenMillParamService.getById(id); + if (entity == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(entity); + } + + @RequiresPermissions("xslmes:mes_xsl_open_mill_param:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MesXslOpenMillParam model) { + return super.exportXls(request, model, MesXslOpenMillParam.class, "开炼机参数维护"); + } + + @RequiresPermissions("xslmes:mes_xsl_open_mill_param:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, MesXslOpenMillParam.class); + } + + //update-begin---author:jiangxh ---date:20260520 for:【开炼机参数维护】保存前校验与胶料冗余回填----------- + private String validateAndFillMaterial(MesXslOpenMillParam model) { + if (oConvertUtils.isEmpty(model.getMaterialId())) { + return "请选择胶料"; + } + MesMaterial material = mesMaterialService.getById(model.getMaterialId()); + if (material == null) { + return "所选胶料不存在,请重新选择"; + } + model.setMaterialName(material.getMaterialName()); + model.setMaterialCode(material.getMaterialCode()); + String timeErr = validateTimeFields(model); + if (timeErr != null) { + return timeErr; + } + return null; + } + + private String validateTimeFields(MesXslOpenMillParam model) { + if (isNegative(model.getR0FeedTime())) { + return "R0进胶时间不能为负数"; + } + if (isNegative(model.getR0RingTime())) { + return "R0成环时间不能为负数"; + } + if (isNegative(model.getR0BreakTime())) { + return "R0拉断时间不能为负数"; + } + if (isNegative(model.getR0DischargeTime())) { + return "R0排胶时间不能为负数"; + } + if (isNegative(model.getR1FeedTime())) { + return "R1进胶时间不能为负数"; + } + if (isNegative(model.getR1RingTime())) { + return "R1成环时间不能为负数"; + } + if (isNegative(model.getR1BreakTime())) { + return "R1拉断时间不能为负数"; + } + if (isNegative(model.getR1DischargeTime())) { + return "R1排胶时间不能为负数"; + } + return null; + } + + private static boolean isNegative(BigDecimal value) { + return value != null && value.compareTo(BigDecimal.ZERO) < 0; + } + //update-end---author:jiangxh ---date:20260520 for:【开炼机参数维护】保存前校验与胶料冗余回填----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixerMaterialSubstitute.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixerMaterialSubstitute.java new file mode 100644 index 0000000..542aa58 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixerMaterialSubstitute.java @@ -0,0 +1,82 @@ +package org.jeecg.modules.xslmes.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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * MES 密炼物料替代对应关系 + */ +@Data +@TableName("mes_xsl_mixer_material_substitute") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description = "MES密炼物料替代对应关系") +public class MesXslMixerMaterialSubstitute implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + @Excel(name = "编号", width = 10) + @Schema(description = "编号(租户内自动累加,从1开始)") + private Integer serialNo; + + @Excel(name = "密炼物料ID", width = 15, dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id") + @Dict(dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id") + @Schema(description = "密炼物料ID(关联 mes_mixer_material.id)") + private String mixerMaterialId; + + @Excel(name = "密炼物料编码", width = 15) + @Schema(description = "密炼物料编码冗余") + private String mixerMaterialCode; + + @Excel(name = "密炼物料名称", width = 20) + @Schema(description = "密炼物料名称冗余") + private String mixerMaterialName; + + @Excel(name = "替代密炼物料ID", width = 15, dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id") + @Dict(dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id") + @Schema(description = "替代密炼物料ID(关联 mes_mixer_material.id)") + private String substituteMaterialId; + + @Excel(name = "替代密炼物料编码", width = 15) + @Schema(description = "替代密炼物料编码冗余") + private String substituteMaterialCode; + + @Excel(name = "替代密炼物料名称", width = 20) + @Schema(description = "替代密炼物料名称冗余") + private String substituteMaterialName; + + @Excel(name = "创建人", width = 15) + private String createBy; + + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @Excel(name = "修改人", width = 15) + 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; + + @Schema(description = "租户ID") + private Integer tenantId; + + private String sysOrgCode; + private Integer delFlag; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java new file mode 100644 index 0000000..44b6d53 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java @@ -0,0 +1,98 @@ +package org.jeecg.modules.xslmes.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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * MES 开炼机参数维护 + */ +@Data +@TableName("mes_xsl_open_mill_param") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description = "MES开炼机参数维护") +public class MesXslOpenMillParam implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + @Excel(name = "胶料ID", width = 15, dictTable = "mes_material", dicText = "material_name", dicCode = "id") + @Dict(dictTable = "mes_material", dicText = "material_name", dicCode = "id") + @Schema(description = "胶料ID(关联 mes_material.id)") + private String materialId; + + @Excel(name = "胶料名称", width = 20) + @Schema(description = "胶料名称冗余") + private String materialName; + + @Excel(name = "胶料编码", width = 15) + @Schema(description = "胶料编码冗余") + private String materialCode; + + @Excel(name = "R0进胶时间(秒)", width = 14) + @Schema(description = "R0进胶时间(秒)") + private BigDecimal r0FeedTime; + + @Excel(name = "R0成环时间(秒)", width = 14) + @Schema(description = "R0成环时间(秒)") + private BigDecimal r0RingTime; + + @Excel(name = "R0拉断时间(秒)", width = 14) + @Schema(description = "R0拉断时间(秒)") + private BigDecimal r0BreakTime; + + @Excel(name = "R0排胶时间(秒)", width = 14) + @Schema(description = "R0排胶时间(秒)") + private BigDecimal r0DischargeTime; + + @Excel(name = "R1进胶时间(秒)", width = 14) + @Schema(description = "R1进胶时间(秒)") + private BigDecimal r1FeedTime; + + @Excel(name = "R1成环时间(秒)", width = 14) + @Schema(description = "R1成环时间(秒)") + private BigDecimal r1RingTime; + + @Excel(name = "R1拉断时间(秒)", width = 14) + @Schema(description = "R1拉断时间(秒)") + private BigDecimal r1BreakTime; + + @Excel(name = "R1排胶时间(秒)", width = 14) + @Schema(description = "R1排胶时间(秒)") + private BigDecimal r1DischargeTime; + + @Excel(name = "创建人", width = 15) + private String createBy; + + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @Excel(name = "修改人", width = 15) + 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; + + @Schema(description = "租户ID") + private Integer tenantId; + + private String sysOrgCode; + private Integer delFlag; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslMixerMaterialSubstituteMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslMixerMaterialSubstituteMapper.java new file mode 100644 index 0000000..c46a295 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslMixerMaterialSubstituteMapper.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.xslmes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute; + +/** + * MES 密炼物料替代对应关系 Mapper + */ +@Mapper +public interface MesXslMixerMaterialSubstituteMapper extends BaseMapper { + + //update-begin---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】查询租户内最大编号----------- + @Select("SELECT IFNULL(MAX(serial_no), 0) FROM mes_xsl_mixer_material_substitute " + + "WHERE del_flag = 0 AND (#{tenantId} IS NULL OR tenant_id = #{tenantId})") + Integer selectMaxSerialNo(@Param("tenantId") Integer tenantId); + //update-end---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】查询租户内最大编号----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslOpenMillParamMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslOpenMillParamMapper.java new file mode 100644 index 0000000..a5409b7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslOpenMillParamMapper.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.xslmes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam; + +/** + * MES 开炼机参数维护 Mapper + */ +@Mapper +public interface MesXslOpenMillParamMapper extends BaseMapper { +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/xml/MesXslOpenMillParamMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/xml/MesXslOpenMillParamMapper.xml new file mode 100644 index 0000000..e617a81 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/xml/MesXslOpenMillParamMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerMaterialSubstituteService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerMaterialSubstituteService.java new file mode 100644 index 0000000..9f803a7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerMaterialSubstituteService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.xslmes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute; + +/** + * MES 密炼物料替代对应关系 + */ +public interface IMesXslMixerMaterialSubstituteService extends IService { + + //update-begin---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】新增时分配编号----------- + /** + * 新增保存(自动分配租户内递增编号) + */ + boolean saveWithSerialNo(MesXslMixerMaterialSubstitute entity); + //update-end---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】新增时分配编号----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslOpenMillParamService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslOpenMillParamService.java new file mode 100644 index 0000000..6202ae1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslOpenMillParamService.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.xslmes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam; + +/** + * MES 开炼机参数维护 + */ +public interface IMesXslOpenMillParamService extends IService { +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerMaterialSubstituteServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerMaterialSubstituteServiceImpl.java new file mode 100644 index 0000000..c17a562 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerMaterialSubstituteServiceImpl.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.xslmes.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute; +import org.jeecg.modules.xslmes.mapper.MesXslMixerMaterialSubstituteMapper; +import org.jeecg.modules.xslmes.service.IMesXslMixerMaterialSubstituteService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * MES 密炼物料替代对应关系 + */ +@Service +public class MesXslMixerMaterialSubstituteServiceImpl + extends ServiceImpl + implements IMesXslMixerMaterialSubstituteService { + + //update-begin---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】新增时分配编号----------- + @Override + @Transactional(rollbackFor = Exception.class) + public boolean saveWithSerialNo(MesXslMixerMaterialSubstitute entity) { + if (entity.getSerialNo() == null) { + Integer maxSerial = baseMapper.selectMaxSerialNo(entity.getTenantId()); + entity.setSerialNo(maxSerial == null ? 1 : maxSerial + 1); + } + return save(entity); + } + //update-end---author:jiangxh ---date:20260520 for:【密炼物料替代对应关系】新增时分配编号----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslOpenMillParamServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslOpenMillParamServiceImpl.java new file mode 100644 index 0000000..a642078 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslOpenMillParamServiceImpl.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.xslmes.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam; +import org.jeecg.modules.xslmes.mapper.MesXslOpenMillParamMapper; +import org.jeecg.modules.xslmes.service.IMesXslOpenMillParamService; +import org.springframework.stereotype.Service; + +/** + * MES 开炼机参数维护 + */ +@Service +public class MesXslOpenMillParamServiceImpl extends ServiceImpl + implements IMesXslOpenMillParamService { +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_76__mes_mixer_engineering_root_menu.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_76__mes_mixer_engineering_root_menu.sql new file mode 100644 index 0000000..0dd3df7 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_76__mes_mixer_engineering_root_menu.sql @@ -0,0 +1,27 @@ +-- 一级菜单:MES密炼工程(目录;子菜单可后续挂接) +SET NAMES utf8mb4; + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) +SELECT '1900000000000000800', '', 'MES密炼工程', '/xslmesMixerEngineering', 'layouts/RouteView', 1, 'MesMixerEngineeringRoot', NULL, 0, NULL, '0', 82.00, 0, 'ant-design:experiment-outlined', 0, 0, 0, 0, 'MES 密炼工程(一级目录,子菜单可后续挂接或从系统管理中调整)', 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0 +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `sys_permission` + WHERE `id` = '1900000000000000800' + OR (`del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES密炼工程' AND IFNULL(`parent_id`, '') = '') +); + +-- admin 角色授权(幂等) +INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.id, '1900000000000000800', NULL, NOW(), '127.0.0.1' +FROM `sys_role` r +WHERE r.`role_code` = 'admin' + AND EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000800') + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.id AND rp.`permission_id` = '1900000000000000800' + ); + +-- 目录有子菜单时 is_leaf 必须为 0(幂等修正) +UPDATE `sys_permission` +SET `is_leaf` = 0, `component` = 'layouts/RouteView', `menu_type` = 0, `update_time` = NOW() +WHERE `id` = '1900000000000000800' AND `del_flag` = 0; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_77__mes_tech_energy_root_menu.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_77__mes_tech_energy_root_menu.sql new file mode 100644 index 0000000..1eca3c9 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_77__mes_tech_energy_root_menu.sql @@ -0,0 +1,49 @@ +-- 一级菜单:MES技术管理、MES能源管理(目录;子菜单可后续挂接) +SET NAMES utf8mb4; + +-- MES技术管理 +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) +SELECT '1900000000000000810', '', 'MES技术管理', '/xslmesTechManagement', 'layouts/RouteView', 1, 'MesTechManagementRoot', NULL, 0, NULL, '0', 82.50, 0, 'ant-design:tool-outlined', 0, 0, 0, 0, 'MES 技术管理(一级目录,子菜单可后续挂接或从系统管理中调整)', 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0 +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `sys_permission` + WHERE `id` = '1900000000000000810' + OR (`del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES技术管理' AND IFNULL(`parent_id`, '') = '') +); + +-- MES能源管理 +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) +SELECT '1900000000000000820', '', 'MES能源管理', '/xslmesEnergyManagement', 'layouts/RouteView', 1, 'MesEnergyManagementRoot', NULL, 0, NULL, '0', 83.00, 0, 'ant-design:thunderbolt-outlined', 0, 0, 0, 0, 'MES 能源管理(一级目录,子菜单可后续挂接或从系统管理中调整)', 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0 +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `sys_permission` + WHERE `id` = '1900000000000000820' + OR (`del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES能源管理' AND IFNULL(`parent_id`, '') = '') +); + +-- admin 角色授权:MES技术管理(幂等) +INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.id, '1900000000000000810', NULL, NOW(), '127.0.0.1' +FROM `sys_role` r +WHERE r.`role_code` = 'admin' + AND EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000810') + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.id AND rp.`permission_id` = '1900000000000000810' + ); + +-- admin 角色授权:MES能源管理(幂等) +INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.id, '1900000000000000820', NULL, NOW(), '127.0.0.1' +FROM `sys_role` r +WHERE r.`role_code` = 'admin' + AND EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000820') + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.id AND rp.`permission_id` = '1900000000000000820' + ); + +-- 目录有子菜单时 is_leaf 必须为 0(幂等修正) +UPDATE `sys_permission` +SET `is_leaf` = 0, `component` = 'layouts/RouteView', `menu_type` = 0, `update_time` = NOW() +WHERE `id` IN ('1900000000000000810', '1900000000000000820') AND `del_flag` = 0; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_open_mill_param.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_open_mill_param.sql new file mode 100644 index 0000000..d369e4f --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_open_mill_param.sql @@ -0,0 +1,96 @@ +-- 开炼机参数维护:建表 + 菜单(挂 MES技术管理)+ admin 授权 +SET NAMES utf8mb4; + +CREATE TABLE IF NOT EXISTS `mes_xsl_open_mill_param` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `material_id` varchar(32) NOT NULL COMMENT '胶料ID(关联 mes_material.id)', + `material_name` varchar(200) DEFAULT NULL COMMENT '胶料名称冗余', + `material_code` varchar(100) DEFAULT NULL COMMENT '胶料编码冗余', + `r0_feed_time` decimal(10,2) DEFAULT NULL COMMENT 'R0进胶时间(秒)', + `r0_ring_time` decimal(10,2) DEFAULT NULL COMMENT 'R0成环时间(秒)', + `r0_break_time` decimal(10,2) DEFAULT NULL COMMENT 'R0拉断时间(秒)', + `r0_discharge_time` decimal(10,2) DEFAULT NULL COMMENT 'R0排胶时间(秒)', + `r1_feed_time` decimal(10,2) DEFAULT NULL COMMENT 'R1进胶时间(秒)', + `r1_ring_time` decimal(10,2) DEFAULT NULL COMMENT 'R1成环时间(秒)', + `r1_break_time` decimal(10,2) DEFAULT NULL COMMENT 'R1拉断时间(秒)', + `r1_discharge_time` decimal(10,2) DEFAULT NULL COMMENT 'R1排胶时间(秒)', + `tenant_id` int DEFAULT NULL COMMENT '租户ID', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `del_flag` int NOT NULL DEFAULT 0 COMMENT '逻辑删除(0正常 1已删除)', + PRIMARY KEY (`id`), + KEY `idx_momp_material_id` (`material_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES开炼机参数维护'; + +-- 父级目录有子菜单时必须 is_leaf=0,否则菜单管理树/侧边栏不会展开子节点 +UPDATE `sys_permission` +SET `is_leaf` = 0, `update_time` = NOW() +WHERE `id` = '1900000000000000810' AND `is_leaf` = 1; + +-- 二级菜单:开炼机参数维护(父级 MES技术管理 1900000000000000810) +INSERT INTO `sys_permission` ( + `id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, + `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, + `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, + `del_flag`, `rule_flag`, `status`, `internal_or_external` +) +SELECT + '177925970995501', '1900000000000000810', '开炼机参数维护', '/xslmes/mesXslOpenMillParam', + 'xslmes/mesXslOpenMillParam/MesXslOpenMillParamList', 1, 'MesXslOpenMillParamList', NULL, + 1, NULL, '0', 1.00, 0, 'ant-design:setting-outlined', 0, 1, + 0, 0, 'MES开炼机参数维护', 'admin', NOW(), 'admin', NOW(), + 0, 0, '1', 0 +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `sys_permission` + WHERE `id` = '177925970995501' + OR (`del_flag` = 0 AND `menu_type` = 1 AND `name` = '开炼机参数维护' AND `parent_id` = '1900000000000000810') +); + +-- 按钮权限 +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995502', '177925970995501', '新增', 2, 'xslmes:mes_xsl_open_mill_param:add', '1', 1.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995502'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995503', '177925970995501', '编辑', 2, 'xslmes:mes_xsl_open_mill_param:edit', '1', 2.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995503'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995504', '177925970995501', '删除', 2, 'xslmes:mes_xsl_open_mill_param:delete', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995504'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995505', '177925970995501', '批量删除', 2, 'xslmes:mes_xsl_open_mill_param:deleteBatch', '1', 4.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995505'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995506', '177925970995501', '导出', 2, 'xslmes:mes_xsl_open_mill_param:exportXls', '1', 5.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995506'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995507', '177925970995501', '导入', 2, 'xslmes:mes_xsl_open_mill_param:importExcel', '1', 6.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995507'); + +-- admin 角色授权 +INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`role_code` = 'admin' + AND p.`id` IN ( + '177925970995501', + '177925970995502', + '177925970995503', + '177925970995504', + '177925970995505', + '177925970995506', + '177925970995507' + ) + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id + ); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_79__mes_root_menu_is_leaf_fix.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_79__mes_root_menu_is_leaf_fix.sql new file mode 100644 index 0000000..2771652 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_79__mes_root_menu_is_leaf_fix.sql @@ -0,0 +1,12 @@ +-- 修复 MES 一级目录菜单:目录节点 is_leaf 必须为 0,否则侧边栏/菜单管理树无法展开子菜单 +SET NAMES utf8mb4; + +UPDATE `sys_permission` +SET + `is_leaf` = 0, + `component` = 'layouts/RouteView', + `menu_type` = 0, + `update_by` = 'admin', + `update_time` = NOW() +WHERE `id` IN ('1900000000000000800', '1900000000000000810', '1900000000000000820') + AND `del_flag` = 0; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_80__mes_xsl_rubber_material_category.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_80__mes_xsl_rubber_material_category.sql new file mode 100644 index 0000000..97d37a4 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_80__mes_xsl_rubber_material_category.sql @@ -0,0 +1,130 @@ +-- MES胶料分类(分类字典 sys_category) +-- 前端 JCategorySelect 使用 pcode = XSLMES_RUBBER +SET NAMES utf8mb4; + +-- 根节点:MES胶料分类 +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000001', '0', 'MES胶料分类', 'XSLMES_RUBBER', '1', 'admin', NOW() +FROM DUAL +WHERE NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER'); + +-- 胶料类别(叶子节点,顺序与业务下拉一致) +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000101', root.`id`, '胎面胶', 'XSLMES_RUBBER_TMJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_TMJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000102', root.`id`, '包布胶', 'XSLMES_RUBBER_BBJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_BBJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000103', root.`id`, '子口胶片', 'XSLMES_RUBBER_ZKKJP', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_ZKKJP'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000104', root.`id`, '三角胶', 'XSLMES_RUBBER_SJJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_SJJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000105', root.`id`, '带束层胶', 'XSLMES_RUBBER_DSJC', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_DSJC'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000106', root.`id`, '输送带胶', 'XSLMES_RUBBER_SSDJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_SSDJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000107', root.`id`, '胶糊胶', 'XSLMES_RUBBER_JHJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_JHJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000108', root.`id`, '过渡层', 'XSLMES_RUBBER_GDC', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_GDC'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000109', root.`id`, '终炼返炼', 'XSLMES_RUBBER_ZLFL', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_ZLFL'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000110', root.`id`, '塑炼胶', 'XSLMES_RUBBER_SLJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_SLJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000111', root.`id`, '注射胶', 'XSLMES_RUBBER_ZSJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_ZSJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000112', root.`id`, '胎侧胶', 'XSLMES_RUBBER_TCJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_TCJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000113', root.`id`, '缠绕胶', 'XSLMES_RUBBER_CRJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_CRJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000114', root.`id`, '骨板胶', 'XSLMES_RUBBER_GBJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_GBJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000115', root.`id`, '外层胶', 'XSLMES_RUBBER_WCJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_WCJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000116', root.`id`, '胶芯胶', 'XSLMES_RUBBER_JXJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_JXJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000117', root.`id`, '胶囊胶', 'XSLMES_RUBBER_JNJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_JNJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000118', root.`id`, '冠带条', 'XSLMES_RUBBER_GDT', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_GDT'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000119', root.`id`, '子口耐磨胶', 'XSLMES_RUBBER_ZKNMJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_ZKNMJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000120', root.`id`, '缓冲胶', 'XSLMES_RUBBER_HCJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_HCJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000121', root.`id`, '钢丝胶', 'XSLMES_RUBBER_GSJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_GSJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000122', root.`id`, '出口胎面', 'XSLMES_RUBBER_CKTM', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_CKTM'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000123', root.`id`, '帘线胶', 'XSLMES_RUBBER_LXJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_LXJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000124', root.`id`, '基部胶', 'XSLMES_RUBBER_JBJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_JBJ'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_81__mes_xsl_rubber_material_category_append.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_81__mes_xsl_rubber_material_category_append.sql new file mode 100644 index 0000000..a61765b --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_81__mes_xsl_rubber_material_category_append.sql @@ -0,0 +1,27 @@ +-- MES胶料分类:追加 5 项(已执行 V3.9.2_80 的环境增量脚本) +SET NAMES utf8mb4; + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000120', root.`id`, '缓冲胶', 'XSLMES_RUBBER_HCJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_HCJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000121', root.`id`, '钢丝胶', 'XSLMES_RUBBER_GSJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_GSJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000122', root.`id`, '出口胎面', 'XSLMES_RUBBER_CKTM', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_CKTM'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000123', root.`id`, '帘线胶', 'XSLMES_RUBBER_LXJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_LXJ'); + +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `has_child`, `create_by`, `create_time`) +SELECT '1994000000000000124', root.`id`, '基部胶', 'XSLMES_RUBBER_JBJ', '0', 'admin', NOW() +FROM `sys_category` root WHERE root.`code` = 'XSLMES_RUBBER' + AND NOT EXISTS (SELECT 1 FROM `sys_category` WHERE `code` = 'XSLMES_RUBBER_JBJ'); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_82__mes_xsl_rubber_material_category_name_fix.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_82__mes_xsl_rubber_material_category_name_fix.sql new file mode 100644 index 0000000..1b442e7 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_82__mes_xsl_rubber_material_category_name_fix.sql @@ -0,0 +1,28 @@ +-- 修复 MES胶料分类名称乱码(PowerShell 管道导入时中文被替换成 ?) +SET NAMES utf8mb4; + +UPDATE `sys_category` SET `name` = 'MES胶料分类', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER'; +UPDATE `sys_category` SET `name` = '胎面胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_TMJ'; +UPDATE `sys_category` SET `name` = '包布胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_BBJ'; +UPDATE `sys_category` SET `name` = '子口胶片', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_ZKKJP'; +UPDATE `sys_category` SET `name` = '三角胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_SJJ'; +UPDATE `sys_category` SET `name` = '带束层胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_DSJC'; +UPDATE `sys_category` SET `name` = '输送带胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_SSDJ'; +UPDATE `sys_category` SET `name` = '胶糊胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_JHJ'; +UPDATE `sys_category` SET `name` = '过渡层', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_GDC'; +UPDATE `sys_category` SET `name` = '终炼返炼', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_ZLFL'; +UPDATE `sys_category` SET `name` = '塑炼胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_SLJ'; +UPDATE `sys_category` SET `name` = '注射胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_ZSJ'; +UPDATE `sys_category` SET `name` = '胎侧胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_TCJ'; +UPDATE `sys_category` SET `name` = '缠绕胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_CRJ'; +UPDATE `sys_category` SET `name` = '骨板胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_GBJ'; +UPDATE `sys_category` SET `name` = '外层胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_WCJ'; +UPDATE `sys_category` SET `name` = '胶芯胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_JXJ'; +UPDATE `sys_category` SET `name` = '胶囊胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_JNJ'; +UPDATE `sys_category` SET `name` = '冠带条', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_GDT'; +UPDATE `sys_category` SET `name` = '子口耐磨胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_ZKNMJ'; +UPDATE `sys_category` SET `name` = '缓冲胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_HCJ'; +UPDATE `sys_category` SET `name` = '钢丝胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_GSJ'; +UPDATE `sys_category` SET `name` = '出口胎面', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_CKTM'; +UPDATE `sys_category` SET `name` = '帘线胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_LXJ'; +UPDATE `sys_category` SET `name` = '基部胶', `update_by` = 'admin', `update_time` = NOW() WHERE `code` = 'XSLMES_RUBBER_JBJ'; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_83__mes_xsl_mixer_material_substitute.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_83__mes_xsl_mixer_material_substitute.sql new file mode 100644 index 0000000..0c673bf --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_83__mes_xsl_mixer_material_substitute.sql @@ -0,0 +1,90 @@ +-- 密炼物料替代对应关系:建表 + 菜单(挂 MES技术管理)+ admin 授权 +SET NAMES utf8mb4; + +CREATE TABLE IF NOT EXISTS `mes_xsl_mixer_material_substitute` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `serial_no` int DEFAULT NULL COMMENT '编号(租户内自动累加,从1开始)', + `mixer_material_id` varchar(32) NOT NULL COMMENT '密炼物料ID(关联 mes_mixer_material.id)', + `mixer_material_code` varchar(100) DEFAULT NULL COMMENT '密炼物料编码冗余', + `mixer_material_name` varchar(200) DEFAULT NULL COMMENT '密炼物料名称冗余', + `substitute_material_id` varchar(32) NOT NULL COMMENT '替代密炼物料ID(关联 mes_mixer_material.id)', + `substitute_material_code` varchar(100) DEFAULT NULL COMMENT '替代密炼物料编码冗余', + `substitute_material_name` varchar(200) DEFAULT NULL COMMENT '替代密炼物料名称冗余', + `tenant_id` int DEFAULT NULL COMMENT '租户ID', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `del_flag` int NOT NULL DEFAULT 0 COMMENT '逻辑删除(0正常 1已删除)', + PRIMARY KEY (`id`), + KEY `idx_mxmms_mixer_material_id` (`mixer_material_id`), + KEY `idx_mxmms_substitute_material_id` (`substitute_material_id`), + KEY `idx_mxmms_tenant_serial` (`tenant_id`, `serial_no`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES密炼物料替代对应关系'; + +UPDATE `sys_permission` +SET `is_leaf` = 0, `update_time` = NOW() +WHERE `id` = '1900000000000000810' AND `is_leaf` = 1; + +INSERT INTO `sys_permission` ( + `id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, + `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, + `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, + `del_flag`, `rule_flag`, `status`, `internal_or_external` +) +SELECT + '177925970995511', '1900000000000000810', '密炼物料替代对应关系', '/xslmes/mesXslMixerMaterialSubstitute', + 'xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstituteList', 1, 'MesXslMixerMaterialSubstituteList', NULL, + 1, NULL, '0', 2.00, 0, 'ant-design:swap-outlined', 0, 1, + 0, 0, 'MES密炼物料替代对应关系', 'admin', NOW(), 'admin', NOW(), + 0, 0, '1', 0 +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `sys_permission` + WHERE `id` = '177925970995511' + OR (`del_flag` = 0 AND `menu_type` = 1 AND `name` = '密炼物料替代对应关系' AND `parent_id` = '1900000000000000810') +); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995512', '177925970995511', '新增', 2, 'xslmes:mes_xsl_mixer_material_substitute:add', '1', 1.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995512'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995513', '177925970995511', '编辑', 2, 'xslmes:mes_xsl_mixer_material_substitute:edit', '1', 2.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995513'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995514', '177925970995511', '删除', 2, 'xslmes:mes_xsl_mixer_material_substitute:delete', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995514'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995515', '177925970995511', '批量删除', 2, 'xslmes:mes_xsl_mixer_material_substitute:deleteBatch', '1', 4.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995515'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995516', '177925970995511', '导出', 2, 'xslmes:mes_xsl_mixer_material_substitute:exportXls', '1', 5.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995516'); + +INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +SELECT '177925970995517', '177925970995511', '导入', 2, 'xslmes:mes_xsl_mixer_material_substitute:importExcel', '1', 6.00, 0, 1, 0, '1', 0, 'admin', NOW() +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995517'); + +INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`role_code` = 'admin' + AND p.`id` IN ( + '177925970995511', + '177925970995512', + '177925970995513', + '177925970995514', + '177925970995515', + '177925970995516', + '177925970995517' + ) + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id + ); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_84__mes_xsl_mixer_material_substitute_menu_retry.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_84__mes_xsl_mixer_material_substitute_menu_retry.sql new file mode 100644 index 0000000..1a19957 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_84__mes_xsl_mixer_material_substitute_menu_retry.sql @@ -0,0 +1,52 @@ +-- 密炼物料替代对应关系:菜单补跑脚本(遇 1213 死锁时单独执行) +-- 说明:建表已成功时可只跑本脚本;建议先暂停后端,逐条执行或整段执行一次 +SET NAMES utf8mb4; + +UPDATE `sys_permission` +SET `is_leaf` = 0, `update_time` = NOW() +WHERE `id` = '1900000000000000810'; + +INSERT IGNORE INTO `sys_permission` ( + `id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, + `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, + `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, + `del_flag`, `rule_flag`, `status`, `internal_or_external` +) VALUES ( + '177925970995511', '1900000000000000810', '密炼物料替代对应关系', '/xslmes/mesXslMixerMaterialSubstitute', + 'xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstituteList', 1, 'MesXslMixerMaterialSubstituteList', NULL, + 1, NULL, '0', 2.00, 0, 'ant-design:swap-outlined', 0, 1, + 0, 0, 'MES密炼物料替代对应关系', 'admin', NOW(), 'admin', NOW(), + 0, 0, '1', 0 +); + +INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +VALUES ('177925970995512', '177925970995511', '新增', 2, 'xslmes:mes_xsl_mixer_material_substitute:add', '1', 1.00, 0, 1, 0, '1', 0, 'admin', NOW()); + +INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +VALUES ('177925970995513', '177925970995511', '编辑', 2, 'xslmes:mes_xsl_mixer_material_substitute:edit', '1', 2.00, 0, 1, 0, '1', 0, 'admin', NOW()); + +INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +VALUES ('177925970995514', '177925970995511', '删除', 2, 'xslmes:mes_xsl_mixer_material_substitute:delete', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW()); + +INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +VALUES ('177925970995515', '177925970995511', '批量删除', 2, 'xslmes:mes_xsl_mixer_material_substitute:deleteBatch', '1', 4.00, 0, 1, 0, '1', 0, 'admin', NOW()); + +INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +VALUES ('177925970995516', '177925970995511', '导出', 2, 'xslmes:mes_xsl_mixer_material_substitute:exportXls', '1', 5.00, 0, 1, 0, '1', 0, 'admin', NOW()); + +INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`) +VALUES ('177925970995517', '177925970995511', '导入', 2, 'xslmes:mes_xsl_mixer_material_substitute:importExcel', '1', 6.00, 0, 1, 0, '1', 0, 'admin', NOW()); + +INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`role_code` = 'admin' + AND p.`id` IN ( + '177925970995511', '177925970995512', '177925970995513', '177925970995514', + '177925970995515', '177925970995516', '177925970995517' + ) + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id + ); diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstitute.api.ts b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstitute.api.ts new file mode 100644 index 0000000..5f524a8 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstitute.api.ts @@ -0,0 +1,30 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/xslmes/mesXslMixerMaterialSubstitute/list', + save = '/xslmes/mesXslMixerMaterialSubstitute/add', + edit = '/xslmes/mesXslMixerMaterialSubstitute/edit', + deleteOne = '/xslmes/mesXslMixerMaterialSubstitute/delete', + deleteBatch = '/xslmes/mesXslMixerMaterialSubstitute/deleteBatch', + importExcel = '/xslmes/mesXslMixerMaterialSubstitute/importExcel', + exportXls = '/xslmes/mesXslMixerMaterialSubstitute/exportXls', + queryById = '/xslmes/mesXslMixerMaterialSubstitute/queryById', +} + +export const list = (params) => defHttp.get({ url: Api.list, params }); + +export const queryById = (params) => defHttp.get({ url: Api.queryById, params }); + +export const deleteOne = (params, handleSuccess) => + defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => handleSuccess()); + +export const batchDelete = (params, handleSuccess) => + defHttp.delete({ url: Api.deleteBatch, params }, { joinParamsToUrl: true }).then(() => handleSuccess()); + +export const saveOrUpdate = (params, isUpdate) => { + const url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url, params }, { successMessageMode: 'none' }); +}; + +export const getExportUrl = Api.exportXls; +export const getImportUrl = Api.importExcel; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstitute.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstitute.data.ts new file mode 100644 index 0000000..19f6756 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstitute.data.ts @@ -0,0 +1,102 @@ +import { BasicColumn, FormSchema } from '/@/components/Table'; + +export const columns: BasicColumn[] = [ + { title: '编号', align: 'center', dataIndex: 'serialNo', width: 80 }, + { title: '密炼物料编码', align: 'center', dataIndex: 'mixerMaterialCode', width: 130 }, + { title: '密炼物料名称', align: 'center', dataIndex: 'mixerMaterialName', width: 160 }, + { title: '替代密炼物料编码', align: 'center', dataIndex: 'substituteMaterialCode', width: 140 }, + { title: '替代密炼物料名称', align: 'center', dataIndex: 'substituteMaterialName', width: 160 }, + { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100, defaultHidden: true }, + { title: '创建时间', align: 'center', dataIndex: 'createTime', width: 165 }, + { title: '修改人', align: 'center', dataIndex: 'updateBy', width: 100, defaultHidden: true }, +]; + +export const searchFormSchema: FormSchema[] = [ + { + label: '密炼物料', + field: 'mixerMaterialId', + component: 'JDictSelectTag', + componentProps: { + dictCode: 'mes_mixer_material,material_name,id', + placeholder: '请选择密炼物料', + }, + colProps: { span: 6 }, + }, + { label: '密炼物料编码', field: 'mixerMaterialCode', component: 'JInput', colProps: { span: 6 } }, + { label: '密炼物料名称', field: 'mixerMaterialName', component: 'JInput', colProps: { span: 6 } }, + { + label: '替代密炼物料', + field: 'substituteMaterialId', + component: 'JDictSelectTag', + componentProps: { + dictCode: 'mes_mixer_material,material_name,id', + placeholder: '请选择替代密炼物料', + }, + colProps: { span: 6 }, + }, + { label: '替代物料编码', field: 'substituteMaterialCode', component: 'JInput', colProps: { span: 6 } }, + { label: '替代物料名称', field: 'substituteMaterialName', component: 'JInput', colProps: { span: 6 } }, +]; + +export const formSchema: FormSchema[] = [ + { label: '', field: 'id', component: 'Input', show: false }, + { + label: '编号', + field: 'serialNo', + component: 'InputNumber', + componentProps: { disabled: true, placeholder: '保存后自动生成', style: { width: '100%' } }, + ifShow: ({ values }) => !!values.serialNo, + }, + { + label: '密炼物料', + field: 'mixerMaterialName', + component: 'Input', + slot: 'mixerMaterialPicker', + dynamicRules: () => [{ required: true, message: '请选择密炼物料' }], + }, + { label: '', field: 'mixerMaterialId', component: 'Input', show: false }, + { + label: '密炼物料编码', + field: 'mixerMaterialCode', + component: 'Input', + componentProps: { disabled: true, placeholder: '选择密炼物料后自动带出' }, + }, + { + label: '替代密炼物料', + field: 'substituteMaterialName', + component: 'Input', + slot: 'substituteMaterialPicker', + dynamicRules: () => [{ required: true, message: '请选择替代密炼物料' }], + }, + { label: '', field: 'substituteMaterialId', component: 'Input', show: false }, + { + label: '替代密炼物料编码', + field: 'substituteMaterialCode', + component: 'Input', + componentProps: { disabled: true, placeholder: '选择替代密炼物料后自动带出' }, + }, +]; + +export const superQuerySchema = { + serialNo: { title: '编号', order: 0, view: 'number' }, + mixerMaterialId: { + title: '密炼物料', + order: 1, + view: 'sel_search', + dictTable: 'mes_mixer_material', + dictCode: 'id', + dictText: 'material_name', + }, + mixerMaterialCode: { title: '密炼物料编码', order: 2, view: 'text' }, + mixerMaterialName: { title: '密炼物料名称', order: 3, view: 'text' }, + substituteMaterialId: { + title: '替代密炼物料', + order: 4, + view: 'sel_search', + dictTable: 'mes_mixer_material', + dictCode: 'id', + dictText: 'material_name', + }, + substituteMaterialCode: { title: '替代密炼物料编码', order: 5, view: 'text' }, + substituteMaterialName: { title: '替代密炼物料名称', order: 6, view: 'text' }, +}; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstituteList.vue b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstituteList.vue new file mode 100644 index 0000000..15520aa --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/MesXslMixerMaterialSubstituteList.vue @@ -0,0 +1,152 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/components/MesXslMixerMaterialSubstituteModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/components/MesXslMixerMaterialSubstituteModal.vue new file mode 100644 index 0000000..2d7371a --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialSubstitute/components/MesXslMixerMaterialSubstituteModal.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.api.ts b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.api.ts new file mode 100644 index 0000000..fdc1032 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.api.ts @@ -0,0 +1,34 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/xslmes/mesXslOpenMillParam/list', + save = '/xslmes/mesXslOpenMillParam/add', + edit = '/xslmes/mesXslOpenMillParam/edit', + deleteOne = '/xslmes/mesXslOpenMillParam/delete', + deleteBatch = '/xslmes/mesXslOpenMillParam/deleteBatch', + importExcel = '/xslmes/mesXslOpenMillParam/importExcel', + exportXls = '/xslmes/mesXslOpenMillParam/exportXls', + queryById = '/xslmes/mesXslOpenMillParam/queryById', + queryMaterialById = '/mes/material/material/queryById', +} + +export const list = (params) => defHttp.get({ url: Api.list, params }); + +export const queryById = (params) => defHttp.get({ url: Api.queryById, params }); + +export const queryMaterialById = (params: { id: string }) => + defHttp.get({ url: Api.queryMaterialById, params }, { successMessageMode: 'none' }); + +export const deleteOne = (params, handleSuccess) => + defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => handleSuccess()); + +export const batchDelete = (params, handleSuccess) => + defHttp.delete({ url: Api.deleteBatch, params }, { joinParamsToUrl: true }).then(() => handleSuccess()); + +export const saveOrUpdate = (params, isUpdate) => { + const url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url, params }, { successMessageMode: 'none' }); +}; + +export const getExportUrl = Api.exportXls; +export const getImportUrl = Api.importExcel; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts new file mode 100644 index 0000000..c4fc1e6 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts @@ -0,0 +1,124 @@ +import { BasicColumn, FormSchema } from '/@/components/Table'; + +export const columns: BasicColumn[] = [ + { title: '胶料名称', align: 'center', dataIndex: 'materialName', width: 160 }, + { title: '胶料编码', align: 'center', dataIndex: 'materialCode', width: 130 }, + { title: 'R0进胶时间(秒)', align: 'center', dataIndex: 'r0FeedTime', width: 120 }, + { title: 'R0成环时间(秒)', align: 'center', dataIndex: 'r0RingTime', width: 120 }, + { title: 'R0拉断时间(秒)', align: 'center', dataIndex: 'r0BreakTime', width: 120 }, + { title: 'R0排胶时间(秒)', align: 'center', dataIndex: 'r0DischargeTime', width: 120 }, + { title: 'R1进胶时间(秒)', align: 'center', dataIndex: 'r1FeedTime', width: 120 }, + { title: 'R1成环时间(秒)', align: 'center', dataIndex: 'r1RingTime', width: 120 }, + { title: 'R1拉断时间(秒)', align: 'center', dataIndex: 'r1BreakTime', width: 120 }, + { title: 'R1排胶时间(秒)', align: 'center', dataIndex: 'r1DischargeTime', width: 120 }, + { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100, defaultHidden: true }, + { title: '创建时间', align: 'center', dataIndex: 'createTime', width: 165 }, + { title: '修改人', align: 'center', dataIndex: 'updateBy', width: 100, defaultHidden: true }, +]; + +export const searchFormSchema: FormSchema[] = [ + { + label: '胶料', + field: 'materialId', + component: 'JDictSelectTag', + componentProps: { + dictCode: 'mes_material,material_name,id', + placeholder: '请选择胶料', + }, + colProps: { span: 6 }, + }, + { label: '胶料编码', field: 'materialCode', component: 'JInput', colProps: { span: 6 } }, + { label: '胶料名称', field: 'materialName', component: 'JInput', colProps: { span: 6 } }, +]; + +export const formSchema: FormSchema[] = [ + { label: '', field: 'id', component: 'Input', show: false }, + { + label: '胶料', + field: 'materialId', + component: 'Input', + slot: 'materialPicker', + dynamicRules: () => [{ required: true, message: '请选择胶料' }], + }, + { + label: '胶料名称', + field: 'materialName', + component: 'Input', + componentProps: { disabled: true, placeholder: '选择胶料后自动带出' }, + }, + { + label: '胶料编码', + field: 'materialCode', + component: 'Input', + componentProps: { disabled: true, placeholder: '选择胶料后自动带出' }, + }, + { + label: 'R0进胶时间', + field: 'r0FeedTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R0成环时间', + field: 'r0RingTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R0拉断时间', + field: 'r0BreakTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R0排胶时间', + field: 'r0DischargeTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R1进胶时间', + field: 'r1FeedTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R1成环时间', + field: 'r1RingTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R1拉断时间', + field: 'r1BreakTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, + { + label: 'R1排胶时间', + field: 'r1DischargeTime', + component: 'InputNumber', + componentProps: { min: 0, precision: 2, placeholder: '单位:秒', style: { width: '100%' } }, + }, +]; + +export const superQuerySchema = { + materialId: { + title: '胶料', + order: 0, + view: 'sel_search', + dictTable: 'mes_material', + dictCode: 'id', + dictText: 'material_name', + }, + materialCode: { title: '胶料编码', order: 1, view: 'text' }, + materialName: { title: '胶料名称', order: 2, view: 'text' }, + r0FeedTime: { title: 'R0进胶时间', order: 3, view: 'number' }, + r0RingTime: { title: 'R0成环时间', order: 4, view: 'number' }, + r0BreakTime: { title: 'R0拉断时间', order: 5, view: 'number' }, + r0DischargeTime: { title: 'R0排胶时间', order: 6, view: 'number' }, + r1FeedTime: { title: 'R1进胶时间', order: 7, view: 'number' }, + r1RingTime: { title: 'R1成环时间', order: 8, view: 'number' }, + r1BreakTime: { title: 'R1拉断时间', order: 9, view: 'number' }, + r1DischargeTime: { title: 'R1排胶时间', order: 10, view: 'number' }, +}; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParamList.vue b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParamList.vue new file mode 100644 index 0000000..5f6665b --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParamList.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue new file mode 100644 index 0000000..4d9ba80 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue @@ -0,0 +1,108 @@ + + + + +