diff --git a/jeecg-boot/.vscode/settings.json b/jeecg-boot/.vscode/settings.json index 553d1b93..c2c2b05d 100644 --- a/jeecg-boot/.vscode/settings.json +++ b/jeecg-boot/.vscode/settings.json @@ -33,5 +33,8 @@ "jeecg-boot-platform" ], "java.debug.settings.console": "integratedTerminal", - "java.debug.settings.vmArgs": "-Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK" + "java.debug.settings.vmArgs": "-Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK", + "workbench.editorAssociations": { + "**/flyway/sql/mysql/*.sql": "default" + } } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志 b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志 index 4f436718..4576c58f 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志 +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志 @@ -1219,3 +1219,31 @@ jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/ jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategoryList.vue jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.api.ts -- author:jiangxh---date:20260702--for: 【MES】烘胶分类管理补充导出功能 --- + +-- author:jiangxh---date:20260703--for: 【MES】烘胶房库位（MES密炼工程，含导出；引用保护烘胶房/烘胶分类不可删） --- +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingRoomSlot.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomSlotMapper.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingRoomSlotService.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingRoomSlotServiceImpl.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomSlotController.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java +jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_162__mes_xsl_drying_room_slot.sql +jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlotList.vue +jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.data.ts +jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.api.ts +jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSlotModal.vue +jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSelectModal.vue +jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingCategorySelectModal.vue +-- author:jiangxh---date:20260703--for: 【MES】烘胶房库位（MES密炼工程，含导出；引用保护烘胶房/烘胶分类不可删） --- + +-- author:jiangxh---date:20260708--for: 【MES】烘胶流程开启（总开关+二次确认，不校验烘胶房日期） --- +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingProcessSwitch.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingProcessSwitchMapper.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingProcessSwitchService.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingProcessSwitchServiceImpl.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingProcessSwitchController.java +jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_163__mes_xsl_drying_process_switch.sql +jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitchPage.vue +jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitch.api.ts +-- author:jiangxh---date:20260708--for: 【MES】烘胶流程开启（总开关+二次确认，不校验烘胶房日期） --- diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingProcessSwitchController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingProcessSwitchController.java new file mode 100644 index 00000000..5c234f97 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingProcessSwitchController.java @@ -0,0 +1,77 @@ +package org.jeecg.modules.xslmes.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; +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.vo.LoginUser; +import org.jeecg.modules.xslmes.common.MesXslTenantUtils; +import org.jeecg.modules.xslmes.entity.MesXslDryingProcessSwitch; +import org.jeecg.modules.xslmes.service.IMesXslDryingProcessSwitchService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * MES 烘胶流程开启（总开关，不校验烘胶房日期） + */ +@Tag(name = "MES烘胶流程开启") +@RestController +@RequestMapping("/xslmes/mesXslDryingProcessSwitch") +@Slf4j +public class MesXslDryingProcessSwitchController { + + @Autowired + private IMesXslDryingProcessSwitchService dryingProcessSwitchService; + + @Operation(summary = "获取当前租户烘胶流程开关状态") + @GetMapping(value = "/get") + public Result getCurrent( + @RequestParam(name = "tenantId", required = false) Integer tenantId) { + return Result.OK(dryingProcessSwitchService.getCurrent(MesXslTenantUtils.resolveTenantId(tenantId))); + } + + @AutoLog(value = "MES烘胶流程开启-设置开关") + @Operation(summary = "设置烘胶流程开启/关闭（0关1开）") + @RequiresPermissions("mes:mes_xsl_drying_process_switch:toggle") + @PostMapping(value = "/setEnabled") + public Result setEnabled(@RequestBody SetEnabledRequest body) { + Integer enabled = body != null ? body.getEnabled() : null; + Integer tenantId = body != null ? body.getTenantId() : null; + String operator = resolveOperator(); + MesXslDryingProcessSwitch row = dryingProcessSwitchService.setEnabled(tenantId, enabled, operator); + return Result.OK( + enabled != null && enabled == 1 ? "烘胶流程已开启" : "烘胶流程已关闭", + row); + } + + @Operation(summary = "查询烘胶流程是否已开启（供其他业务调用）") + @GetMapping(value = "/isEnabled") + public Result isEnabled(@RequestParam(name = "tenantId", required = false) Integer tenantId) { + return Result.OK(dryingProcessSwitchService.isProcessEnabled(MesXslTenantUtils.resolveTenantId(tenantId))); + } + + private static String resolveOperator() { + try { + Object principal = SecurityUtils.getSubject().getPrincipal(); + if (principal instanceof LoginUser user) { + if (user.getRealname() != null && !user.getRealname().isBlank()) { + return user.getRealname(); + } + return user.getUsername(); + } + } catch (Exception ignored) { + // 非登录上下文 + } + return "system"; + } + + @lombok.Data + public static class SetEnabledRequest { + /** 0-关闭 1-开启 */ + private Integer enabled; + private Integer tenantId; + } +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java index c091fe83..fc531749 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java @@ -17,6 +17,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.xslmes.entity.MesXslDryingRoom; import org.jeecg.modules.xslmes.service.IMesXslDryingRoomService; +import org.jeecg.modules.xslmes.service.IMesXslDryingRoomSlotService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,6 +35,9 @@ public class MesXslDryingRoomController extends JeecgController> queryPageList( @@ -82,6 +86,11 @@ public class MesXslDryingRoomController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { + //update-begin---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶房不允许删除----------- + if (mesXslDryingRoomSlotService.countByDryingRoomId(id) > 0) { + return Result.error("该烘胶房已被烘胶房库位引用，不允许删除"); + } + //update-end---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶房不允许删除----------- mesXslDryingRoomService.removeById(id); return Result.OK("删除成功!"); } @@ -91,6 +100,13 @@ public class MesXslDryingRoomController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + //update-begin---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶房不允许删除----------- + for (String id : ids.split(",")) { + if (oConvertUtils.isNotEmpty(id) && mesXslDryingRoomSlotService.countByDryingRoomId(id.trim()) > 0) { + return Result.error("存在已被烘胶房库位引用的烘胶房，不允许删除"); + } + } + //update-end---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶房不允许删除----------- mesXslDryingRoomService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomSlotController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomSlotController.java new file mode 100644 index 00000000..5e4d494a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomSlotController.java @@ -0,0 +1,193 @@ +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 java.math.BigDecimal; +import java.util.Arrays; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.xslmes.entity.MesXslDryingCategory; +import org.jeecg.modules.xslmes.entity.MesXslDryingRoom; +import org.jeecg.modules.xslmes.entity.MesXslDryingRoomSlot; +import org.jeecg.modules.xslmes.service.IMesXslDryingCategoryService; +import org.jeecg.modules.xslmes.service.IMesXslDryingRoomService; +import org.jeecg.modules.xslmes.service.IMesXslDryingRoomSlotService; +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/mesXslDryingRoomSlot") +@Slf4j +public class MesXslDryingRoomSlotController extends JeecgController { + + @Autowired + private IMesXslDryingRoomSlotService mesXslDryingRoomSlotService; + + @Autowired + private IMesXslDryingRoomService mesXslDryingRoomService; + + @Autowired + private IMesXslDryingCategoryService mesXslDryingCategoryService; + + @Operation(summary = "MES烘胶房库位-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList( + MesXslDryingRoomSlot model, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = mesXslDryingRoomSlotService.page(page, queryWrapper); + return Result.OK(pageList); + } + + @AutoLog(value = "MES烘胶房库位-添加") + @Operation(summary = "MES烘胶房库位-添加") + @RequiresPermissions("mes:mes_xsl_drying_room_slot:add") + @PostMapping(value = "/add") + public Result add(@RequestBody MesXslDryingRoomSlot model) { + //update-begin---author:jiangxh ---date:20260703 for：【MES】烘胶房库位保存前校验----------- + String err = validateForSave(model, null); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260703 for：【MES】烘胶房库位保存前校验----------- + mesXslDryingRoomSlotService.save(model); + return Result.OK("添加成功！"); + } + + @AutoLog(value = "MES烘胶房库位-编辑") + @Operation(summary = "MES烘胶房库位-编辑") + @RequiresPermissions("mes:mes_xsl_drying_room_slot:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody MesXslDryingRoomSlot model) { + //update-begin---author:jiangxh ---date:20260703 for：【MES】烘胶房库位保存前校验----------- + String err = validateForSave(model, model.getId()); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260703 for：【MES】烘胶房库位保存前校验----------- + mesXslDryingRoomSlotService.updateById(model); + return Result.OK("编辑成功!"); + } + + @AutoLog(value = "MES烘胶房库位-删除") + @Operation(summary = "MES烘胶房库位-通过id删除") + @RequiresPermissions("mes:mes_xsl_drying_room_slot:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + mesXslDryingRoomSlotService.removeById(id); + return Result.OK("删除成功!"); + } + + @AutoLog(value = "MES烘胶房库位-批量删除") + @Operation(summary = "MES烘胶房库位-批量删除") + @RequiresPermissions("mes:mes_xsl_drying_room_slot:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + mesXslDryingRoomSlotService.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) { + MesXslDryingRoomSlot entity = mesXslDryingRoomSlotService.getById(id); + if (entity == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(entity); + } + + @Operation(summary = "校验烘胶房库位名称是否重复（同烘胶房内未删除数据；dataId 为编辑时当前主键）") + @GetMapping(value = "/checkSlotName") + public Result checkSlotName( + @RequestParam(name = "slotName", required = true) String slotName, + @RequestParam(name = "dryingRoomId", required = true) String dryingRoomId, + @RequestParam(name = "dataId", required = false) String dataId) { + if (oConvertUtils.isEmpty(slotName) || slotName.trim().isEmpty()) { + return Result.OK("该值可用！"); + } + if (oConvertUtils.isEmpty(dryingRoomId)) { + return Result.error("请先选择所属烘胶房"); + } + MesXslDryingRoomSlot ctx = new MesXslDryingRoomSlot(); + if (mesXslDryingRoomSlotService.isSlotNameDuplicated(slotName.trim(), dryingRoomId, dataId, ctx)) { + return Result.error("该烘胶房内库位名称不能重复"); + } + return Result.OK("该值可用！"); + } + + @RequiresPermissions("mes:mes_xsl_drying_room_slot:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MesXslDryingRoomSlot model) { + return super.exportXls(request, model, MesXslDryingRoomSlot.class, "烘胶房库位"); + } + + //update-begin---author:jiangxh ---date:20260703 for：【MES】烘胶房库位保存前校验----------- + private String validateForSave(MesXslDryingRoomSlot model, String excludeId) { + if (model == null) { + return "参数不能为空"; + } + if (oConvertUtils.isEmpty(model.getSlotName()) || model.getSlotName().trim().isEmpty()) { + return "烘胶房库位不能为空"; + } + String slotName = model.getSlotName().trim(); + model.setSlotName(slotName); + + if (oConvertUtils.isEmpty(model.getDryingRoomId())) { + return "请选择所属烘胶房"; + } + MesXslDryingRoom room = mesXslDryingRoomService.getById(model.getDryingRoomId().trim()); + if (room == null || isDeleted(room.getDelFlag())) { + return "所属烘胶房不存在或已删除"; + } + model.setDryingRoomId(room.getId()); + model.setDryingRoomName(room.getRoomName()); + + if (mesXslDryingRoomSlotService.isSlotNameDuplicated(slotName, room.getId(), excludeId, model)) { + return "该烘胶房内库位名称不能重复"; + } + + if (oConvertUtils.isEmpty(model.getDryingCategoryId())) { + return "请选择存放物料（烘胶分类）"; + } + MesXslDryingCategory category = mesXslDryingCategoryService.getById(model.getDryingCategoryId().trim()); + if (category == null || isDeleted(category.getDelFlag())) { + return "存放物料分类不存在或已删除"; + } + model.setDryingCategoryId(category.getId()); + model.setCategoryName(category.getCategoryName()); + + if (model.getSlotCapacity() == null) { + return "库位容量不能为空"; + } + if (model.getSlotCapacity().compareTo(BigDecimal.ZERO) <= 0) { + return "库位容量必须大于0"; + } + + return null; + } + + private static boolean isDeleted(Integer delFlag) { + return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1); + } + //update-end---author:jiangxh ---date:20260703 for：【MES】烘胶房库位保存前校验----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingProcessSwitch.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingProcessSwitch.java new file mode 100644 index 00000000..02cc0086 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingProcessSwitch.java @@ -0,0 +1,45 @@ +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.springframework.format.annotation.DateTimeFormat; + +/** + * MES 烘胶流程开启（表 mes_xsl_drying_process_switch，每租户一条） + */ +@Data +@TableName("mes_xsl_drying_process_switch") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description = "MES烘胶流程开启") +public class MesXslDryingProcessSwitch implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + @Schema(description = "租户ID") + private Integer tenantId; + + /** 0-关闭 1-开启 */ + @Schema(description = "烘胶流程是否开启(0关1开)") + private Integer enabled; + + private String createBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + private String updateBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingRoomSlot.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingRoomSlot.java new file mode 100644 index 00000000..b84579a2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingRoomSlot.java @@ -0,0 +1,67 @@ +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.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * MES 烘胶房库位（表 mes_xsl_drying_room_slot） + */ +@Data +@TableName("mes_xsl_drying_room_slot") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description = "MES烘胶房库位") +public class MesXslDryingRoomSlot implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + @Excel(name = "烘胶房库位", width = 20) + @Schema(description = "烘胶房库位（同烘胶房内未删除数据中唯一）") + private String slotName; + + @Schema(description = "所属烘胶房主键 mes_xsl_drying_room.id") + private String dryingRoomId; + + @Excel(name = "所属烘胶房", width = 20) + @Schema(description = "所属烘胶房名称冗余") + private String dryingRoomName; + + @Schema(description = "存放物料分类主键 mes_xsl_drying_category.id") + private String dryingCategoryId; + + @Excel(name = "存放物料", width = 20) + @Schema(description = "烘胶分类名称冗余") + private String categoryName; + + @Excel(name = "库位容量", width = 15) + @Schema(description = "库位容量") + private BigDecimal slotCapacity; + + private Integer tenantId; + private String sysOrgCode; + @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; + private String updateBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + private Integer delFlag; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingProcessSwitchMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingProcessSwitchMapper.java new file mode 100644 index 00000000..8a23d08a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingProcessSwitchMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.xslmes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.xslmes.entity.MesXslDryingProcessSwitch; + +/** MES 烘胶流程开启 */ +public interface MesXslDryingProcessSwitchMapper extends BaseMapper {} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomSlotMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomSlotMapper.java new file mode 100644 index 00000000..025c3352 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomSlotMapper.java @@ -0,0 +1,9 @@ +package org.jeecg.modules.xslmes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.xslmes.entity.MesXslDryingRoomSlot; + +/** + * MES 烘胶房库位 + */ +public interface MesXslDryingRoomSlotMapper extends BaseMapper {} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingProcessSwitchService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingProcessSwitchService.java new file mode 100644 index 00000000..1326ba63 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingProcessSwitchService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.xslmes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.xslmes.entity.MesXslDryingProcessSwitch; + +public interface IMesXslDryingProcessSwitchService extends IService { + + /** 获取当前租户配置（无记录时返回默认关闭状态，不落库） */ + MesXslDryingProcessSwitch getCurrent(Integer tenantId); + + /** 设置开启/关闭（0关1开） */ + MesXslDryingProcessSwitch setEnabled(Integer tenantId, Integer enabled, String operator); + + /** 烘胶流程是否已开启 */ + boolean isProcessEnabled(Integer tenantId); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingRoomSlotService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingRoomSlotService.java new file mode 100644 index 00000000..bc782b89 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingRoomSlotService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.xslmes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.xslmes.entity.MesXslDryingRoomSlot; + +public interface IMesXslDryingRoomSlotService extends IService { + + /** + * 同一烘胶房内库位名称是否重复（仅统计未删除）。 + */ + boolean isSlotNameDuplicated(String slotName, String dryingRoomId, String excludeId, MesXslDryingRoomSlot context); + + /** 引用指定烘胶房的未删除库位数量 */ + long countByDryingRoomId(String dryingRoomId); + + /** 引用指定烘胶分类的未删除库位数量 */ + long countByDryingCategoryId(String dryingCategoryId); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java index e11b512e..d9f0568b 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java @@ -13,6 +13,7 @@ import org.jeecg.modules.xslmes.entity.MesXslDryingCategoryMaterial; import org.jeecg.modules.xslmes.mapper.MesXslDryingCategoryMapper; import org.jeecg.modules.xslmes.mapper.MesXslDryingCategoryMaterialMapper; import org.jeecg.modules.xslmes.service.IMesXslDryingCategoryService; +import org.jeecg.modules.xslmes.service.IMesXslDryingRoomSlotService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +26,9 @@ public class MesXslDryingCategoryServiceImpl extends ServiceImpl materialList) { @@ -58,6 +62,11 @@ public class MesXslDryingCategoryServiceImpl extends ServiceImpl 0) { + throw new org.jeecg.common.exception.JeecgBootException("该烘胶分类已被烘胶房库位引用，不允许删除"); + } + //update-end---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶分类不允许删除----------- mesXslDryingCategoryMaterialMapper.delete( new LambdaQueryWrapper() .eq(MesXslDryingCategoryMaterial::getDryingCategoryId, id)); diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingProcessSwitchServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingProcessSwitchServiceImpl.java new file mode 100644 index 00000000..91fc9315 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingProcessSwitchServiceImpl.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.xslmes.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; +import org.jeecg.modules.xslmes.common.MesXslTenantUtils; +import org.jeecg.modules.xslmes.entity.MesXslDryingProcessSwitch; +import org.jeecg.modules.xslmes.mapper.MesXslDryingProcessSwitchMapper; +import org.jeecg.modules.xslmes.service.IMesXslDryingProcessSwitchService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class MesXslDryingProcessSwitchServiceImpl + extends ServiceImpl + implements IMesXslDryingProcessSwitchService { + + private static final int OFF = 0; + private static final int ON = 1; + + //update-begin---author:jiangxh ---date:20260708 for：【MES】烘胶流程开启-租户级开关读写----------- + @Override + public MesXslDryingProcessSwitch getCurrent(Integer tenantId) { + Integer tid = MesXslTenantUtils.resolveTenantId(tenantId); + if (tid == null) { + tid = 0; + } + MesXslDryingProcessSwitch row = getOneByTenant(tid); + if (row != null) { + return row; + } + MesXslDryingProcessSwitch def = new MesXslDryingProcessSwitch(); + def.setTenantId(tid); + def.setEnabled(OFF); + return def; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public MesXslDryingProcessSwitch setEnabled(Integer tenantId, Integer enabled, String operator) { + if (enabled == null || (enabled != OFF && enabled != ON)) { + throw new org.jeecg.common.exception.JeecgBootException("开关状态无效，仅支持 0（关闭）或 1（开启）"); + } + Integer tid = MesXslTenantUtils.resolveTenantId(tenantId); + if (tid == null) { + throw new org.jeecg.common.exception.JeecgBootException("无法识别当前租户"); + } + Date now = new Date(); + MesXslDryingProcessSwitch row = getOneByTenant(tid); + if (row == null) { + row = new MesXslDryingProcessSwitch(); + row.setTenantId(tid); + row.setEnabled(enabled); + row.setCreateBy(operator); + row.setCreateTime(now); + row.setUpdateBy(operator); + row.setUpdateTime(now); + save(row); + } else { + row.setEnabled(enabled); + row.setUpdateBy(operator); + row.setUpdateTime(now); + updateById(row); + } + return row; + } + + @Override + public boolean isProcessEnabled(Integer tenantId) { + MesXslDryingProcessSwitch current = getCurrent(tenantId); + return current != null && current.getEnabled() != null && current.getEnabled() == ON; + } + + private MesXslDryingProcessSwitch getOneByTenant(Integer tenantId) { + if (tenantId == null) { + return null; + } + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.eq(MesXslDryingProcessSwitch::getTenantId, tenantId); + w.orderByDesc(MesXslDryingProcessSwitch::getUpdateTime); + w.last("LIMIT 1"); + return getOne(w, false); + } + //update-end---author:jiangxh ---date:20260708 for：【MES】烘胶流程开启-租户级开关读写----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingRoomSlotServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingRoomSlotServiceImpl.java new file mode 100644 index 00000000..4477b110 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingRoomSlotServiceImpl.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.xslmes.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.xslmes.common.MesXslTenantUtils; +import org.jeecg.modules.xslmes.entity.MesXslDryingRoomSlot; +import org.jeecg.modules.xslmes.mapper.MesXslDryingRoomSlotMapper; +import org.jeecg.modules.xslmes.service.IMesXslDryingRoomSlotService; +import org.springframework.stereotype.Service; + +@Service +public class MesXslDryingRoomSlotServiceImpl extends ServiceImpl + implements IMesXslDryingRoomSlotService { + + //update-begin---author:jiangxh ---date:20260703 for：【MES】烘胶房库位同烘胶房内名称不可重复；引用计数----------- + @Override + public boolean isSlotNameDuplicated(String slotName, String dryingRoomId, String excludeId, MesXslDryingRoomSlot context) { + if (oConvertUtils.isEmpty(slotName) || oConvertUtils.isEmpty(dryingRoomId)) { + return false; + } + Integer tenantId = MesXslTenantUtils.resolveTenantId(context != null ? context.getTenantId() : null); + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.eq(MesXslDryingRoomSlot::getSlotName, slotName.trim()); + w.eq(MesXslDryingRoomSlot::getDryingRoomId, dryingRoomId.trim()); + w.and( + q -> + q.eq(MesXslDryingRoomSlot::getDelFlag, CommonConstant.DEL_FLAG_0) + .or() + .isNull(MesXslDryingRoomSlot::getDelFlag)); + if (oConvertUtils.isNotEmpty(excludeId)) { + w.ne(MesXslDryingRoomSlot::getId, excludeId); + } + if (tenantId != null) { + w.eq(MesXslDryingRoomSlot::getTenantId, tenantId); + } + return this.count(w) > 0; + } + + @Override + public long countByDryingRoomId(String dryingRoomId) { + if (oConvertUtils.isEmpty(dryingRoomId)) { + return 0; + } + return countActiveByField(MesXslDryingRoomSlot::getDryingRoomId, dryingRoomId.trim()); + } + + @Override + public long countByDryingCategoryId(String dryingCategoryId) { + if (oConvertUtils.isEmpty(dryingCategoryId)) { + return 0; + } + return countActiveByField(MesXslDryingRoomSlot::getDryingCategoryId, dryingCategoryId.trim()); + } + + private long countActiveByField( + com.baomidou.mybatisplus.core.toolkit.support.SFunction fieldGetter, + String fieldValue) { + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.eq(fieldGetter, fieldValue); + w.and( + q -> + q.eq(MesXslDryingRoomSlot::getDelFlag, CommonConstant.DEL_FLAG_0) + .or() + .isNull(MesXslDryingRoomSlot::getDelFlag)); + return this.count(w); + } + //update-end---author:jiangxh ---date:20260703 for：【MES】烘胶房库位同烘胶房内名称不可重复；引用计数----------- +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_162__mes_xsl_drying_room_slot.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_162__mes_xsl_drying_room_slot.sql new file mode 100644 index 00000000..14c653e6 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_162__mes_xsl_drying_room_slot.sql @@ -0,0 +1,69 @@ +-- MES 烘胶房库位：建表 + 菜单 + 按钮 + 租户 admin 授权（含导出，无导入） +-- 权限前缀：mes:mes_xsl_drying_room_slot:*；父菜单 MES密炼工程 +SET NAMES utf8mb4; + +CREATE TABLE IF NOT EXISTS `mes_xsl_drying_room_slot` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `slot_name` varchar(100) NOT NULL COMMENT '烘胶房库位（同烘胶房内未删除数据中唯一）', + `drying_room_id` varchar(32) NOT NULL COMMENT '所属烘胶房主键 mes_xsl_drying_room.id', + `drying_room_name` varchar(100) DEFAULT NULL COMMENT '所属烘胶房名称冗余', + `drying_category_id` varchar(32) NOT NULL COMMENT '存放物料分类主键 mes_xsl_drying_category.id', + `category_name` varchar(100) DEFAULT NULL COMMENT '烘胶分类名称冗余', + `slot_capacity` decimal(18,4) NOT NULL COMMENT '库位容量', + `tenant_id` int DEFAULT NULL COMMENT '租户', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门', + `create_by` varchar(32) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）', + PRIMARY KEY (`id`), + KEY `idx_mxdrs_room` (`drying_room_id`), + KEY `idx_mxdrs_category` (`drying_category_id`), + KEY `idx_mxdrs_tenant_room_slot` (`tenant_id`, `drying_room_id`, `slot_name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES烘胶房库位'; + +SET @mes_tenant_id = 1002; + +SET @mes_mixer_pid = ( + SELECT MIN(`id`) FROM `sys_permission` + WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES密炼工程' +); +SET @mes_mixer_pid = IFNULL(@mes_mixer_pid, '1900000000000000800'); + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`) +VALUES ('1860000000000000246', @mes_mixer_pid, '烘胶房库位', '/xslmes/mesXslDryingRoomSlot', 'xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlotList', 'MesXslDryingRoomSlotList', 1, NULL, '1', 20, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`), +`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`), +`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`), +`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`); + +UPDATE `sys_permission` SET `icon` = 'ant-design:inbox-outlined' WHERE `id` = '1860000000000000246' AND `del_flag` = 0; + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES +('1860000000000000247', '1860000000000000246', '新增', 2, 'mes:mes_xsl_drying_room_slot:add', '1', '1', 0, 'admin', NOW()), +('1860000000000000248', '1860000000000000246', '编辑', 2, 'mes:mes_xsl_drying_room_slot:edit', '1', '1', 0, 'admin', NOW()), +('1860000000000000249', '1860000000000000246', '删除', 2, 'mes:mes_xsl_drying_room_slot:delete', '1', '1', 0, 'admin', NOW()), +('1860000000000000250', '1860000000000000246', '批量删除', 2, 'mes:mes_xsl_drying_room_slot:deleteBatch', '1', '1', 0, 'admin', NOW()), +('1860000000000000251', '1860000000000000246', '导出', 2, 'mes:mes_xsl_drying_room_slot:exportXls', '1', '1', 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), +`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`); + +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`tenant_id` = @mes_tenant_id + AND r.`role_code` = 'admin' + AND p.`id` IN ( + '1860000000000000246', + '1860000000000000247', '1860000000000000248', '1860000000000000249', '1860000000000000250', + '1860000000000000251' + ) + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id` + ); + +UPDATE `sys_permission` SET `is_leaf` = 0 WHERE `id` = @mes_mixer_pid AND `del_flag` = 0; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_163__mes_xsl_drying_process_switch.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_163__mes_xsl_drying_process_switch.sql new file mode 100644 index 00000000..24514a12 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_163__mes_xsl_drying_process_switch.sql @@ -0,0 +1,56 @@ +-- MES 烘胶流程开启：建表 + 菜单 + 按钮 + 租户 admin 授权 + 默认关闭 +-- 权限前缀 mes:mes_xsl_drying_process_switch，父菜单 MES密炼工程 +SET NAMES utf8mb4; + +CREATE TABLE IF NOT EXISTS `mes_xsl_drying_process_switch` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `tenant_id` int NOT NULL COMMENT '租户ID', + `enabled` int NOT NULL DEFAULT '0' COMMENT '烘胶流程是否开启(0关1开)', + `create_by` varchar(32) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_mxdps_tenant` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES烘胶流程开启（每租户一条）'; + +SET @mes_tenant_id = 1002; + +INSERT INTO `mes_xsl_drying_process_switch` (`id`, `tenant_id`, `enabled`, `create_by`, `create_time`, `update_by`, `update_time`) +SELECT '1996000000000000001', @mes_tenant_id, 0, 'admin', NOW(), 'admin', NOW() +FROM DUAL +WHERE NOT EXISTS (SELECT 1 FROM `mes_xsl_drying_process_switch` WHERE `tenant_id` = @mes_tenant_id); + +SET @mes_mixer_pid = ( + SELECT MIN(`id`) FROM `sys_permission` + WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES密炼工程' +); +SET @mes_mixer_pid = IFNULL(@mes_mixer_pid, '1900000000000000800'); + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`) +VALUES ('1860000000000000253', @mes_mixer_pid, '烘胶流程开启', '/xslmes/mesXslDryingProcessSwitch', 'xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitchPage', 'MesXslDryingProcessSwitchPage', 1, NULL, '1', 21, 1, 1, 0, '1', 0, 1, 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`), +`menu_type` = VALUES(`menu_type`), `sort_no` = VALUES(`sort_no`), `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), +`hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`), `keep_alive` = VALUES(`keep_alive`); + +UPDATE `sys_permission` SET `icon` = 'ant-design:poweroff-outlined' WHERE `id` = '1860000000000000253' AND `del_flag` = 0; + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES +('1860000000000000254', '1860000000000000253', '切换开关', 2, 'mes:mes_xsl_drying_process_switch:toggle', '1', '1', 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), +`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`); + +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`tenant_id` = @mes_tenant_id + AND r.`role_code` = 'admin' + AND p.`id` IN ('1860000000000000253', '1860000000000000254') + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id` + ); + +UPDATE `sys_permission` SET `is_leaf` = 0 WHERE `id` = @mes_mixer_pid AND `del_flag` = 0; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitch.api.ts b/jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitch.api.ts new file mode 100644 index 00000000..9805a3f2 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitch.api.ts @@ -0,0 +1,16 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + get = '/xslmes/mesXslDryingProcessSwitch/get', + setEnabled = '/xslmes/mesXslDryingProcessSwitch/setEnabled', + isEnabled = '/xslmes/mesXslDryingProcessSwitch/isEnabled', +} + +export const getDryingProcessSwitch = (params?: { tenantId?: number }) => + defHttp.get({ url: Api.get, params }); + +export const setDryingProcessEnabled = (params: { enabled: 0 | 1; tenantId?: number }) => + defHttp.post({ url: Api.setEnabled, params }); + +export const isDryingProcessEnabled = (params?: { tenantId?: number }) => + defHttp.get({ url: Api.isEnabled, params }); diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitchPage.vue b/jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitchPage.vue new file mode 100644 index 00000000..e9de5dc2 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitchPage.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.api.ts b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.api.ts new file mode 100644 index 00000000..2720d172 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.api.ts @@ -0,0 +1,56 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from '/@/hooks/web/useMessage'; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/xslmes/mesXslDryingRoomSlot/list', + checkSlotName = '/xslmes/mesXslDryingRoomSlot/checkSlotName', + save = '/xslmes/mesXslDryingRoomSlot/add', + edit = '/xslmes/mesXslDryingRoomSlot/edit', + deleteOne = '/xslmes/mesXslDryingRoomSlot/delete', + deleteBatch = '/xslmes/mesXslDryingRoomSlot/deleteBatch', + queryById = '/xslmes/mesXslDryingRoomSlot/queryById', + exportXls = '/xslmes/mesXslDryingRoomSlot/exportXls', +} + +export const getExportUrl = Api.exportXls; + +export const list = (params) => defHttp.get({ url: Api.list, params }); + +export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params }); + +export const checkSlotName = (params: { slotName: string; dryingRoomId: string; dataId?: string }) => + defHttp.get( + { url: Api.checkSlotName, params }, + { + successMessageMode: 'none', + errorMessageMode: 'none', + }, + ); + +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); +}; + +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); + }, + }); +}; + +export const saveOrUpdate = (params, isUpdate) => { + const url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url, params }); +}; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.data.ts new file mode 100644 index 00000000..8ccfda1a --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.data.ts @@ -0,0 +1,85 @@ +import { BasicColumn, FormSchema } from '/@/components/Table'; +import { checkSlotName } from './MesXslDryingRoomSlot.api'; + +export const columns: BasicColumn[] = [ + { title: '烘胶房库位', align: 'center', dataIndex: 'slotName', width: 140 }, + { title: '所属烘胶房', align: 'center', dataIndex: 'dryingRoomName', width: 160 }, + { title: '存放物料', align: 'center', dataIndex: 'categoryName', width: 160 }, + { title: '库位容量', align: 'center', dataIndex: 'slotCapacity', width: 110 }, + { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 }, + { + title: '创建时间', + align: 'center', + dataIndex: 'createTime', + width: 165, + customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text), + }, +]; + +export const searchFormSchema: FormSchema[] = [ + { label: '烘胶房库位', field: 'slotName', component: 'JInput', colProps: { span: 6 } }, + { label: '所属烘胶房', field: 'dryingRoomName', component: 'JInput', colProps: { span: 6 } }, + { label: '存放物料', field: 'categoryName', component: 'JInput', colProps: { span: 6 } }, +]; + +export const formSchema: FormSchema[] = [ + { label: '', field: 'id', component: 'Input', show: false }, + { label: '', field: 'dryingRoomId', component: 'Input', show: false }, + { label: '', field: 'dryingCategoryId', component: 'Input', show: false }, + { + label: '烘胶房库位', + field: 'slotName', + component: 'Input', + componentProps: { placeholder: '同烘胶房内未删除数据中不可重复' }, + dynamicRules: ({ model }) => [ + { required: true, message: '请输入烘胶房库位' }, + { + validator: async (_rule, value) => { + const v = value == null ? '' : String(value).trim(); + if (!v) { + return Promise.resolve(); + } + if (!model?.dryingRoomId) { + return Promise.reject('请先选择所属烘胶房'); + } + try { + await checkSlotName({ slotName: v, dryingRoomId: model.dryingRoomId, dataId: model?.id }); + return Promise.resolve(); + } catch (e: any) { + const msg = e?.response?.data?.message || e?.message || '该烘胶房内库位名称不能重复'; + return Promise.reject(msg); + } + }, + trigger: 'blur', + }, + ], + }, + { + label: '所属烘胶房', + field: 'dryingRoomName', + component: 'Input', + slot: 'dryingRoomPicker', + dynamicRules: () => [{ required: true, message: '请选择所属烘胶房' }], + }, + { + label: '存放物料', + field: 'categoryName', + component: 'Input', + slot: 'dryingCategoryPicker', + dynamicRules: () => [{ required: true, message: '请选择存放物料（烘胶分类）' }], + }, + { + label: '库位容量', + field: 'slotCapacity', + component: 'InputNumber', + componentProps: { min: 0.0001, precision: 4, style: { width: '100%' }, placeholder: '须大于0' }, + dynamicRules: () => [{ required: true, message: '请输入库位容量' }], + }, +]; + +export const superQuerySchema = { + slotName: { title: '烘胶房库位', order: 0, view: 'text' }, + dryingRoomName: { title: '所属烘胶房', order: 1, view: 'text' }, + categoryName: { title: '存放物料', order: 2, view: 'text' }, + slotCapacity: { title: '库位容量', order: 3, view: 'number' }, +}; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlotList.vue b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlotList.vue new file mode 100644 index 00000000..7636ffdb --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlotList.vue @@ -0,0 +1,135 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingCategorySelectModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingCategorySelectModal.vue new file mode 100644 index 00000000..c177b2ea --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingCategorySelectModal.vue @@ -0,0 +1,88 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSelectModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSelectModal.vue new file mode 100644 index 00000000..a74f2135 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSelectModal.vue @@ -0,0 +1,92 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSlotModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSlotModal.vue new file mode 100644 index 00000000..69614737 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSlotModal.vue @@ -0,0 +1,116 @@ + + + diff --git a/qhmes.code-workspace b/qhmes.code-workspace index 4d451baf..ab2f0bda 100644 --- a/qhmes.code-workspace +++ b/qhmes.code-workspace @@ -69,6 +69,9 @@ "**/node_modules": true, "**/_tmp_build_out": true, "**/_build_verify_out": true + }, + "workbench.editorAssociations": { + "**/flyway/sql/mysql/*.sql": "default" } }, "launch": {