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

烘胶房库位新增

Browse Source
This commit is contained in:
jiangxh
2026-07-03 15:21:10 +08:00
parent 99987d9d2e
commit dde35d639b
15 changed files with 1040 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
View File

@@ -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/MesXslDryingCategoryList.vue
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.api.ts jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.api.ts
-- author:jiangxh---date:20260702--for: 【MES】烘胶分类管理补充导出功能 --- -- 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密炼工程，含导出；引用保护烘胶房/烘胶分类不可删） ---

16
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java
View File

@@ -17,6 +17,7 @@ import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.xslmes.entity.MesXslDryingRoom; import org.jeecg.modules.xslmes.entity.MesXslDryingRoom;
import org.jeecg.modules.xslmes.service.IMesXslDryingRoomService; import org.jeecg.modules.xslmes.service.IMesXslDryingRoomService;
import org.jeecg.modules.xslmes.service.IMesXslDryingRoomSlotService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -34,6 +35,9 @@ public class MesXslDryingRoomController extends JeecgController<MesXslDryingRoom
@Autowired @Autowired
private IMesXslDryingRoomService mesXslDryingRoomService; private IMesXslDryingRoomService mesXslDryingRoomService;
@Autowired
private IMesXslDryingRoomSlotService mesXslDryingRoomSlotService;
@Operation(summary = "MES烘胶房管理-分页列表查询") @Operation(summary = "MES烘胶房管理-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<MesXslDryingRoom>> queryPageList( public Result<IPage<MesXslDryingRoom>> queryPageList(
@@ -82,6 +86,11 @@ public class MesXslDryingRoomController extends JeecgController<MesXslDryingRoom
@RequiresPermissions("mes:mes_xsl_drying_room:delete") @RequiresPermissions("mes:mes_xsl_drying_room:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) { 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); mesXslDryingRoomService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -91,6 +100,13 @@ public class MesXslDryingRoomController extends JeecgController<MesXslDryingRoom
@RequiresPermissions("mes:mes_xsl_drying_room:deleteBatch") @RequiresPermissions("mes:mes_xsl_drying_room:deleteBatch")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { 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(","))); mesXslDryingRoomService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }

193
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomSlotController.java Normal file
View File

@@ -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】烘胶房库位保存前校验-----------
}

67
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingRoomSlot.java Normal file
View File

@@ -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;
}

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomSlotMapper.java Normal file
View File

@@ -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> {}

18
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingRoomSlotService.java Normal file
View File

@@ -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);
}

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java
View File

@@ -13,6 +13,7 @@ import org.jeecg.modules.xslmes.entity.MesXslDryingCategoryMaterial;
import org.jeecg.modules.xslmes.mapper.MesXslDryingCategoryMapper; import org.jeecg.modules.xslmes.mapper.MesXslDryingCategoryMapper;
import org.jeecg.modules.xslmes.mapper.MesXslDryingCategoryMaterialMapper; import org.jeecg.modules.xslmes.mapper.MesXslDryingCategoryMaterialMapper;
import org.jeecg.modules.xslmes.service.IMesXslDryingCategoryService; import org.jeecg.modules.xslmes.service.IMesXslDryingCategoryService;
import org.jeecg.modules.xslmes.service.IMesXslDryingRoomSlotService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,9 @@ public class MesXslDryingCategoryServiceImpl extends ServiceImpl<MesXslDryingCat
@Autowired @Autowired
private MesXslDryingCategoryMaterialMapper mesXslDryingCategoryMaterialMapper; private MesXslDryingCategoryMaterialMapper mesXslDryingCategoryMaterialMapper;
@Autowired
private IMesXslDryingRoomSlotService mesXslDryingRoomSlotService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList) { public void saveMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList) {
@@ -58,6 +62,11 @@ public class MesXslDryingCategoryServiceImpl extends ServiceImpl<MesXslDryingCat
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void delMain(String id) { 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( mesXslDryingCategoryMaterialMapper.delete(
new LambdaQueryWrapper<MesXslDryingCategoryMaterial>() new LambdaQueryWrapper<MesXslDryingCategoryMaterial>()
.eq(MesXslDryingCategoryMaterial::getDryingCategoryId, id)); .eq(MesXslDryingCategoryMaterial::getDryingCategoryId, id));

70
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingRoomSlotServiceImpl.java Normal file
View File

@@ -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】烘胶房库位同烘胶房内名称不可重复；引用计数-----------
}

69
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_162__mes_xsl_drying_room_slot.sql Normal file
View File

@@ -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;

56
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.api.ts Normal file
View File

@@ -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 });
};

85
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlot.data.ts Normal file
View File

@@ -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' },
};

135
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/MesXslDryingRoomSlotList.vue Normal file
View File

@@ -0,0 +1,135 @@
<template>
<div>
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<template #tableTitle>
<a-button
type="primary"
v-auth="'mes:mes_xsl_drying_room_slot:add'"
@click="handleAdd"
preIcon="ant-design:plus-outlined"
>
新增
</a-button>
<a-button
type="primary"
v-auth="'mes:mes_xsl_drying_room_slot:exportXls'"
preIcon="ant-design:export-outlined"
@click="onExportXls"
>
导出
</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined" />
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'mes:mes_xsl_drying_room_slot:deleteBatch'">
批量操作
<Icon icon="mdi:chevron-down" />
</a-button>
</a-dropdown>
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<template #action="{ record }">
<TableAction
:actions="[
{ label: '编辑', onClick: handleEdit.bind(null, record), auth: 'mes:mes_xsl_drying_room_slot:edit' },
]"
:dropDownActions="getDropDownAction(record)"
/>
</template>
</BasicTable>
<MesXslDryingRoomSlotModal @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" name="xslmes-mesXslDryingRoomSlot" setup>
import { reactive } from 'vue';
import { BasicTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import Icon from '/@/components/Icon';
import MesXslDryingRoomSlotModal from './components/MesXslDryingRoomSlotModal.vue';
import { columns, searchFormSchema, superQuerySchema } from './MesXslDryingRoomSlot.data';
import { list, deleteOne, batchDelete, getExportUrl } from './MesXslDryingRoomSlot.api';
const queryParam = reactive<any>({});
const [registerModal, { openModal }] = useModal();
const { tableContext, onExportXls } = useListPage({
tableProps: {
title: '烘胶房库位',
api: list,
columns,
canResize: true,
formConfig: {
schemas: searchFormSchema,
labelWidth: 100,
autoSubmitOnEnter: true,
showAdvancedButton: true,
},
actionColumn: {
width: 200,
fixed: 'right',
slots: { customRender: 'action' },
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '烘胶房库位',
url: getExportUrl,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
const superQueryConfig = reactive(superQuerySchema);
function handleSuperQuery(params) {
Object.keys(params).forEach((k) => {
queryParam[k] = params[k];
});
reload();
}
function handleAdd() {
openModal(true, { isUpdate: false, showFooter: true });
}
function handleEdit(record: Recordable) {
openModal(true, { record, isUpdate: true, showFooter: true });
}
function handleDetail(record: Recordable) {
openModal(true, { record, isUpdate: true, showFooter: false });
}
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
function handleSuccess() {
selectedRowKeys.value = [];
reload();
}
function getDropDownAction(record) {
return [
{ label: '详情', onClick: handleDetail.bind(null, record) },
{
label: '删除',
popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
auth: 'mes:mes_xsl_drying_room_slot:delete',
},
];
}
</script>

88
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingCategorySelectModal.vue Normal file
View File

@@ -0,0 +1,88 @@
<template>
<BasicModal v-bind="$attrs" title="选择烘胶分类" :width="900" @register="registerModal" @ok="handleOk">
<BasicTable @register="registerTable" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicTable, useTable } from '/@/components/Table';
import { list, queryById } from '/@/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.api';
const emit = defineEmits(['register', 'select']);
const selectedRow = ref<Recordable | null>(null);
function handleSelectionChange(_keys: string[], rows: Recordable[]) {
selectedRow.value = rows?.[0] ?? null;
}
const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
api: list,
columns: [
{ title: '分类名称', dataIndex: 'categoryName', width: 220 },
{ title: '创建人', dataIndex: 'createBy', width: 100 },
{ title: '创建时间', dataIndex: 'createTime', width: 165 },
],
rowKey: 'id',
useSearchForm: true,
formConfig: {
labelWidth: 90,
schemas: [{ label: '分类名称', field: 'categoryName', component: 'Input', colProps: { span: 8 } }],
},
pagination: { pageSize: 10 },
canResize: false,
showIndexColumn: false,
immediate: true,
rowSelection: {
type: 'radio',
columnWidth: 48,
onChange: handleSelectionChange,
},
clickToRowSelect: true,
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
selectedRow.value = null;
clearSelectedRowKeys?.();
setModalProps({ confirmLoading: false });
const cid = data?.dryingCategoryId as string | undefined;
if (cid) {
setSelectedRowKeys?.([cid]);
try {
const raw = await queryById({ id: cid });
const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
if (row) {
selectedRow.value = row;
}
} catch {
// 忽略
}
}
reload();
});
async function handleOk() {
const keys = (getSelectRowKeys?.() || []) as string[];
let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
if (!row && keys.length) {
try {
const raw = await queryById({ id: keys[0] });
row = (raw as any)?.id != null ? raw : (raw as any)?.result;
} catch {
// 忽略
}
}
if (!row?.id) {
emit('select', { dryingCategoryId: '', categoryName: '' });
closeModal();
return;
}
emit('select', {
dryingCategoryId: row.id,
categoryName: row.categoryName || '',
});
closeModal();
}
</script>

92
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSelectModal.vue Normal file
View File

@@ -0,0 +1,92 @@
<template>
<BasicModal v-bind="$attrs" title="选择烘胶房" :width="900" @register="registerModal" @ok="handleOk">
<BasicTable @register="registerTable" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicTable, useTable } from '/@/components/Table';
import { list, queryById } from '/@/views/xslmes/mesXslDryingRoom/MesXslDryingRoom.api';
const emit = defineEmits(['register', 'select']);
const selectedRow = ref<Recordable | null>(null);
function handleSelectionChange(_keys: string[], rows: Recordable[]) {
selectedRow.value = rows?.[0] ?? null;
}
const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
api: list,
columns: [
{ title: '烘胶房编码', dataIndex: 'roomCode', width: 140 },
{ title: '烘胶房名称', dataIndex: 'roomName', width: 180 },
{ title: '烘胶开始日期', dataIndex: 'dryingStartMd', width: 120 },
{ title: '烘胶结束日期', dataIndex: 'dryingEndMd', width: 120 },
],
rowKey: 'id',
useSearchForm: true,
formConfig: {
labelWidth: 100,
schemas: [
{ label: '烘胶房编码', field: 'roomCode', component: 'Input', colProps: { span: 8 } },
{ label: '烘胶房名称', field: 'roomName', component: 'Input', colProps: { span: 8 } },
],
},
pagination: { pageSize: 10 },
canResize: false,
showIndexColumn: false,
immediate: true,
rowSelection: {
type: 'radio',
columnWidth: 48,
onChange: handleSelectionChange,
},
clickToRowSelect: true,
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
selectedRow.value = null;
clearSelectedRowKeys?.();
setModalProps({ confirmLoading: false });
const rid = data?.dryingRoomId as string | undefined;
if (rid) {
setSelectedRowKeys?.([rid]);
try {
const raw = await queryById({ id: rid });
const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
if (row) {
selectedRow.value = row;
}
} catch {
// 忽略
}
}
reload();
});
async function handleOk() {
const keys = (getSelectRowKeys?.() || []) as string[];
let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
if (!row && keys.length) {
try {
const raw = await queryById({ id: keys[0] });
row = (raw as any)?.id != null ? raw : (raw as any)?.result;
} catch {
// 忽略
}
}
if (!row?.id) {
emit('select', { dryingRoomId: '', dryingRoomName: '' });
closeModal();
return;
}
emit('select', {
dryingRoomId: row.id,
dryingRoomName: row.roomName || '',
});
closeModal();
}
</script>

116
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoomSlot/components/MesXslDryingRoomSlotModal.vue Normal file
View File

@@ -0,0 +1,116 @@
<template>
<BasicModal
v-bind="$attrs"
destroyOnClose
:title="title"
width="720px"
@register="registerModal"
@ok="handleSubmit"
>
<BasicForm @register="registerForm">
<template #dryingRoomPicker="{ model, field }">
<a-input-group compact style="display: flex; width: 100%">
<a-input v-model:value="model[field]" read-only placeholder="请选择烘胶房" style="flex: 1" />
<a-button type="primary" :disabled="isDetail" @click="openRoomSelect">选择</a-button>
<a-button v-if="model.dryingRoomId && !isDetail" @click="clearRoom(model)">清除</a-button>
</a-input-group>
</template>
<template #dryingCategoryPicker="{ model, field }">
<a-input-group compact style="display: flex; width: 100%">
<a-input v-model:value="model[field]" read-only placeholder="请选择烘胶分类" style="flex: 1" />
<a-button type="primary" :disabled="isDetail" @click="openCategorySelect">选择</a-button>
<a-button v-if="model.dryingCategoryId && !isDetail" @click="clearCategory(model)">清除</a-button>
</a-input-group>
</template>
</BasicForm>
<MesXslDryingRoomSelectModal @register="registerRoomModal" @select="onRoomSelect" />
<MesXslDryingCategorySelectModal @register="registerCategoryModal" @select="onCategorySelect" />
</BasicModal>
</template>
<script lang="ts" setup>
import { computed, ref, unref } from 'vue';
import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from '../MesXslDryingRoomSlot.data';
import { saveOrUpdate, queryById } from '../MesXslDryingRoomSlot.api';
import MesXslDryingRoomSelectModal from './MesXslDryingRoomSelectModal.vue';
import MesXslDryingCategorySelectModal from './MesXslDryingCategorySelectModal.vue';
const emit = defineEmits(['register', 'success']);
const isUpdate = ref(false);
const isDetail = ref(false);
const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
labelWidth: 110,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { span: 24 },
});
const [registerRoomModal, { openModal: openRoomModal }] = useModal();
const [registerCategoryModal, { openModal: openCategoryModal }] = useModal();
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
await resetFields();
setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
isUpdate.value = !!data?.isUpdate;
isDetail.value = !data?.showFooter;
setProps({ disabled: !data?.showFooter });
if (unref(isUpdate) && data?.record?.id) {
const raw = await queryById({ id: data.record.id });
const m = (raw as any)?.id != null ? raw : (raw as any)?.result ?? raw;
await setFieldsValue({ ...m });
}
});
const title = computed(() =>
!unref(isUpdate) ? '新增烘胶房库位' : unref(isDetail) ? '烘胶房库位详情' : '编辑烘胶房库位',
);
function openRoomSelect() {
const values = getFieldsValue();
openRoomModal(true, { dryingRoomId: values?.dryingRoomId });
}
function openCategorySelect() {
const values = getFieldsValue();
openCategoryModal(true, { dryingCategoryId: values?.dryingCategoryId });
}
function onRoomSelect(payload: Recordable) {
setFieldsValue({
dryingRoomId: payload?.dryingRoomId || '',
dryingRoomName: payload?.dryingRoomName || '',
});
}
function onCategorySelect(payload: Recordable) {
setFieldsValue({
dryingCategoryId: payload?.dryingCategoryId || '',
categoryName: payload?.categoryName || '',
});
}
function clearRoom(model: Recordable) {
model.dryingRoomId = '';
model.dryingRoomName = '';
}
function clearCategory(model: Recordable) {
model.dryingCategoryId = '';
model.categoryName = '';
}
async function handleSubmit() {
try {
const values = await validate();
setModalProps({ confirmLoading: true });
await saveOrUpdate(values, unref(isUpdate));
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>