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-05-14 16:21:41 +08:00
parent 210f3614ea
commit 7b573cebdd
15 changed files with 829 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,210 @@
package org.jeecg.modules.xslmes.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
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.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
/**
* MES 工序管理
*/
@Tag(name = "MES工序管理")
@RestController
@RequestMapping("/xslmes/mesXslProcessOperation")
@Slf4j
public class MesXslProcessOperationController extends JeecgController<MesXslProcessOperation, IMesXslProcessOperationService> {
@Autowired
private IMesXslProcessOperationService mesXslProcessOperationService;
@Operation(summary = "MES工序管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslProcessOperation>> queryPageList(
MesXslProcessOperation model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslProcessOperation> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
Page<MesXslProcessOperation> page = new Page<>(pageNo, pageSize);
IPage<MesXslProcessOperation> pageList = mesXslProcessOperationService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES工序管理-添加")
@Operation(summary = "MES工序管理-添加")
@RequiresPermissions("mes:mes_process_operation:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslProcessOperation model) {
//update-begin---author:jiangxh ---date:20260514 for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
if (oConvertUtils.isEmpty(model.getOperationCode()) || oConvertUtils.isEmpty(model.getOperationName())) {
return Result.error("工序编码、工序名称不能为空");
}
String code = model.getOperationCode().trim();
model.setOperationCode(code);
if (mesXslProcessOperationService.isOperationCodeDuplicated(code, null, model)) {
return Result.error("工序编码已存在");
}
//update-end---author:jiangxh ---date:20260514 for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
mesXslProcessOperationService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES工序管理-编辑")
@Operation(summary = "MES工序管理-编辑")
@RequiresPermissions("mes:mes_process_operation:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslProcessOperation model) {
//update-begin---author:jiangxh ---date:20260514 for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
if (oConvertUtils.isEmpty(model.getOperationCode()) || oConvertUtils.isEmpty(model.getOperationName())) {
return Result.error("工序编码、工序名称不能为空");
}
String code = model.getOperationCode().trim();
model.setOperationCode(code);
if (mesXslProcessOperationService.isOperationCodeDuplicated(code, model.getId(), model)) {
return Result.error("工序编码已存在");
}
//update-end---author:jiangxh ---date:20260514 for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
mesXslProcessOperationService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES工序管理-删除")
@Operation(summary = "MES工序管理-通过id删除")
@RequiresPermissions("mes:mes_process_operation:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslProcessOperationService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES工序管理-批量删除")
@Operation(summary = "MES工序管理-批量删除")
@RequiresPermissions("mes:mes_process_operation:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslProcessOperationService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES工序管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslProcessOperation> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslProcessOperation entity = mesXslProcessOperationService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "校验工序编码是否重复（仅未删除数据；同租户，dataId 为编辑时当前主键）")
@GetMapping(value = "/checkOperationCode")
public Result<String> checkOperationCode(
@RequestParam(name = "operationCode", required = true) String operationCode,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(operationCode) || operationCode.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslProcessOperation ctx = new MesXslProcessOperation();
if (mesXslProcessOperationService.isOperationCodeDuplicated(operationCode.trim(), dataId, ctx)) {
return Result.error("该工序编码已存在");
}
return Result.OK("该值可用！");
}
@RequiresPermissions("mes:mes_process_operation:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslProcessOperation model) {
return super.exportXls(request, model, MesXslProcessOperation.class, "MES工序管理");
}
@RequiresPermissions("mes:mes_process_operation:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
//update-begin---author:jiangxh ---date:20260514 for：【MES】工序导入：文件内编码不重复，且与库中未删除数据不重复-----------
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> ent : fileMap.entrySet()) {
MultipartFile file = ent.getValue();
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<MesXslProcessOperation> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslProcessOperation.class, params);
if (list == null) {
list = List.of();
}
Set<String> codesInFile = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
MesXslProcessOperation row = list.get(i);
int rowNo = i + 1;
if (row == null) {
return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
}
String code = row.getOperationCode();
if (code != null) {
code = code.trim();
}
if (oConvertUtils.isEmpty(code)) {
return Result.error("文件导入失败：第 " + rowNo + " 条工序编码不能为空");
}
row.setOperationCode(code);
if (oConvertUtils.isEmpty(row.getOperationName()) || row.getOperationName().trim().isEmpty()) {
return Result.error("文件导入失败：第 " + rowNo + " 条工序名称不能为空");
}
row.setOperationName(row.getOperationName().trim());
if (!codesInFile.add(code)) {
return Result.error("文件导入失败：工序编码【" + code + "】在导入文件中重复");
}
if (mesXslProcessOperationService.isOperationCodeDuplicated(code, null, row)) {
return Result.error("文件导入失败：第 " + rowNo + " 条工序编码【" + code + "】已存在（未删除数据中不允许重复）");
}
}
long start = System.currentTimeMillis();
mesXslProcessOperationService.saveBatch(list);
log.info("工序Excel导入完成，耗时{}ms，行数={}", System.currentTimeMillis() - start, list.size());
return Result.ok("文件导入成功！数据行数：" + list.size());
} catch (Exception e) {
String msg = e.getMessage();
log.error(msg, e);
if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
return Result.error("文件导入失败: 存在重复数据（工序编码在未删除数据中需唯一）");
}
return Result.error("文件导入失败:" + e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
log.error(e.getMessage(), e);
}
}
}
//update-end---author:jiangxh ---date:20260514 for：【MES】工序导入：文件内编码不重复，且与库中未删除数据不重复-----------
return Result.error("文件导入失败！");
}
}

54
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslProcessOperation.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.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/**
* MES 工序管理（表 mes_process_operation）
*/
@Data
@TableName("mes_process_operation")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES工序管理")
public class MesXslProcessOperation implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "工序编码", width = 20)
@Schema(description = "工序编码（同租户内唯一）")
private String operationCode;
@Excel(name = "工序名称", width = 24)
@Schema(description = "工序名称")
private String operationName;
@Excel(name = "备注", width = 28)
@Schema(description = "备注")
private String remark;
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;
}

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

@@ -0,0 +1,11 @@
package org.jeecg.modules.xslmes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
/**
* MES 工序管理 Mapper
*/
@Mapper
public interface MesXslProcessOperationMapper extends BaseMapper<MesXslProcessOperation> {}

2
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
View File

@@ -1,5 +1,5 @@
/**
* MES XSL 业务模块（Maven 工程名：jeecg-module-xslmes）。
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）等。
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）等。
*/
package org.jeecg.modules.xslmes;

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

@@ -0,0 +1,16 @@
package org.jeecg.modules.xslmes.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
public interface IMesXslProcessOperationService extends IService<MesXslProcessOperation> {
/**
* 工序编码是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与 MybatisInterceptor 注入逻辑一致。
*
* @param operationCode 工序编码（已 trim 后传入）
* @param excludeId 编辑时排除自身主键，新增传 null
* @param context 当前提交的实体（可取 tenantId；可为 null）
*/
boolean isOperationCodeDuplicated(String operationCode, String excludeId, MesXslProcessOperation context);
}

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

@@ -0,0 +1,65 @@
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.config.TenantContext;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
import org.jeecg.modules.xslmes.mapper.MesXslProcessOperationMapper;
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
import org.springframework.stereotype.Service;
@Service
public class MesXslProcessOperationServiceImpl extends ServiceImpl<MesXslProcessOperationMapper, MesXslProcessOperation>
implements IMesXslProcessOperationService {
//update-begin---author:jiangxh ---date:20260514 for：【MES】工序编码同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
@Override
public boolean isOperationCodeDuplicated(String operationCode, String excludeId, MesXslProcessOperation context) {
if (oConvertUtils.isEmpty(operationCode)) {
return false;
}
Integer tenantId = resolveTenantId(context);
LambdaQueryWrapper<MesXslProcessOperation> w = new LambdaQueryWrapper<>();
w.eq(MesXslProcessOperation::getOperationCode, operationCode.trim());
// 仅与「未删除」数据判重：del_flag=0 或历史空值视为正常行，排除已删除（del_flag=1）
w.and(
q ->
q.eq(MesXslProcessOperation::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslProcessOperation::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslProcessOperation::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslProcessOperation::getTenantId, tenantId);
}
return this.count(w) > 0;
}
/** 与 MybatisInterceptor 注入 tenant_id 的取值顺序尽量一致，避免前端未传 tenantId 时查不到已存在数据 */
private static Integer resolveTenantId(MesXslProcessOperation context) {
if (context != null && context.getTenantId() != null) {
return context.getTenantId();
}
String ts = TenantContext.getTenant();
if (oConvertUtils.isEmpty(ts)) {
try {
ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
} catch (Exception ignored) {
}
}
if (oConvertUtils.isEmpty(ts)) {
return null;
}
try {
return Integer.parseInt(ts.trim());
} catch (NumberFormatException e) {
return null;
}
}
//update-end---author:jiangxh ---date:20260514 for：【MES】工序编码同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
}