烘胶房库位新增
This commit is contained in:
@@ -1219,3 +1219,20 @@ 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密炼工程，含导出；引用保护烘胶房/烘胶分类不可删） ---
|
||||
|
||||
@@ -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<MesXslDryingRoom
|
||||
@Autowired
|
||||
private IMesXslDryingRoomService mesXslDryingRoomService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDryingRoomSlotService mesXslDryingRoomSlotService;
|
||||
|
||||
@Operation(summary = "MES烘胶房管理-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslDryingRoom>> queryPageList(
|
||||
@@ -82,6 +86,11 @@ public class MesXslDryingRoomController extends JeecgController<MesXslDryingRoom
|
||||
@RequiresPermissions("mes:mes_xsl_drying_room:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> 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<MesXslDryingRoom
|
||||
@RequiresPermissions("mes:mes_xsl_drying_room:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> 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("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -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<MesXslDryingRoomSlot, IMesXslDryingRoomSlotService> {
|
||||
|
||||
@Autowired
|
||||
private IMesXslDryingRoomSlotService mesXslDryingRoomSlotService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDryingRoomService mesXslDryingRoomService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDryingCategoryService mesXslDryingCategoryService;
|
||||
|
||||
@Operation(summary = "MES烘胶房库位-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslDryingRoomSlot>> queryPageList(
|
||||
MesXslDryingRoomSlot model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslDryingRoomSlot> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<MesXslDryingRoomSlot> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslDryingRoomSlot> 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<String> 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<String> 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<String> 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<String> 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<MesXslDryingRoomSlot> 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<String> 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】烘胶房库位保存前校验-----------
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<MesXslDryingRoomSlot> {}
|
||||
@@ -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<MesXslDryingRoomSlot> {
|
||||
|
||||
/**
|
||||
* 同一烘胶房内库位名称是否重复（仅统计未删除）。
|
||||
*/
|
||||
boolean isSlotNameDuplicated(String slotName, String dryingRoomId, String excludeId, MesXslDryingRoomSlot context);
|
||||
|
||||
/** 引用指定烘胶房的未删除库位数量 */
|
||||
long countByDryingRoomId(String dryingRoomId);
|
||||
|
||||
/** 引用指定烘胶分类的未删除库位数量 */
|
||||
long countByDryingCategoryId(String dryingCategoryId);
|
||||
}
|
||||
@@ -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<MesXslDryingCat
|
||||
@Autowired
|
||||
private MesXslDryingCategoryMaterialMapper mesXslDryingCategoryMaterialMapper;
|
||||
|
||||
@Autowired
|
||||
private IMesXslDryingRoomSlotService mesXslDryingRoomSlotService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList) {
|
||||
@@ -58,6 +62,11 @@ public class MesXslDryingCategoryServiceImpl extends ServiceImpl<MesXslDryingCat
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
//update-begin---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶分类不允许删除-----------
|
||||
if (mesXslDryingRoomSlotService.countByDryingCategoryId(id) > 0) {
|
||||
throw new org.jeecg.common.exception.JeecgBootException("该烘胶分类已被烘胶房库位引用，不允许删除");
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260703 for：【MES】被烘胶房库位引用的烘胶分类不允许删除-----------
|
||||
mesXslDryingCategoryMaterialMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslDryingCategoryMaterial>()
|
||||
.eq(MesXslDryingCategoryMaterial::getDryingCategoryId, id));
|
||||
|
||||
@@ -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<MesXslDryingRoomSlotMapper, MesXslDryingRoomSlot>
|
||||
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<MesXslDryingRoomSlot> 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<MesXslDryingRoomSlot, String> fieldGetter,
|
||||
String fieldValue) {
|
||||
LambdaQueryWrapper<MesXslDryingRoomSlot> 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】烘胶房库位同烘胶房内名称不可重复；引用计数-----------
|
||||
}
|
||||
@@ -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;
|
||||
Reference in New Issue
Block a user