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 09:57:58 +08:00
parent 2240e58355
commit 99987d9d2e
26 changed files with 1928 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1180,3 +1180,42 @@ jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/components/CollectModal.vue
jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/mcsSyncConfig.api.ts
jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/mcsSyncConfig.data.ts
-- author:GHT---date:20260617--for: 【MES上辅机】采集模式：全量/时间/增量 + 批量增量写入(应对大表) ---
-- author:jiangxh---date:20260702--for: 【MES】烘胶房管理（MES基础资料，无导入导出） ---
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingRoom.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomMapper.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingRoomService.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingRoomServiceImpl.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingRoomController.java
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_159__mes_xsl_drying_room.sql
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoom/MesXslDryingRoomList.vue
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoom/MesXslDryingRoom.data.ts
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoom/MesXslDryingRoom.api.ts
jeecgboot-vue3/src/views/xslmes/mesXslDryingRoom/components/MesXslDryingRoomModal.vue
-- author:jiangxh---date:20260702--for: 【MES】烘胶房管理（MES基础资料，无导入导出） ---
-- author:jiangxh---date:20260702--for: 【MES】烘胶分类管理（主子表+选择物料弹窗，无导入导出） ---
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingCategory.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingCategoryMaterial.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingCategoryMapper.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingCategoryMaterialMapper.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDryingCategoryService.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDryingCategoryServiceImpl.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingCategoryController.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslDryingCategoryPage.java
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_160__mes_xsl_drying_category.sql
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategoryList.vue
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.data.ts
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.api.ts
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/components/MesXslDryingCategoryModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/components/MesXslDryingCategoryMixerMaterialSelectModal.vue
-- author:jiangxh---date:20260702--for: 【MES】烘胶分类管理（主子表+选择物料弹窗，无导入导出） ---
-- author:jiangxh---date:20260702--for: 【MES】烘胶分类管理补充导出功能 ---
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDryingCategory.java
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDryingCategoryController.java
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_160__mes_xsl_drying_category.sql
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_161__mes_xsl_drying_category_export.sql
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategoryList.vue
jeecgboot-vue3/src/views/xslmes/mesXslDryingCategory/MesXslDryingCategory.api.ts
-- author:jiangxh---date:20260702--for: 【MES】烘胶分类管理补充导出功能 ---

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

@@ -0,0 +1,229 @@
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.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
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.mes.material.entity.MesMixerMaterial;
import org.jeecg.modules.mes.material.service.IMesMixerMaterialService;
import org.jeecg.modules.xslmes.entity.MesXslDryingCategory;
import org.jeecg.modules.xslmes.entity.MesXslDryingCategoryMaterial;
import org.jeecg.modules.xslmes.service.IMesXslDryingCategoryService;
import org.jeecg.modules.xslmes.vo.MesXslDryingCategoryPage;
import org.springframework.beans.BeanUtils;
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/mesXslDryingCategory")
@Slf4j
public class MesXslDryingCategoryController
extends JeecgController<MesXslDryingCategory, IMesXslDryingCategoryService> {
/** 母炼胶、终炼胶、塑炼胶（塑料胶）大类 id，见 V3.9.2_35__mes_xsl_material_category_tree.sql */
private static final Set<String> ALLOWED_MAJOR_CATEGORY_IDS =
Set.of("1993000000000000104", "1993000000000000105", "1993000000000000103");
@Autowired
private IMesXslDryingCategoryService mesXslDryingCategoryService;
@Autowired
private IMesMixerMaterialService mesMixerMaterialService;
@Operation(summary = "MES烘胶分类管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslDryingCategory>> queryPageList(
MesXslDryingCategory model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslDryingCategory> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<MesXslDryingCategory> page = new Page<>(pageNo, pageSize);
IPage<MesXslDryingCategory> pageList = mesXslDryingCategoryService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES烘胶分类管理-添加")
@Operation(summary = "MES烘胶分类管理-添加")
@RequiresPermissions("mes:mes_xsl_drying_category:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslDryingCategoryPage page) {
MesXslDryingCategory main = new MesXslDryingCategory();
BeanUtils.copyProperties(page, main);
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶分类保存校验：名称唯一、明细物料大类限制-----------
String err = validateForSave(main, page.getMaterialList(), null);
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶分类保存校验：名称唯一、明细物料大类限制-----------
mesXslDryingCategoryService.saveMain(main, page.getMaterialList());
return Result.OK("添加成功！");
}
@AutoLog(value = "MES烘胶分类管理-编辑")
@Operation(summary = "MES烘胶分类管理-编辑")
@RequiresPermissions("mes:mes_xsl_drying_category:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslDryingCategoryPage page) {
MesXslDryingCategory main = new MesXslDryingCategory();
BeanUtils.copyProperties(page, main);
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶分类保存校验：名称唯一、明细物料大类限制-----------
String err = validateForSave(main, page.getMaterialList(), main.getId());
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶分类保存校验：名称唯一、明细物料大类限制-----------
mesXslDryingCategoryService.updateMain(main, page.getMaterialList());
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES烘胶分类管理-删除")
@Operation(summary = "MES烘胶分类管理-通过id删除")
@RequiresPermissions("mes:mes_xsl_drying_category:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslDryingCategoryService.delMain(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES烘胶分类管理-批量删除")
@Operation(summary = "MES烘胶分类管理-批量删除")
@RequiresPermissions("mes:mes_xsl_drying_category:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslDryingCategoryService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES烘胶分类管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslDryingCategory> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslDryingCategory entity = mesXslDryingCategoryService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "MES烘胶分类管理-查询物料明细")
@GetMapping(value = "/queryMaterialListByCategoryId")
public Result<List<MesXslDryingCategoryMaterial>> queryMaterialListByCategoryId(
@RequestParam(name = "id", required = true) String id) {
return Result.OK(mesXslDryingCategoryService.selectMaterialsByCategoryId(id));
}
@Operation(summary = "校验分类名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
@GetMapping(value = "/checkCategoryName")
public Result<String> checkCategoryName(
@RequestParam(name = "categoryName", required = true) String categoryName,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(categoryName) || categoryName.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslDryingCategory ctx = new MesXslDryingCategory();
if (mesXslDryingCategoryService.isCategoryNameDuplicated(categoryName.trim(), dataId, ctx)) {
return Result.error("分类名称不能重复");
}
return Result.OK("该值可用！");
}
@RequiresPermissions("mes:mes_xsl_drying_category:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslDryingCategory model) {
return super.exportXls(request, model, MesXslDryingCategory.class, "烘胶分类管理");
}
@Operation(summary = "MES烘胶分类-可选密炼物料分页（大类：母炼胶/终炼胶/塑炼胶）")
@GetMapping(value = "/listSelectableMixerMaterials")
public Result<IPage<MesMixerMaterial>> listSelectableMixerMaterials(
MesMixerMaterial model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesMixerMaterial> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
queryWrapper.in("major_category_id", ALLOWED_MAJOR_CATEGORY_IDS);
queryWrapper.and(
q -> q.eq("del_flag", CommonConstant.DEL_FLAG_0).or().isNull("del_flag"));
queryWrapper.orderByAsc("material_code");
Page<MesMixerMaterial> page = new Page<>(pageNo, pageSize);
IPage<MesMixerMaterial> pageList = mesMixerMaterialService.page(page, queryWrapper);
return Result.OK(pageList);
}
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶分类保存前校验：名称唯一、明细物料不重复且大类受限-----------
private String validateForSave(
MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList, String excludeId) {
if (main == null) {
return "参数不能为空";
}
if (oConvertUtils.isEmpty(main.getCategoryName()) || main.getCategoryName().trim().isEmpty()) {
return "分类名称不能为空";
}
String categoryName = main.getCategoryName().trim();
main.setCategoryName(categoryName);
if (mesXslDryingCategoryService.isCategoryNameDuplicated(categoryName, excludeId, main)) {
return "分类名称不能重复";
}
if (materialList == null || materialList.isEmpty()) {
return "请通过「选择物料」至少添加一条明细";
}
Set<String> materialIds = new HashSet<>();
int sort = 0;
for (int i = 0; i < materialList.size(); i++) {
MesXslDryingCategoryMaterial line = materialList.get(i);
if (line == null) {
continue;
}
int rowNo = i + 1;
if (oConvertUtils.isEmpty(line.getMixerMaterialId())) {
return "第 " + rowNo + " 行未选择物料";
}
String materialId = line.getMixerMaterialId().trim();
if (!materialIds.add(materialId)) {
return "第 " + rowNo + " 行物料与前面行重复，同一分类中物料不能重复";
}
MesMixerMaterial material = mesMixerMaterialService.getById(materialId);
if (material == null || isDeleted(material.getDelFlag())) {
return "第 " + rowNo + " 行物料不存在或已删除";
}
String majorId = material.getMajorCategoryId();
if (oConvertUtils.isEmpty(majorId) || !ALLOWED_MAJOR_CATEGORY_IDS.contains(majorId.trim())) {
return "第 " + rowNo + " 行物料大类不在允许范围（母炼胶/终炼胶/塑炼胶）";
}
line.setMixerMaterialId(materialId);
line.setMaterialCode(material.getMaterialCode());
line.setMaterialName(material.getMaterialName());
line.setMaterialDesc(material.getMaterialDesc());
line.setSortNo(sort++);
}
if (materialIds.isEmpty()) {
return "请通过「选择物料」至少添加一条明细";
}
return null;
}
private static boolean isDeleted(Integer delFlag) {
return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶分类保存前校验：名称唯一、明细物料不重复且大类受限-----------
}

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

@@ -0,0 +1,184 @@
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.util.Arrays;
import java.util.regex.Pattern;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.xslmes.entity.MesXslDryingRoom;
import org.jeecg.modules.xslmes.service.IMesXslDryingRoomService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* MES 烘胶房管理
*/
@Tag(name = "MES烘胶房管理")
@RestController
@RequestMapping("/xslmes/mesXslDryingRoom")
@Slf4j
public class MesXslDryingRoomController extends JeecgController<MesXslDryingRoom, IMesXslDryingRoomService> {
private static final Pattern MONTH_DAY_PATTERN = Pattern.compile("^(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$");
@Autowired
private IMesXslDryingRoomService mesXslDryingRoomService;
@Operation(summary = "MES烘胶房管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslDryingRoom>> queryPageList(
MesXslDryingRoom model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslDryingRoom> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
Page<MesXslDryingRoom> page = new Page<>(pageNo, pageSize);
IPage<MesXslDryingRoom> pageList = mesXslDryingRoomService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES烘胶房管理-添加")
@Operation(summary = "MES烘胶房管理-添加")
@RequiresPermissions("mes:mes_xsl_drying_room:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslDryingRoom model) {
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶房保存前校验：编码/名称唯一、月日格式-----------
String err = validateForSave(model, null);
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶房保存前校验：编码/名称唯一、月日格式-----------
mesXslDryingRoomService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES烘胶房管理-编辑")
@Operation(summary = "MES烘胶房管理-编辑")
@RequiresPermissions("mes:mes_xsl_drying_room:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslDryingRoom model) {
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶房保存前校验：编码/名称唯一、月日格式-----------
String err = validateForSave(model, model.getId());
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶房保存前校验：编码/名称唯一、月日格式-----------
mesXslDryingRoomService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES烘胶房管理-删除")
@Operation(summary = "MES烘胶房管理-通过id删除")
@RequiresPermissions("mes:mes_xsl_drying_room:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslDryingRoomService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES烘胶房管理-批量删除")
@Operation(summary = "MES烘胶房管理-批量删除")
@RequiresPermissions("mes:mes_xsl_drying_room:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslDryingRoomService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES烘胶房管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslDryingRoom> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslDryingRoom entity = mesXslDryingRoomService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "校验烘胶房编码是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
@GetMapping(value = "/checkRoomCode")
public Result<String> checkRoomCode(
@RequestParam(name = "roomCode", required = true) String roomCode,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(roomCode) || roomCode.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslDryingRoom ctx = new MesXslDryingRoom();
if (mesXslDryingRoomService.isRoomCodeDuplicated(roomCode.trim(), dataId, ctx)) {
return Result.error("烘胶房编码不能重复");
}
return Result.OK("该值可用！");
}
@Operation(summary = "校验烘胶房名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
@GetMapping(value = "/checkRoomName")
public Result<String> checkRoomName(
@RequestParam(name = "roomName", required = true) String roomName,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(roomName) || roomName.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslDryingRoom ctx = new MesXslDryingRoom();
if (mesXslDryingRoomService.isRoomNameDuplicated(roomName.trim(), dataId, ctx)) {
return Result.error("烘胶房名称不能重复");
}
return Result.OK("该值可用！");
}
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶房保存前校验-----------
private String validateForSave(MesXslDryingRoom model, String excludeId) {
if (oConvertUtils.isEmpty(model.getRoomCode()) || model.getRoomCode().trim().isEmpty()) {
return "烘胶房编码不能为空";
}
String roomCode = model.getRoomCode().trim();
model.setRoomCode(roomCode);
if (mesXslDryingRoomService.isRoomCodeDuplicated(roomCode, excludeId, model)) {
return "烘胶房编码不能重复";
}
if (oConvertUtils.isEmpty(model.getRoomName()) || model.getRoomName().trim().isEmpty()) {
return "烘胶房名称不能为空";
}
String roomName = model.getRoomName().trim();
model.setRoomName(roomName);
if (mesXslDryingRoomService.isRoomNameDuplicated(roomName, excludeId, model)) {
return "烘胶房名称不能重复";
}
String startMd = normalizeMonthDay(model.getDryingStartMd(), "烘胶开始日期");
if (startMd == null) {
return "烘胶开始日期格式无效，须为 MM-DD";
}
model.setDryingStartMd(startMd);
String endMd = normalizeMonthDay(model.getDryingEndMd(), "烘胶结束日期");
if (endMd == null) {
return "烘胶结束日期格式无效，须为 MM-DD";
}
model.setDryingEndMd(endMd);
return null;
}
private String normalizeMonthDay(String value, String fieldLabel) {
if (oConvertUtils.isEmpty(value) || value.trim().isEmpty()) {
return null;
}
String md = value.trim();
if (md.length() >= 10 && md.charAt(4) == '-') {
md = md.substring(5, 10);
}
if (!MONTH_DAY_PATTERN.matcher(md).matches()) {
log.warn("{}格式无效: {}", fieldLabel, value);
return null;
}
return md;
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶房保存前校验-----------
}

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

@@ -0,0 +1,54 @@
package org.jeecg.modules.xslmes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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 java.util.List;
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_category）
*/
@Data
@TableName("mes_xsl_drying_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES烘胶分类管理")
public class MesXslDryingCategory implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "分类名称", width = 24)
@Schema(description = "分类名称（同租户未删除数据中唯一）")
private String categoryName;
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;
@TableField(exist = false)
@Schema(description = "物料明细")
private List<MesXslDryingCategoryMaterial> materialList;
}

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

@@ -0,0 +1,54 @@
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_category_material）
*/
@Data
@TableName("mes_xsl_drying_category_material")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES烘胶分类物料明细")
public class MesXslDryingCategoryMaterial implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Schema(description = "主表主键 mes_xsl_drying_category.id")
private String dryingCategoryId;
@Schema(description = "密炼物料主键 mes_mixer_material.id")
private String mixerMaterialId;
@Schema(description = "物料编码冗余")
private String materialCode;
@Schema(description = "物料名称冗余")
private String materialName;
@Schema(description = "物料描述冗余")
private String materialDesc;
private Integer sortNo;
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;
}

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

@@ -0,0 +1,53 @@
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_room）
*/
@Data
@TableName("mes_xsl_drying_room")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES烘胶房管理")
public class MesXslDryingRoom implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Schema(description = "烘胶房编码（同租户未删除数据中唯一）")
private String roomCode;
@Schema(description = "烘胶房名称（同租户未删除数据中唯一）")
private String roomName;
@Schema(description = "烘胶开始日期（月日，格式 MM-DD，不含年份）")
private String dryingStartMd;
@Schema(description = "烘胶结束日期（月日，格式 MM-DD，不含年份）")
private String dryingEndMd;
private Integer tenantId;
private String sysOrgCode;
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;
private Integer delFlag;
}

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingCategoryMapper.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.MesXslDryingCategory;
/**
* MES 烘胶分类管理
*/
public interface MesXslDryingCategoryMapper extends BaseMapper<MesXslDryingCategory> {}

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingCategoryMaterialMapper.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.MesXslDryingCategoryMaterial;
/**
* MES 烘胶分类物料明细
*/
public interface MesXslDryingCategoryMaterialMapper extends BaseMapper<MesXslDryingCategoryMaterial> {}

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDryingRoomMapper.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.MesXslDryingRoom;
/**
* MES 烘胶房管理
*/
public interface MesXslDryingRoomMapper extends BaseMapper<MesXslDryingRoom> {}

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

@@ -0,0 +1,23 @@
package org.jeecg.modules.xslmes.service;
import com.baomidou.mybatisplus.extension.service.IService;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import org.jeecg.modules.xslmes.entity.MesXslDryingCategory;
import org.jeecg.modules.xslmes.entity.MesXslDryingCategoryMaterial;
public interface IMesXslDryingCategoryService extends IService<MesXslDryingCategory> {
void saveMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList);
void updateMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList);
void delMain(String id);
void delBatchMain(Collection<? extends Serializable> idList);
List<MesXslDryingCategoryMaterial> selectMaterialsByCategoryId(String categoryId);
boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslDryingCategory context);
}

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

@@ -0,0 +1,17 @@
package org.jeecg.modules.xslmes.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.xslmes.entity.MesXslDryingRoom;
public interface IMesXslDryingRoomService extends IService<MesXslDryingRoom> {
/**
* 烘胶房编码是否已被占用（仅统计未删除：del_flag 为 0 或 null）。
*/
boolean isRoomCodeDuplicated(String roomCode, String excludeId, MesXslDryingRoom context);
/**
* 烘胶房名称是否已被占用（仅统计未删除：del_flag 为 0 或 null）。
*/
boolean isRoomNameDuplicated(String roomName, String excludeId, MesXslDryingRoom context);
}

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

@@ -0,0 +1,106 @@
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.io.Serializable;
import java.util.Collection;
import java.util.List;
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.MesXslDryingCategory;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@Service
public class MesXslDryingCategoryServiceImpl extends ServiceImpl<MesXslDryingCategoryMapper, MesXslDryingCategory>
implements IMesXslDryingCategoryService {
@Autowired
private MesXslDryingCategoryMaterialMapper mesXslDryingCategoryMaterialMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public void saveMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList) {
this.save(main);
insertMaterials(main.getId(), materialList);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMain(MesXslDryingCategory main, List<MesXslDryingCategoryMaterial> materialList) {
this.updateById(main);
mesXslDryingCategoryMaterialMapper.delete(
new LambdaQueryWrapper<MesXslDryingCategoryMaterial>()
.eq(MesXslDryingCategoryMaterial::getDryingCategoryId, main.getId()));
insertMaterials(main.getId(), materialList);
}
private void insertMaterials(String categoryId, List<MesXslDryingCategoryMaterial> materialList) {
if (CollectionUtils.isEmpty(materialList)) {
return;
}
int sort = 0;
for (MesXslDryingCategoryMaterial line : materialList) {
line.setId(null);
line.setDryingCategoryId(categoryId);
line.setSortNo(sort++);
mesXslDryingCategoryMaterialMapper.insert(line);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delMain(String id) {
mesXslDryingCategoryMaterialMapper.delete(
new LambdaQueryWrapper<MesXslDryingCategoryMaterial>()
.eq(MesXslDryingCategoryMaterial::getDryingCategoryId, id));
this.removeById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delBatchMain(Collection<? extends Serializable> idList) {
for (Serializable id : idList) {
delMain(id.toString());
}
}
@Override
public List<MesXslDryingCategoryMaterial> selectMaterialsByCategoryId(String categoryId) {
return mesXslDryingCategoryMaterialMapper.selectList(
new LambdaQueryWrapper<MesXslDryingCategoryMaterial>()
.eq(MesXslDryingCategoryMaterial::getDryingCategoryId, categoryId)
.orderByAsc(MesXslDryingCategoryMaterial::getSortNo));
}
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶分类名称同租户不可重复；仅统计未删除-----------
@Override
public boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslDryingCategory context) {
if (oConvertUtils.isEmpty(categoryName)) {
return false;
}
Integer tenantId = MesXslTenantUtils.resolveTenantId(context != null ? context.getTenantId() : null);
LambdaQueryWrapper<MesXslDryingCategory> w = new LambdaQueryWrapper<>();
w.eq(MesXslDryingCategory::getCategoryName, categoryName.trim());
w.and(
q ->
q.eq(MesXslDryingCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslDryingCategory::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslDryingCategory::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslDryingCategory::getTenantId, tenantId);
}
return this.count(w) > 0;
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶分类名称同租户不可重复；仅统计未删除-----------
}

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

@@ -0,0 +1,53 @@
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.MesXslDryingRoom;
import org.jeecg.modules.xslmes.mapper.MesXslDryingRoomMapper;
import org.jeecg.modules.xslmes.service.IMesXslDryingRoomService;
import org.springframework.stereotype.Service;
@Service
public class MesXslDryingRoomServiceImpl extends ServiceImpl<MesXslDryingRoomMapper, MesXslDryingRoom>
implements IMesXslDryingRoomService {
//update-begin---author:jiangxh ---date:20260702 for：【MES】烘胶房编码/名称同租户不可重复；仅统计未删除-----------
@Override
public boolean isRoomCodeDuplicated(String roomCode, String excludeId, MesXslDryingRoom context) {
return isFieldDuplicated(MesXslDryingRoom::getRoomCode, roomCode, excludeId, context);
}
@Override
public boolean isRoomNameDuplicated(String roomName, String excludeId, MesXslDryingRoom context) {
return isFieldDuplicated(MesXslDryingRoom::getRoomName, roomName, excludeId, context);
}
private boolean isFieldDuplicated(
com.baomidou.mybatisplus.core.toolkit.support.SFunction<MesXslDryingRoom, String> fieldGetter,
String fieldValue,
String excludeId,
MesXslDryingRoom context) {
if (oConvertUtils.isEmpty(fieldValue)) {
return false;
}
Integer tenantId = MesXslTenantUtils.resolveTenantId(context != null ? context.getTenantId() : null);
LambdaQueryWrapper<MesXslDryingRoom> w = new LambdaQueryWrapper<>();
w.eq(fieldGetter, fieldValue.trim());
w.and(
q ->
q.eq(MesXslDryingRoom::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslDryingRoom::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslDryingRoom::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslDryingRoom::getTenantId, tenantId);
}
return this.count(w) > 0;
}
//update-end---author:jiangxh ---date:20260702 for：【MES】烘胶房编码/名称同租户不可重复；仅统计未删除-----------
}

12
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslDryingCategoryPage.java Normal file
View File

@@ -0,0 +1,12 @@
package org.jeecg.modules.xslmes.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.jeecg.modules.xslmes.entity.MesXslDryingCategory;
/**
* 烘胶分类主子保存页 VO
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class MesXslDryingCategoryPage extends MesXslDryingCategory {}