Merge branch 'main' of http://27.223.88.102:33000/chenx/qhmes
This commit is contained in:
105
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
Normal file
105
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
Normal file
@@ -0,0 +1,105 @@
|
||||
-- author:jiangxh---date:20260521--for: 【配合示方】新增配合示方主子表模块 ---
|
||||
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_91__mes_xsl_formula_spec.sql
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpecLine.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslFormulaSpecPage.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecMapper.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecLineMapper.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecService.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpecList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:jiangxh---date:20260521--for: 【配合示方】主表新增混合段1-7合计字段 ---
|
||||
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_92__mes_xsl_formula_spec_stage_total.sql
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】STEP全为A/Q时对应胶比重清零 ---
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率按密炼物料小类汇总重量% ---
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率物料小类可配置设置弹窗 ---
|
||||
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_96__mes_xsl_formula_spec_rubber_content_setting.sql
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpecSetting.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslFormulaRubberContentSettingVO.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecSettingMapper.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecSettingService.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecSettingServiceImpl.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置改用系统MES物料分类字典 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecSettingService.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecSettingServiceImpl.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置小类下拉对齐密炼物料loadTreeData加载 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置改为loadAllData加载MES物料分类全部节点 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置弹窗openModal未传data导致不加载分类 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细新增物料大类/小类展示列（不落库） ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细备注列与1-7段列宽适当缩小 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】基本信息模块改为汇总格状布局 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】基本信息改为显式表格格状布局 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】汇总与基本信息标题格增加内阴影 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细列表新增列显示/隐藏设置 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaLineColumnSetting.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细列表列设置改为保存后生效并修复勾选状态 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaLineColumnSetting.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】审批进度编制人展示真实姓名 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】编辑页A胶TOTAL PHR缺失时按明细补算回显 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】编辑打开时基本资料闪清修复 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
@@ -0,0 +1,230 @@
|
||||
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.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.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectConfigPage;
|
||||
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/mesXslEquipInspectConfig")
|
||||
@Slf4j
|
||||
public class MesXslEquipInspectConfigController
|
||||
extends JeecgController<MesXslEquipInspectConfig, IMesXslEquipInspectConfigService> {
|
||||
|
||||
private static final Set<String> CONFIG_TYPE = Set.of("inspect", "maintain");
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService;
|
||||
|
||||
@Operation(summary = "MES设备点检配置-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipInspectConfig>> queryPageList(
|
||||
MesXslEquipInspectConfig model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslEquipInspectConfig> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<MesXslEquipInspectConfig> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslEquipInspectConfig> pageList = mesXslEquipInspectConfigService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-添加")
|
||||
@Operation(summary = "MES设备点检配置-添加")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody MesXslEquipInspectConfigPage page) {
|
||||
MesXslEquipInspectConfig main = new MesXslEquipInspectConfig();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
String err = validateForSave(main, page.getLineList(), null);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
mesXslEquipInspectConfigService.saveMain(main, page.getLineList());
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-编辑")
|
||||
@Operation(summary = "MES设备点检配置-编辑")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody MesXslEquipInspectConfigPage page) {
|
||||
MesXslEquipInspectConfig main = new MesXslEquipInspectConfig();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
String err = validateForSave(main, page.getLineList(), main.getId());
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
mesXslEquipInspectConfigService.updateMain(main, page.getLineList());
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-删除")
|
||||
@Operation(summary = "MES设备点检配置-通过id删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
mesXslEquipInspectConfigService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-批量删除")
|
||||
@Operation(summary = "MES设备点检配置-批量删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
mesXslEquipInspectConfigService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@Operation(summary = "MES设备点检配置-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslEquipInspectConfig> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslEquipInspectConfig entity = mesXslEquipInspectConfigService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES设备点检配置-查询明细")
|
||||
@GetMapping(value = "/queryLineListByConfigId")
|
||||
public Result<List<MesXslEquipInspectConfigLine>> queryLineListByConfigId(
|
||||
@RequestParam(name = "id", required = true) String id) {
|
||||
return Result.OK(mesXslEquipInspectConfigService.selectLinesByConfigId(id));
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectConfig model) {
|
||||
return super.exportXls(request, model, MesXslEquipInspectConfig.class, "MES设备点检配置");
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, MesXslEquipInspectConfig.class);
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出-----------
|
||||
private String validateForSave(
|
||||
MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList, String excludeId) {
|
||||
if (main == null) {
|
||||
return "参数不能为空";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) {
|
||||
return "请选择设备台账";
|
||||
}
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId());
|
||||
if (ledger == null || isDeleted(ledger.getDelFlag())) {
|
||||
return "设备台账不存在或已删除";
|
||||
}
|
||||
main.setEquipmentName(ledger.getEquipmentName());
|
||||
main.setEquipmentCode(ledger.getEquipmentCode());
|
||||
|
||||
String configType = main.getConfigType();
|
||||
if (configType != null) {
|
||||
configType = configType.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(configType) || !CONFIG_TYPE.contains(configType)) {
|
||||
return "类型无效，请选择点检或保养";
|
||||
}
|
||||
main.setConfigType(configType);
|
||||
|
||||
if (mesXslEquipInspectConfigService.isConfigDuplicated(
|
||||
main.getEquipmentLedgerId(), configType, excludeId, main)) {
|
||||
return "该设备在此类型（点检/保养）下已存在配置，不能重复添加";
|
||||
}
|
||||
|
||||
if (lineList == null || lineList.isEmpty()) {
|
||||
return "请至少添加一条点检项目明细";
|
||||
}
|
||||
|
||||
Set<String> itemIds = new HashSet<>();
|
||||
int sort = 0;
|
||||
for (int i = 0; i < lineList.size(); i++) {
|
||||
MesXslEquipInspectConfigLine line = lineList.get(i);
|
||||
if (line == null) {
|
||||
continue;
|
||||
}
|
||||
int rowNo = i + 1;
|
||||
if (oConvertUtils.isEmpty(line.getInspectMaintainItemId())) {
|
||||
return "第 " + rowNo + " 行未选择点检及保养项目";
|
||||
}
|
||||
String itemId = line.getInspectMaintainItemId().trim();
|
||||
if (!itemIds.add(itemId)) {
|
||||
return "第 " + rowNo + " 行点检项目与前面行重复，同一配置中点检项目不能重复";
|
||||
}
|
||||
MesXslInspectMaintainItem item = mesXslInspectMaintainItemService.getById(itemId);
|
||||
if (item == null || isDeleted(item.getDelFlag())) {
|
||||
return "第 " + rowNo + " 行点检及保养项目不存在或已删除";
|
||||
}
|
||||
if (!configType.equals(item.getItemCategory())) {
|
||||
return "第 " + rowNo + " 行项目类别与配置类型不一致（配置为"
|
||||
+ ("inspect".equals(configType) ? "点检" : "保养")
|
||||
+ "）";
|
||||
}
|
||||
line.setInspectMaintainItemId(itemId);
|
||||
line.setItemCode(item.getItemCode());
|
||||
line.setItemName(item.getItemName());
|
||||
line.setItemCategory(item.getItemCategory());
|
||||
line.setItemType(item.getItemType());
|
||||
line.setEquipmentPartName(item.getEquipmentPartName());
|
||||
line.setEquipmentSubPartName(item.getEquipmentSubPartName());
|
||||
line.setInspectMethod(item.getInspectMethod());
|
||||
line.setJudgmentCriteria(item.getJudgmentCriteria());
|
||||
line.setSortNo(sort++);
|
||||
}
|
||||
if (itemIds.isEmpty()) {
|
||||
return "请至少添加一条点检项目明细";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isDeleted(Integer delFlag) {
|
||||
return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出-----------
|
||||
}
|
||||
@@ -0,0 +1,411 @@
|
||||
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.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectRecordService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.util.MesXslEquipInspectBizMsg;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateDTO;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordPage;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
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/mesXslEquipInspectRecord")
|
||||
@Slf4j
|
||||
public class MesXslEquipInspectRecordController
|
||||
extends JeecgController<MesXslEquipInspectRecord, IMesXslEquipInspectRecordService> {
|
||||
|
||||
private static final Set<String> RECORD_TYPE = Set.of("inspect", "maintain");
|
||||
private static final Set<String> INSPECT_RESULT = Set.of("pass", "fail");
|
||||
private static final Set<String> RECORD_STATUS = Set.of("pending", "done");
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectRecordService mesXslEquipInspectRecordService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
|
||||
|
||||
@Operation(summary = "MES点检保养记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipInspectRecord>> queryPageList(
|
||||
MesXslEquipInspectRecord model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslEquipInspectRecord> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<MesXslEquipInspectRecord> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslEquipInspectRecord> pageList = mesXslEquipInspectRecordService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-添加")
|
||||
@Operation(summary = "MES点检保养记录-添加")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody MesXslEquipInspectRecordPage page) {
|
||||
MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
String err = validateForSave(main, page.getLineList(), null);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
fillRecordNoIfEmpty(main);
|
||||
fillInspector(main);
|
||||
mesXslEquipInspectRecordService.saveMain(main, page.getLineList());
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-编辑")
|
||||
@Operation(summary = "MES点检保养记录-编辑")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody MesXslEquipInspectRecordPage page) {
|
||||
MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】仅待点检可录入，保存后变已点检-----------
|
||||
if (oConvertUtils.isEmpty(main.getId())) {
|
||||
return Result.error("记录主键不能为空");
|
||||
}
|
||||
MesXslEquipInspectRecord existing = mesXslEquipInspectRecordService.getById(main.getId());
|
||||
if (existing == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
if ("done".equals(existing.getRecordStatus())) {
|
||||
return Result.error("已点检记录不可修改，仅可查看");
|
||||
}
|
||||
main.setRecordStatus("done");
|
||||
String err = validateForEntry(main, page.getLineList());
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
fillInspector(main);
|
||||
mesXslEquipInspectRecordService.updateMain(main, page.getLineList());
|
||||
return Result.OK("录入成功!");
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】仅待点检可录入，保存后变已点检-----------
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-删除")
|
||||
@Operation(summary = "MES点检保养记录-通过id删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
mesXslEquipInspectRecordService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-批量删除")
|
||||
@Operation(summary = "MES点检保养记录-批量删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
mesXslEquipInspectRecordService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@Operation(summary = "MES点检保养记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslEquipInspectRecord> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslEquipInspectRecord entity = mesXslEquipInspectRecordService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES点检保养记录-查询明细")
|
||||
@GetMapping(value = "/queryLineListByRecordId")
|
||||
public Result<List<MesXslEquipInspectRecordLine>> queryLineListByRecordId(
|
||||
@RequestParam(name = "id", required = true) String id) {
|
||||
return Result.OK(mesXslEquipInspectRecordService.selectLinesByRecordId(id));
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
@AutoLog(value = "MES点检保养记录-不合格处理")
|
||||
@Operation(summary = "MES点检保养记录-不合格处理")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:edit")
|
||||
@PostMapping(value = "/handleFail")
|
||||
public Result<String> handleFail(@RequestBody MesXslEquipInspectRecordHandleDTO dto) {
|
||||
try {
|
||||
mesXslEquipInspectRecordService.handleFailRecord(dto);
|
||||
return Result.OK("处理成功!");
|
||||
} catch (IllegalArgumentException ex) {
|
||||
return Result.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
|
||||
@Operation(summary = "MES点检保养记录-生成记录编号")
|
||||
@GetMapping(value = "/generateRecordNo")
|
||||
public Result<String> generateRecordNo() {
|
||||
MesXslEquipInspectRecord ctx = new MesXslEquipInspectRecord();
|
||||
return Result.OK(mesXslEquipInspectRecordService.generateRecordNo(ctx));
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-从设备台账批量生成")
|
||||
@Operation(summary = "MES点检保养记录-从设备台账批量生成")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:add")
|
||||
@PostMapping(value = "/batchCreateFromEquipment")
|
||||
public Result<MesXslEquipInspectRecordBatchCreateResult> batchCreateFromEquipment(
|
||||
@RequestBody MesXslEquipInspectRecordBatchCreateDTO dto) {
|
||||
if (dto == null || CollectionUtils.isEmpty(dto.getEquipmentLedgerIds())) {
|
||||
return Result.error("请先选择设备");
|
||||
}
|
||||
String recordType = dto.getRecordType();
|
||||
if (recordType != null) {
|
||||
recordType = recordType.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(recordType) || !RECORD_TYPE.contains(recordType)) {
|
||||
return Result.error("类型无效，请使用点检或保养");
|
||||
}
|
||||
MesXslEquipInspectRecord inspectorCtx = new MesXslEquipInspectRecord();
|
||||
fillInspector(inspectorCtx);
|
||||
MesXslEquipInspectRecordBatchCreateResult result =
|
||||
mesXslEquipInspectRecordService.batchCreateFromEquipment(
|
||||
dto.getEquipmentLedgerIds(), recordType, inspectorCtx);
|
||||
if (result.getSuccessCount() <= 0 && !result.getFailMessages().isEmpty()) {
|
||||
return Result.error(String.join("；", result.getFailMessages()));
|
||||
}
|
||||
String msg = "成功生成 " + result.getSuccessCount() + " 条记录";
|
||||
if (!result.getFailMessages().isEmpty()) {
|
||||
msg = msg + "；" + String.join("；", result.getFailMessages());
|
||||
}
|
||||
return Result.OK(msg, result);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES点检保养记录-按设备与类型带出配置明细")
|
||||
@GetMapping(value = "/loadLinesByEquipment")
|
||||
public Result<List<MesXslEquipInspectRecordLine>> loadLinesByEquipment(
|
||||
@RequestParam(name = "equipmentLedgerId") String equipmentLedgerId,
|
||||
@RequestParam(name = "recordType") String recordType) {
|
||||
String type = recordType != null ? recordType.trim() : "";
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId) || !RECORD_TYPE.contains(type)) {
|
||||
return Result.error("请选择设备与类型（点检/保养）");
|
||||
}
|
||||
List<MesXslEquipInspectRecordLine> lines =
|
||||
mesXslEquipInspectRecordService.buildLinesFromEquipConfig(equipmentLedgerId, type);
|
||||
if (lines.isEmpty()) {
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(equipmentLedgerId);
|
||||
String equipName =
|
||||
ledger != null && oConvertUtils.isNotEmpty(ledger.getEquipmentName())
|
||||
? ledger.getEquipmentName()
|
||||
: (ledger != null ? ledger.getEquipmentCode() : equipmentLedgerId);
|
||||
return Result.error(MesXslEquipInspectBizMsg.noConfigMessage(equipName, type));
|
||||
}
|
||||
return Result.OK(lines);
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectRecord model) {
|
||||
return super.exportXls(request, model, MesXslEquipInspectRecord.class, "MES点检保养记录");
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, MesXslEquipInspectRecord.class);
|
||||
}
|
||||
|
||||
private void fillRecordNoIfEmpty(MesXslEquipInspectRecord main) {
|
||||
if (oConvertUtils.isEmpty(main.getRecordNo())) {
|
||||
main.setRecordNo(mesXslEquipInspectRecordService.generateRecordNo(main));
|
||||
}
|
||||
}
|
||||
|
||||
private void fillInspector(MesXslEquipInspectRecord main) {
|
||||
if (SecurityUtils.getSubject() == null || SecurityUtils.getSubject().getPrincipal() == null) {
|
||||
return;
|
||||
}
|
||||
if (!(SecurityUtils.getSubject().getPrincipal() instanceof LoginUser user)) {
|
||||
return;
|
||||
}
|
||||
main.setInspectorUserId(user.getId());
|
||||
main.setInspectorUsername(user.getUsername());
|
||||
main.setInspectorRealname(user.getRealname());
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】录入点检结果：必填项校验，保存为已点检-----------
|
||||
private String validateForEntry(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
String err = validateForSave(main, lineList, main.getId());
|
||||
if (err != null) {
|
||||
return err;
|
||||
}
|
||||
if (main.getInspectDate() == null) {
|
||||
return "请选择点检日期";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(main.getInspectorUserId()) && oConvertUtils.isEmpty(main.getInspectorRealname())) {
|
||||
return "点检人不能为空";
|
||||
}
|
||||
String inspectResult = main.getInspectResult();
|
||||
if (inspectResult != null) {
|
||||
inspectResult = inspectResult.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(inspectResult) || !INSPECT_RESULT.contains(inspectResult)) {
|
||||
return "请选择点检结果（合格/不合格）";
|
||||
}
|
||||
main.setInspectResult(inspectResult);
|
||||
main.setRecordStatus("done");
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格记录默认未处理-----------
|
||||
if ("fail".equals(inspectResult)) {
|
||||
main.setHandledFlag("0");
|
||||
} else {
|
||||
main.setHandledFlag(null);
|
||||
main.setHandlerUserId(null);
|
||||
main.setHandlerUsername(null);
|
||||
main.setHandlerRealname(null);
|
||||
main.setHandleTime(null);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格记录默认未处理-----------
|
||||
return null;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】录入点检结果：必填项校验，保存为已点检-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】点检保养记录保存校验与配置明细关联-----------
|
||||
private String validateForSave(
|
||||
MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList, String excludeId) {
|
||||
if (main == null) {
|
||||
return "参数不能为空";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) {
|
||||
return "请选择设备";
|
||||
}
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId());
|
||||
if (ledger == null || isDeleted(ledger.getDelFlag())) {
|
||||
return "设备台账不存在或已删除";
|
||||
}
|
||||
main.setEquipmentName(ledger.getEquipmentName());
|
||||
main.setEquipmentCode(ledger.getEquipmentCode());
|
||||
|
||||
String recordType = main.getRecordType();
|
||||
if (recordType != null) {
|
||||
recordType = recordType.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(recordType) || !RECORD_TYPE.contains(recordType)) {
|
||||
return "类型无效，请选择点检或保养";
|
||||
}
|
||||
main.setRecordType(recordType);
|
||||
|
||||
if (main.getInspectDate() == null) {
|
||||
main.setInspectDate(new Date());
|
||||
}
|
||||
|
||||
String recordStatus = main.getRecordStatus();
|
||||
if (recordStatus != null) {
|
||||
recordStatus = recordStatus.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(recordStatus) || !RECORD_STATUS.contains(recordStatus)) {
|
||||
return "请选择状态（待点检/已点检）";
|
||||
}
|
||||
main.setRecordStatus(recordStatus);
|
||||
|
||||
String inspectResult = main.getInspectResult();
|
||||
if (inspectResult != null) {
|
||||
inspectResult = inspectResult.trim();
|
||||
}
|
||||
if ("done".equals(recordStatus)) {
|
||||
if (oConvertUtils.isEmpty(inspectResult) || !INSPECT_RESULT.contains(inspectResult)) {
|
||||
return "已点检时请选择点检结果（合格/不合格）";
|
||||
}
|
||||
main.setInspectResult(inspectResult);
|
||||
} else {
|
||||
if (oConvertUtils.isNotEmpty(inspectResult) && !INSPECT_RESULT.contains(inspectResult)) {
|
||||
return "点检结果无效";
|
||||
}
|
||||
main.setInspectResult(oConvertUtils.isEmpty(inspectResult) ? null : inspectResult);
|
||||
}
|
||||
|
||||
if (oConvertUtils.isEmpty(main.getRecordNo())) {
|
||||
return "记录编号不能为空";
|
||||
}
|
||||
|
||||
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesXslEquipInspectConfig> cw =
|
||||
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>();
|
||||
cw.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, main.getEquipmentLedgerId());
|
||||
cw.eq(MesXslEquipInspectConfig::getConfigType, recordType);
|
||||
cw.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectConfig::getDelFlag));
|
||||
MesXslEquipInspectConfig config = mesXslEquipInspectConfigService.getOne(cw, false);
|
||||
if (config == null) {
|
||||
String equipName =
|
||||
oConvertUtils.isNotEmpty(ledger.getEquipmentName())
|
||||
? ledger.getEquipmentName()
|
||||
: ledger.getEquipmentCode();
|
||||
return MesXslEquipInspectBizMsg.noConfigMessage(equipName, recordType);
|
||||
}
|
||||
main.setEquipInspectConfigId(config.getId());
|
||||
|
||||
if (lineList == null || lineList.isEmpty()) {
|
||||
return "明细不能为空，请选择设备后自动带出点检项目";
|
||||
}
|
||||
|
||||
Set<String> configLineIds = new HashSet<>();
|
||||
int sort = 0;
|
||||
for (int i = 0; i < lineList.size(); i++) {
|
||||
MesXslEquipInspectRecordLine line = lineList.get(i);
|
||||
if (line == null) {
|
||||
continue;
|
||||
}
|
||||
int rowNo = i + 1;
|
||||
if (oConvertUtils.isEmpty(line.getEquipInspectConfigLineId())) {
|
||||
return "第 " + rowNo + " 行未关联点检配置明细";
|
||||
}
|
||||
String lineId = line.getEquipInspectConfigLineId().trim();
|
||||
if (!configLineIds.add(lineId)) {
|
||||
return "第 " + rowNo + " 行点检配置明细重复";
|
||||
}
|
||||
line.setEquipInspectConfigLineId(lineId);
|
||||
line.setSortNo(sort++);
|
||||
}
|
||||
if (configLineIds.isEmpty()) {
|
||||
return "明细不能为空";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isDeleted(Integer delFlag) {
|
||||
return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】点检保养记录保存校验与配置明细关联-----------
|
||||
}
|
||||
@@ -0,0 +1,208 @@
|
||||
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.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
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.MesXslFormulaSpec;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaSpecPage;
|
||||
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/mesXslFormulaSpec")
|
||||
@Slf4j
|
||||
public class MesXslFormulaSpecController extends JeecgController<MesXslFormulaSpec, IMesXslFormulaSpecService> {
|
||||
|
||||
@Autowired
|
||||
private IMesXslFormulaSpecService mesXslFormulaSpecService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslFormulaSpecSettingService mesXslFormulaSpecSettingService;
|
||||
|
||||
@Operation(summary = "MES配合示方-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslFormulaSpec>> queryPageList(
|
||||
MesXslFormulaSpec model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@RequestParam(name = "keyword", required = false) String keyword,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslFormulaSpec> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
if (oConvertUtils.isNotEmpty(keyword)) {
|
||||
queryWrapper.and(
|
||||
w -> w.like("spec_code", keyword)
|
||||
.or()
|
||||
.like("rubber_code", keyword)
|
||||
.or()
|
||||
.like("issue_number", keyword)
|
||||
.or()
|
||||
.like("purpose", keyword));
|
||||
}
|
||||
queryWrapper.orderByDesc("update_time").orderByDesc("create_time");
|
||||
Page<MesXslFormulaSpec> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslFormulaSpec> pageList = mesXslFormulaSpecService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-添加")
|
||||
@Operation(summary = "MES配合示方-添加")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody MesXslFormulaSpecPage page) {
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
String err = validateMain(page);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
MesXslFormulaSpec main = new MesXslFormulaSpec();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
mesXslFormulaSpecService.saveMain(main, page.getLineList());
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-编辑")
|
||||
@Operation(summary = "MES配合示方-编辑")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody MesXslFormulaSpecPage page) {
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
String err = validateMain(page);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
MesXslFormulaSpec main = new MesXslFormulaSpec();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
mesXslFormulaSpecService.updateMain(main, page.getLineList());
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-删除")
|
||||
@Operation(summary = "MES配合示方-通过id删除")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
mesXslFormulaSpecService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-批量删除")
|
||||
@Operation(summary = "MES配合示方-批量删除")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
mesXslFormulaSpecService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@Operation(summary = "MES配合示方-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslFormulaSpec> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslFormulaSpec entity = mesXslFormulaSpecService.getByIdWithLines(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES配合示方-查询明细")
|
||||
@GetMapping(value = "/queryLineListByMainId")
|
||||
public Result<List<MesXslFormulaSpecLine>> queryLineListByMainId(@RequestParam(name = "id", required = true) String id) {
|
||||
return Result.OK(mesXslFormulaSpecService.selectLinesByMainId(id));
|
||||
}
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方胶料代号自动生成-----------
|
||||
@Operation(summary = "MES配合示方-生成胶料代号")
|
||||
@GetMapping(value = "/generateRubberCode")
|
||||
public Result<Map<String, String>> generateRubberCode(
|
||||
@RequestParam(name = "rubberMaterialId") String rubberMaterialId,
|
||||
@RequestParam(name = "category") String category,
|
||||
@RequestParam(name = "excludeSpecId", required = false) String excludeSpecId) {
|
||||
try {
|
||||
String rubberCode = mesXslFormulaSpecService.generateRubberCode(rubberMaterialId, category, excludeSpecId);
|
||||
return Result.OK(Map.of("rubberCode", rubberCode));
|
||||
} catch (IllegalArgumentException ex) {
|
||||
return Result.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方胶料代号自动生成-----------
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】含胶率物料小类可配置-----------
|
||||
@Operation(summary = "MES配合示方-查询含胶率物料小类配置")
|
||||
@GetMapping(value = "/getRubberContentSetting")
|
||||
public Result<MesXslFormulaRubberContentSettingVO> getRubberContentSetting() {
|
||||
return Result.OK(mesXslFormulaSpecSettingService.getRubberContentSetting());
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-保存含胶率物料小类配置")
|
||||
@Operation(summary = "MES配合示方-保存含胶率物料小类配置")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:edit")
|
||||
@PostMapping(value = "/saveRubberContentSetting")
|
||||
public Result<String> saveRubberContentSetting(@RequestBody MesXslFormulaRubberContentSettingVO setting) {
|
||||
mesXslFormulaSpecSettingService.saveRubberContentSetting(setting);
|
||||
return Result.OK("保存成功");
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】含胶率物料小类可配置-----------
|
||||
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslFormulaSpec model) {
|
||||
return super.exportXls(request, model, MesXslFormulaSpec.class, "配合示方");
|
||||
}
|
||||
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, MesXslFormulaSpec.class);
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
private String validateMain(MesXslFormulaSpecPage page) {
|
||||
if (oConvertUtils.isEmpty(page.getSpecCode())) {
|
||||
return "请输入示方编号";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(page.getRubberCode())) {
|
||||
return "请选择胶料并生成胶料代号";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(page.getRubberMaterialId())) {
|
||||
return "请选择胶料信息";
|
||||
}
|
||||
if (page.getMixingStages() != null && (page.getMixingStages() < 1 || page.getMixingStages() > 7)) {
|
||||
return "混合段数必须在1-7之间";
|
||||
}
|
||||
if (page.getLineList() == null || page.getLineList().isEmpty()) {
|
||||
return "请至少添加一行配合明细";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
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.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 设备点检配置主表（表 mes_xsl_equip_inspect_config）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_config")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES设备点检配置")
|
||||
public class MesXslEquipInspectConfig implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "设备台账主键 mes_xsl_equipment_ledger.id")
|
||||
private String equipmentLedgerId;
|
||||
|
||||
@Excel(name = "设备名称", width = 22)
|
||||
@Schema(description = "设备名称冗余")
|
||||
private String equipmentName;
|
||||
|
||||
@Excel(name = "设备编号", width = 18)
|
||||
@Schema(description = "设备编号冗余")
|
||||
private String equipmentCode;
|
||||
|
||||
@Excel(name = "类型", width = 12, dicCode = "xslmes_im_item_category")
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）")
|
||||
private String configType;
|
||||
|
||||
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;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "点检项目明细")
|
||||
private List<MesXslEquipInspectConfigLine> lineList;
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
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.jeecg.common.aspect.annotation.Dict;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 设备点检配置明细（表 mes_xsl_equip_inspect_config_line）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_config_line")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES设备点检配置明细")
|
||||
public class MesXslEquipInspectConfigLine implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "主表主键 mes_xsl_equip_inspect_config.id")
|
||||
private String configId;
|
||||
|
||||
@Schema(description = "点检及保养项目主键 mes_xsl_inspect_maintain_item.id")
|
||||
private String inspectMaintainItemId;
|
||||
|
||||
@Schema(description = "点检项目编号冗余")
|
||||
private String itemCode;
|
||||
|
||||
@Schema(description = "项目名称冗余")
|
||||
private String itemName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "项目类别冗余")
|
||||
private String itemCategory;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_type")
|
||||
@Schema(description = "项目类型冗余")
|
||||
private String itemType;
|
||||
|
||||
@Schema(description = "设备部位名称冗余")
|
||||
private String equipmentPartName;
|
||||
|
||||
@Schema(description = "设备小部位名称冗余")
|
||||
private String equipmentSubPartName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_inspect_method")
|
||||
@Schema(description = "点检方式冗余")
|
||||
private String inspectMethod;
|
||||
|
||||
@Schema(description = "判断基准冗余")
|
||||
private String judgmentCriteria;
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
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.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 点检/保养记录主表（表 mes_xsl_equip_inspect_record）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_record")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES点检保养记录")
|
||||
public class MesXslEquipInspectRecord implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Excel(name = "记录编号", width = 20)
|
||||
@Schema(description = "记录编号 EC+yyyyMMdd+4位流水")
|
||||
private String recordNo;
|
||||
|
||||
@Excel(name = "计划单号", width = 18)
|
||||
@Schema(description = "计划单号")
|
||||
private String planNo;
|
||||
|
||||
@Schema(description = "计划主键")
|
||||
private String planId;
|
||||
|
||||
@Schema(description = "设备台账主键")
|
||||
private String equipmentLedgerId;
|
||||
|
||||
@Excel(name = "设备编码", width = 16)
|
||||
@Schema(description = "设备编码冗余")
|
||||
private String equipmentCode;
|
||||
|
||||
@Excel(name = "设备名称", width = 20)
|
||||
@Schema(description = "设备名称冗余")
|
||||
private String equipmentName;
|
||||
|
||||
@Schema(description = "设备点检配置主键")
|
||||
private String equipInspectConfigId;
|
||||
|
||||
@Excel(name = "类型", width = 10, dicCode = "xslmes_im_item_category")
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "点检/保养类型")
|
||||
private String recordType;
|
||||
|
||||
@Excel(name = "点检日期", width = 12, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@Schema(description = "点检日期")
|
||||
private Date inspectDate;
|
||||
|
||||
@Schema(description = "点检人用户ID")
|
||||
private String inspectorUserId;
|
||||
|
||||
@Schema(description = "点检人账号")
|
||||
private String inspectorUsername;
|
||||
|
||||
@Excel(name = "点检人", width = 12)
|
||||
@Schema(description = "点检人姓名")
|
||||
private String inspectorRealname;
|
||||
|
||||
@Excel(name = "点检结果", width = 10, dicCode = "xslmes_im_inspect_result")
|
||||
@Dict(dicCode = "xslmes_im_inspect_result")
|
||||
@Schema(description = "点检结果 pass/fail")
|
||||
private String inspectResult;
|
||||
|
||||
@Excel(name = "状态", width = 10, dicCode = "xslmes_im_record_status")
|
||||
@Dict(dicCode = "xslmes_im_record_status")
|
||||
@Schema(description = "记录状态 pending/done")
|
||||
private String recordStatus;
|
||||
|
||||
@Excel(name = "是否已处理", width = 10, dicCode = "yn")
|
||||
@Dict(dicCode = "yn")
|
||||
@Schema(description = "是否已处理（字典yn：1是0否，不合格记录使用）")
|
||||
private String handledFlag;
|
||||
|
||||
@Schema(description = "处理人用户ID")
|
||||
private String handlerUserId;
|
||||
|
||||
@Schema(description = "处理人账号")
|
||||
private String handlerUsername;
|
||||
|
||||
@Excel(name = "处理人", width = 12)
|
||||
@Schema(description = "处理人姓名")
|
||||
private String handlerRealname;
|
||||
|
||||
@Excel(name = "处理时间", width = 18, 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")
|
||||
@Schema(description = "处理时间")
|
||||
private Date handleTime;
|
||||
|
||||
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;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "点检明细")
|
||||
private List<MesXslEquipInspectRecordLine> lineList;
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
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.jeecg.common.aspect.annotation.Dict;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 点检/保养记录明细（表 mes_xsl_equip_inspect_record_line）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_record_line")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES点检保养记录明细")
|
||||
public class MesXslEquipInspectRecordLine implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "主表主键")
|
||||
private String recordId;
|
||||
|
||||
@Schema(description = "设备点检配置明细主键")
|
||||
private String equipInspectConfigLineId;
|
||||
|
||||
@Schema(description = "点检及保养项目主键冗余")
|
||||
private String inspectMaintainItemId;
|
||||
|
||||
@Schema(description = "点检项目编号")
|
||||
private String itemCode;
|
||||
|
||||
@Schema(description = "项目名称")
|
||||
private String itemName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "项目类别")
|
||||
private String itemCategory;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_type")
|
||||
@Schema(description = "项目类型")
|
||||
private String itemType;
|
||||
|
||||
@Schema(description = "设备部位")
|
||||
private String equipmentPartName;
|
||||
|
||||
@Schema(description = "设备小部位")
|
||||
private String equipmentSubPartName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_inspect_method")
|
||||
@Schema(description = "点检方式")
|
||||
private String inspectMethod;
|
||||
|
||||
@Schema(description = "判断基准")
|
||||
private String judgmentCriteria;
|
||||
|
||||
@Schema(description = "明细点检结果文本")
|
||||
private String lineInspectResult;
|
||||
|
||||
@Schema(description = "图片路径，逗号分隔")
|
||||
private String pictureFiles;
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,220 @@
|
||||
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.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 配合示方
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_formula_spec")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES配合示方")
|
||||
public class MesXslFormulaSpec implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Excel(name = "分类", width = 10, dicCode = "xslmes_formula_spec_category")
|
||||
@Dict(dicCode = "xslmes_formula_spec_category")
|
||||
@Schema(description = "分类")
|
||||
private String category;
|
||||
|
||||
@Excel(name = "示方编号", width = 18)
|
||||
@Schema(description = "示方编号")
|
||||
private String specCode;
|
||||
|
||||
@Excel(name = "胶料代号", width = 18)
|
||||
@Schema(description = "胶料代号")
|
||||
private String rubberCode;
|
||||
|
||||
@Schema(description = "胶料ID（关联mes_material.id）")
|
||||
private String rubberMaterialId;
|
||||
|
||||
@Excel(name = "基本配合", width = 15)
|
||||
@Schema(description = "基本配合")
|
||||
private String basicFormula;
|
||||
|
||||
@Excel(name = "发行日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@Schema(description = "发行日期")
|
||||
private Date issueDate;
|
||||
|
||||
@Excel(name = "用途", width = 20)
|
||||
@Schema(description = "用途")
|
||||
private String purpose;
|
||||
|
||||
@Excel(name = "发行编号", width = 15)
|
||||
@Schema(description = "发行编号")
|
||||
private String issueNumber;
|
||||
|
||||
@Excel(name = "混合段数", width = 10)
|
||||
@Schema(description = "混合段数")
|
||||
private Integer mixingStages;
|
||||
|
||||
@Excel(name = "混合机器", width = 15)
|
||||
@Schema(description = "混合机器")
|
||||
private String mixingMachine;
|
||||
|
||||
@Schema(description = "发行部门ID")
|
||||
private String issueDeptId;
|
||||
|
||||
@Excel(name = "发行部门", width = 15)
|
||||
@Schema(description = "发行部门名称")
|
||||
private String issueDeptName;
|
||||
|
||||
@Excel(name = "A胶TOTAL PHR", width = 14)
|
||||
@Schema(description = "A胶TOTAL PHR")
|
||||
private BigDecimal aRubberTotalPhr;
|
||||
|
||||
@Excel(name = "TOTAL PHR", width = 12)
|
||||
@Schema(description = "TOTAL PHR")
|
||||
private BigDecimal totalPhr;
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主表新增混合段1-7合计字段-----------
|
||||
@Excel(name = "混合段1合计", width = 12)
|
||||
@Schema(description = "混合段1合计")
|
||||
private BigDecimal stage1Total;
|
||||
|
||||
@Excel(name = "混合段2合计", width = 12)
|
||||
@Schema(description = "混合段2合计")
|
||||
private BigDecimal stage2Total;
|
||||
|
||||
@Excel(name = "混合段3合计", width = 12)
|
||||
@Schema(description = "混合段3合计")
|
||||
private BigDecimal stage3Total;
|
||||
|
||||
@Excel(name = "混合段4合计", width = 12)
|
||||
@Schema(description = "混合段4合计")
|
||||
private BigDecimal stage4Total;
|
||||
|
||||
@Excel(name = "混合段5合计", width = 12)
|
||||
@Schema(description = "混合段5合计")
|
||||
private BigDecimal stage5Total;
|
||||
|
||||
@Excel(name = "混合段6合计", width = 12)
|
||||
@Schema(description = "混合段6合计")
|
||||
private BigDecimal stage6Total;
|
||||
|
||||
@Excel(name = "混合段7合计", width = 12)
|
||||
@Schema(description = "混合段7合计")
|
||||
private BigDecimal stage7Total;
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主表新增混合段1-7合计字段-----------
|
||||
|
||||
@Excel(name = "发行理由", width = 30)
|
||||
@Schema(description = "发行理由")
|
||||
private String issueReason;
|
||||
|
||||
@Excel(name = "天然橡胶", width = 12)
|
||||
@Schema(description = "天然橡胶")
|
||||
private BigDecimal naturalRubber;
|
||||
|
||||
@Excel(name = "合成橡胶", width = 12)
|
||||
@Schema(description = "合成橡胶")
|
||||
private BigDecimal syntheticRubber;
|
||||
|
||||
@Excel(name = "合计", width = 12)
|
||||
@Schema(description = "合计")
|
||||
private BigDecimal totalAmount;
|
||||
|
||||
@Excel(name = "重量单价", width = 12)
|
||||
@Schema(description = "重量单价")
|
||||
private BigDecimal weightUnitPrice;
|
||||
|
||||
@Excel(name = "体积单价", width = 12)
|
||||
@Schema(description = "体积单价")
|
||||
private BigDecimal volumeUnitPrice;
|
||||
|
||||
@Excel(name = "Q胶比重", width = 12)
|
||||
@Schema(description = "Q胶比重")
|
||||
@TableField("q_rubber_sg")
|
||||
private BigDecimal qRubberSg;
|
||||
|
||||
@Excel(name = "A胶比重", width = 12)
|
||||
@Schema(description = "A胶比重")
|
||||
@TableField("a_rubber_sg")
|
||||
private BigDecimal aRubberSg;
|
||||
|
||||
@Excel(name = "人工配料", width = 10, replace = {"是_1", "否_0"})
|
||||
@Schema(description = "是否有人工配料（0否 1是）")
|
||||
private Integer hasManualBatch;
|
||||
|
||||
@Excel(name = "状态", width = 12, dicCode = "xslmes_formula_spec_status")
|
||||
@Dict(dicCode = "xslmes_formula_spec_status")
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Excel(name = "校对人", width = 12)
|
||||
@Schema(description = "校对人")
|
||||
private String proofreadBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "校对时间")
|
||||
private Date proofreadTime;
|
||||
|
||||
@Excel(name = "审核人", width = 12)
|
||||
@Schema(description = "审核人")
|
||||
private String auditBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "审核时间")
|
||||
private Date auditTime;
|
||||
|
||||
@Excel(name = "批准人", width = 12)
|
||||
@Schema(description = "批准人")
|
||||
private String approveBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "批准时间")
|
||||
private Date approveTime;
|
||||
|
||||
@Excel(name = "创建人", width = 12, dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
||||
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
||||
private String createBy;
|
||||
|
||||
/** queryById 等非分页接口补充创建人姓名（DictAspect 仅翻译分页列表） */
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "创建人姓名")
|
||||
private String createBy_dictText;
|
||||
|
||||
@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;
|
||||
|
||||
@Schema(description = "租户ID")
|
||||
private Integer tenantId;
|
||||
|
||||
private String sysOrgCode;
|
||||
private Integer delFlag;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "配合明细")
|
||||
private List<MesXslFormulaSpecLine> lineList;
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
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.jeecg.common.aspect.annotation.Dict;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 配合示方明细
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_formula_spec_line")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES配合示方明细")
|
||||
public class MesXslFormulaSpecLine implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "配合示方主表ID")
|
||||
private String formulaSpecId;
|
||||
|
||||
@Schema(description = "行序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "PHR")
|
||||
private BigDecimal phr;
|
||||
|
||||
@Schema(description = "密炼物料ID")
|
||||
private String mixerMaterialId;
|
||||
|
||||
@Schema(description = "密炼物料编码")
|
||||
private String mixerMaterialCode;
|
||||
|
||||
@Schema(description = "密炼物料名称")
|
||||
private String mixerMaterialName;
|
||||
|
||||
@Schema(description = "物料描述")
|
||||
private String materialDesc;
|
||||
|
||||
@Dict(dicCode = "xslmes_formula_spec_step")
|
||||
@Schema(description = "STEP")
|
||||
private String step;
|
||||
|
||||
@Dict(dicCode = "xslmes_formula_spec_weigh_mode")
|
||||
@Schema(description = "称量方式")
|
||||
private String weighMode;
|
||||
|
||||
@Schema(description = "重量%")
|
||||
private BigDecimal weightPercent;
|
||||
|
||||
@Schema(description = "体积")
|
||||
private BigDecimal volume;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "混合段1")
|
||||
private BigDecimal stage1;
|
||||
|
||||
@Schema(description = "混合段2")
|
||||
private BigDecimal stage2;
|
||||
|
||||
@Schema(description = "混合段3")
|
||||
private BigDecimal stage3;
|
||||
|
||||
@Schema(description = "混合段4")
|
||||
private BigDecimal stage4;
|
||||
|
||||
@Schema(description = "混合段5")
|
||||
private BigDecimal stage5;
|
||||
|
||||
@Schema(description = "混合段6")
|
||||
private BigDecimal stage6;
|
||||
|
||||
@Schema(description = "混合段7")
|
||||
private BigDecimal stage7;
|
||||
|
||||
@Schema(description = "租户ID")
|
||||
private Integer tenantId;
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* 配合示方模块配置
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_formula_spec_setting")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "配合示方模块配置")
|
||||
public class MesXslFormulaSpecSetting implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public static final String DEFAULT_ID = "1993000000000000991";
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "天然橡胶物料小类ID，逗号分隔")
|
||||
private String naturalMinorCategoryIds;
|
||||
|
||||
@Schema(description = "合成橡胶物料小类ID，逗号分隔")
|
||||
private String syntheticMinorCategoryIds;
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
|
||||
public interface MesXslEquipInspectConfigLineMapper extends BaseMapper<MesXslEquipInspectConfigLine> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
|
||||
public interface MesXslEquipInspectConfigMapper extends BaseMapper<MesXslEquipInspectConfig> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
|
||||
public interface MesXslEquipInspectRecordLineMapper extends BaseMapper<MesXslEquipInspectRecordLine> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
|
||||
public interface MesXslEquipInspectRecordMapper extends BaseMapper<MesXslEquipInspectRecord> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
|
||||
public interface MesXslFormulaSpecLineMapper extends BaseMapper<MesXslFormulaSpecLine> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
|
||||
public interface MesXslFormulaSpecMapper extends BaseMapper<MesXslFormulaSpec> {}
|
||||
@@ -0,0 +1,7 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
|
||||
|
||||
public interface MesXslFormulaSpecSettingMapper extends BaseMapper<MesXslFormulaSpecSetting> {
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* MES XSL 业务模块（Maven 工程名：jeecg-module-xslmes）。
|
||||
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。
|
||||
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、设备点检配置（{@link org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。
|
||||
*/
|
||||
package org.jeecg.modules.xslmes;
|
||||
|
||||
@@ -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.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
|
||||
public interface IMesXslEquipInspectConfigService extends IService<MesXslEquipInspectConfig> {
|
||||
|
||||
void saveMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList);
|
||||
|
||||
void updateMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList);
|
||||
|
||||
void delMain(String id);
|
||||
|
||||
void delBatchMain(Collection<? extends Serializable> idList);
|
||||
|
||||
List<MesXslEquipInspectConfigLine> selectLinesByConfigId(String configId);
|
||||
|
||||
boolean isConfigDuplicated(String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context);
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
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.MesXslEquipInspectRecord;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
|
||||
|
||||
public interface IMesXslEquipInspectRecordService extends IService<MesXslEquipInspectRecord> {
|
||||
|
||||
void saveMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList);
|
||||
|
||||
void updateMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList);
|
||||
|
||||
void delMain(String id);
|
||||
|
||||
void delBatchMain(Collection<? extends Serializable> idList);
|
||||
|
||||
List<MesXslEquipInspectRecordLine> selectLinesByRecordId(String recordId);
|
||||
|
||||
String generateRecordNo(MesXslEquipInspectRecord context);
|
||||
|
||||
List<MesXslEquipInspectRecordLine> buildLinesFromEquipConfig(String equipmentLedgerId, String recordType);
|
||||
|
||||
MesXslEquipInspectRecordBatchCreateResult batchCreateFromEquipment(
|
||||
List<String> equipmentLedgerIds, String recordType, MesXslEquipInspectRecord inspectorContext);
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
void handleFailRecord(MesXslEquipInspectRecordHandleDTO dto);
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
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.MesXslFormulaSpec;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
|
||||
public interface IMesXslFormulaSpecService extends IService<MesXslFormulaSpec> {
|
||||
|
||||
void saveMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList);
|
||||
|
||||
void updateMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList);
|
||||
|
||||
void delMain(String id);
|
||||
|
||||
void delBatchMain(Collection<? extends Serializable> idList);
|
||||
|
||||
List<MesXslFormulaSpecLine> selectLinesByMainId(String mainId);
|
||||
|
||||
MesXslFormulaSpec getByIdWithLines(String id);
|
||||
|
||||
/**
|
||||
* 生成胶料代号：D + 胶料名称 + 分类键值(S/P/T/C) + 版本号(A01-Z01)
|
||||
*/
|
||||
String generateRubberCode(String rubberMaterialId, String category, String excludeSpecId);
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package org.jeecg.modules.xslmes.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.Set;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
|
||||
|
||||
public interface IMesXslFormulaSpecSettingService extends IService<MesXslFormulaSpecSetting> {
|
||||
|
||||
MesXslFormulaRubberContentSettingVO getRubberContentSetting();
|
||||
|
||||
void saveRubberContentSetting(MesXslFormulaRubberContentSettingVO setting);
|
||||
|
||||
Set<String> getNaturalMinorCategoryIds();
|
||||
|
||||
Set<String> getSyntheticMinorCategoryIds();
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
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.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.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigLineMapper;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
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 MesXslEquipInspectConfigServiceImpl
|
||||
extends ServiceImpl<MesXslEquipInspectConfigMapper, MesXslEquipInspectConfig>
|
||||
implements IMesXslEquipInspectConfigService {
|
||||
|
||||
@Autowired
|
||||
private MesXslEquipInspectConfigLineMapper mesXslEquipInspectConfigLineMapper;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList) {
|
||||
this.save(main);
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList) {
|
||||
this.updateById(main);
|
||||
mesXslEquipInspectConfigLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectConfigLine>()
|
||||
.eq(MesXslEquipInspectConfigLine::getConfigId, main.getId()));
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
private void insertLines(String configId, List<MesXslEquipInspectConfigLine> lineList) {
|
||||
if (CollectionUtils.isEmpty(lineList)) {
|
||||
return;
|
||||
}
|
||||
int sort = 0;
|
||||
for (MesXslEquipInspectConfigLine line : lineList) {
|
||||
line.setId(null);
|
||||
line.setConfigId(configId);
|
||||
line.setSortNo(sort++);
|
||||
mesXslEquipInspectConfigLineMapper.insert(line);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
mesXslEquipInspectConfigLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectConfigLine>().eq(MesXslEquipInspectConfigLine::getConfigId, 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<MesXslEquipInspectConfigLine> selectLinesByConfigId(String configId) {
|
||||
return mesXslEquipInspectConfigLineMapper.selectList(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectConfigLine>()
|
||||
.eq(MesXslEquipInspectConfigLine::getConfigId, configId)
|
||||
.orderByAsc(MesXslEquipInspectConfigLine::getSortNo));
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据-----------
|
||||
@Override
|
||||
public boolean isConfigDuplicated(
|
||||
String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context) {
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(configType)) {
|
||||
return false;
|
||||
}
|
||||
Integer tenantId = resolveTenantId(context);
|
||||
LambdaQueryWrapper<MesXslEquipInspectConfig> w = new LambdaQueryWrapper<>();
|
||||
w.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId.trim());
|
||||
w.eq(MesXslEquipInspectConfig::getConfigType, configType.trim());
|
||||
w.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectConfig::getDelFlag));
|
||||
if (oConvertUtils.isNotEmpty(excludeId)) {
|
||||
w.ne(MesXslEquipInspectConfig::getId, excludeId);
|
||||
}
|
||||
if (tenantId != null) {
|
||||
w.eq(MesXslEquipInspectConfig::getTenantId, tenantId);
|
||||
}
|
||||
return this.count(w) > 0;
|
||||
}
|
||||
|
||||
private static Integer resolveTenantId(MesXslEquipInspectConfig 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) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (oConvertUtils.isEmpty(ts)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Integer.parseInt(ts);
|
||||
} catch (NumberFormatException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据-----------
|
||||
}
|
||||
@@ -0,0 +1,312 @@
|
||||
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.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
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.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectRecordLineMapper;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectRecordMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectRecordService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.util.MesXslEquipInspectBizMsg;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
|
||||
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 MesXslEquipInspectRecordServiceImpl
|
||||
extends ServiceImpl<MesXslEquipInspectRecordMapper, MesXslEquipInspectRecord>
|
||||
implements IMesXslEquipInspectRecordService {
|
||||
|
||||
@Autowired
|
||||
private MesXslEquipInspectRecordLineMapper mesXslEquipInspectRecordLineMapper;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
this.save(main);
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
this.updateById(main);
|
||||
mesXslEquipInspectRecordLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectRecordLine>()
|
||||
.eq(MesXslEquipInspectRecordLine::getRecordId, main.getId()));
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
private void insertLines(String recordId, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
if (CollectionUtils.isEmpty(lineList)) {
|
||||
return;
|
||||
}
|
||||
int sort = 0;
|
||||
for (MesXslEquipInspectRecordLine line : lineList) {
|
||||
line.setId(null);
|
||||
line.setRecordId(recordId);
|
||||
line.setSortNo(sort++);
|
||||
mesXslEquipInspectRecordLineMapper.insert(line);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
mesXslEquipInspectRecordLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectRecordLine>().eq(MesXslEquipInspectRecordLine::getRecordId, 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<MesXslEquipInspectRecordLine> selectLinesByRecordId(String recordId) {
|
||||
return mesXslEquipInspectRecordLineMapper.selectList(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectRecordLine>()
|
||||
.eq(MesXslEquipInspectRecordLine::getRecordId, recordId)
|
||||
.orderByAsc(MesXslEquipInspectRecordLine::getSortNo));
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】点检保养记录编号 EC+日期+4位流水-----------
|
||||
@Override
|
||||
public String generateRecordNo(MesXslEquipInspectRecord context) {
|
||||
String dateStr = new SimpleDateFormat("yyyyMMdd").format(new Date());
|
||||
String prefix = "EC" + dateStr;
|
||||
Integer tenantId = resolveTenantId(context);
|
||||
|
||||
LambdaQueryWrapper<MesXslEquipInspectRecord> qw = new LambdaQueryWrapper<>();
|
||||
qw.likeRight(MesXslEquipInspectRecord::getRecordNo, prefix);
|
||||
qw.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectRecord::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectRecord::getDelFlag));
|
||||
if (tenantId != null) {
|
||||
qw.eq(MesXslEquipInspectRecord::getTenantId, tenantId);
|
||||
}
|
||||
qw.select(MesXslEquipInspectRecord::getRecordNo);
|
||||
qw.orderByDesc(MesXslEquipInspectRecord::getRecordNo);
|
||||
qw.last("LIMIT 1");
|
||||
|
||||
MesXslEquipInspectRecord last = this.getOne(qw, false);
|
||||
int nextSeq = 1;
|
||||
if (last != null && oConvertUtils.isNotEmpty(last.getRecordNo()) && last.getRecordNo().length() >= prefix.length() + 4) {
|
||||
String suffix = last.getRecordNo().substring(prefix.length());
|
||||
try {
|
||||
nextSeq = Integer.parseInt(suffix) + 1;
|
||||
} catch (NumberFormatException ignored) {
|
||||
nextSeq = (int) this.count(qw) + 1;
|
||||
}
|
||||
}
|
||||
return prefix + String.format("%04d", nextSeq);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】点检保养记录编号 EC+日期+4位流水-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】点检保养记录从设备点检配置带出明细-----------
|
||||
@Override
|
||||
public List<MesXslEquipInspectRecordLine> buildLinesFromEquipConfig(String equipmentLedgerId, String recordType) {
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(recordType)) {
|
||||
return List.of();
|
||||
}
|
||||
String type = recordType.trim();
|
||||
MesXslEquipInspectConfig config = findEquipInspectConfig(equipmentLedgerId.trim(), type);
|
||||
if (config == null) {
|
||||
return List.of();
|
||||
}
|
||||
List<MesXslEquipInspectConfigLine> configLines =
|
||||
mesXslEquipInspectConfigService.selectLinesByConfigId(config.getId());
|
||||
if (CollectionUtils.isEmpty(configLines)) {
|
||||
return List.of();
|
||||
}
|
||||
return buildRecordLinesFromConfigLines(configLines);
|
||||
}
|
||||
|
||||
private MesXslEquipInspectConfig findEquipInspectConfig(String equipmentLedgerId, String configType) {
|
||||
LambdaQueryWrapper<MesXslEquipInspectConfig> cw = new LambdaQueryWrapper<>();
|
||||
cw.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId);
|
||||
cw.eq(MesXslEquipInspectConfig::getConfigType, configType);
|
||||
cw.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectConfig::getDelFlag));
|
||||
return mesXslEquipInspectConfigService.getOne(cw, false);
|
||||
}
|
||||
|
||||
private List<MesXslEquipInspectRecordLine> buildRecordLinesFromConfigLines(
|
||||
List<MesXslEquipInspectConfigLine> configLines) {
|
||||
List<MesXslEquipInspectRecordLine> result = new ArrayList<>(configLines.size());
|
||||
for (MesXslEquipInspectConfigLine cl : configLines) {
|
||||
MesXslEquipInspectRecordLine line = new MesXslEquipInspectRecordLine();
|
||||
line.setEquipInspectConfigLineId(cl.getId());
|
||||
line.setInspectMaintainItemId(cl.getInspectMaintainItemId());
|
||||
line.setItemCode(cl.getItemCode());
|
||||
line.setItemName(cl.getItemName());
|
||||
line.setItemCategory(cl.getItemCategory());
|
||||
line.setItemType(cl.getItemType());
|
||||
line.setEquipmentPartName(cl.getEquipmentPartName());
|
||||
line.setEquipmentSubPartName(cl.getEquipmentSubPartName());
|
||||
line.setInspectMethod(cl.getInspectMethod());
|
||||
line.setJudgmentCriteria(cl.getJudgmentCriteria());
|
||||
result.add(line);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】点检保养记录从设备点检配置带出明细-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】设备台账多选批量生成点检保养记录（待点检）-----------
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public MesXslEquipInspectRecordBatchCreateResult batchCreateFromEquipment(
|
||||
List<String> equipmentLedgerIds, String recordType, MesXslEquipInspectRecord inspectorContext) {
|
||||
MesXslEquipInspectRecordBatchCreateResult result = new MesXslEquipInspectRecordBatchCreateResult();
|
||||
if (CollectionUtils.isEmpty(equipmentLedgerIds) || oConvertUtils.isEmpty(recordType)) {
|
||||
result.getFailMessages().add("请选择设备并指定点检或保养类型");
|
||||
return result;
|
||||
}
|
||||
String type = recordType.trim();
|
||||
for (String equipmentLedgerId : equipmentLedgerIds) {
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId)) {
|
||||
continue;
|
||||
}
|
||||
String equipId = equipmentLedgerId.trim();
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(equipId);
|
||||
String equipName =
|
||||
ledger != null
|
||||
? (oConvertUtils.isNotEmpty(ledger.getEquipmentName())
|
||||
? ledger.getEquipmentName()
|
||||
: ledger.getEquipmentCode())
|
||||
: equipId;
|
||||
if (ledger == null
|
||||
|| (ledger.getDelFlag() != null && ledger.getDelFlag().equals(CommonConstant.DEL_FLAG_1))) {
|
||||
result.getFailMessages().add("设备【" + equipName + "】不存在或已删除");
|
||||
continue;
|
||||
}
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】未维护对应类型设备点检配置则不生成记录并提示设备名称-----------
|
||||
MesXslEquipInspectConfig config = findEquipInspectConfig(equipId, type);
|
||||
if (config == null) {
|
||||
result.getFailMessages().add(MesXslEquipInspectBizMsg.noConfigMessage(equipName, type));
|
||||
continue;
|
||||
}
|
||||
List<MesXslEquipInspectConfigLine> configLines =
|
||||
mesXslEquipInspectConfigService.selectLinesByConfigId(config.getId());
|
||||
if (CollectionUtils.isEmpty(configLines)) {
|
||||
result.getFailMessages().add(MesXslEquipInspectBizMsg.noConfigLineMessage(equipName, type));
|
||||
continue;
|
||||
}
|
||||
List<MesXslEquipInspectRecordLine> lines = buildRecordLinesFromConfigLines(configLines);
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】未维护对应类型设备点检配置则不生成记录并提示设备名称-----------
|
||||
|
||||
MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
|
||||
main.setEquipmentLedgerId(equipId);
|
||||
main.setEquipmentCode(ledger.getEquipmentCode());
|
||||
main.setEquipmentName(ledger.getEquipmentName());
|
||||
main.setEquipInspectConfigId(config.getId());
|
||||
main.setRecordType(type);
|
||||
main.setRecordNo(generateRecordNo(main));
|
||||
main.setRecordStatus("pending");
|
||||
main.setInspectResult("");
|
||||
main.setInspectDate(new Date());
|
||||
if (inspectorContext != null) {
|
||||
main.setInspectorUserId(inspectorContext.getInspectorUserId());
|
||||
main.setInspectorUsername(inspectorContext.getInspectorUsername());
|
||||
main.setInspectorRealname(inspectorContext.getInspectorRealname());
|
||||
}
|
||||
saveMain(main, lines);
|
||||
result.setSuccessCount(result.getSuccessCount() + 1);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】设备台账多选批量生成点检保养记录（待点检）-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void handleFailRecord(MesXslEquipInspectRecordHandleDTO dto) {
|
||||
if (dto == null || oConvertUtils.isEmpty(dto.getId())) {
|
||||
throw new IllegalArgumentException("记录主键不能为空");
|
||||
}
|
||||
MesXslEquipInspectRecord existing = this.getById(dto.getId().trim());
|
||||
if (existing == null) {
|
||||
throw new IllegalArgumentException("未找到对应数据");
|
||||
}
|
||||
if (!"fail".equals(existing.getInspectResult())) {
|
||||
throw new IllegalArgumentException("仅不合格记录可处理");
|
||||
}
|
||||
if (!"done".equals(existing.getRecordStatus())) {
|
||||
throw new IllegalArgumentException("请先完成点检录入");
|
||||
}
|
||||
if ("1".equals(existing.getHandledFlag())) {
|
||||
throw new IllegalArgumentException("该记录已处理");
|
||||
}
|
||||
if (oConvertUtils.isEmpty(dto.getHandlerUserId())
|
||||
&& oConvertUtils.isEmpty(dto.getHandlerUsername())
|
||||
&& oConvertUtils.isEmpty(dto.getHandlerRealname())) {
|
||||
throw new IllegalArgumentException("请选择处理人");
|
||||
}
|
||||
Date handleTime = dto.getHandleTime() != null ? dto.getHandleTime() : new Date();
|
||||
MesXslEquipInspectRecord patch = new MesXslEquipInspectRecord();
|
||||
patch.setId(existing.getId());
|
||||
patch.setHandledFlag("1");
|
||||
patch.setHandlerUserId(dto.getHandlerUserId());
|
||||
patch.setHandlerUsername(dto.getHandlerUsername());
|
||||
patch.setHandlerRealname(dto.getHandlerRealname());
|
||||
patch.setHandleTime(handleTime);
|
||||
this.updateById(patch);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
|
||||
private static Integer resolveTenantId(MesXslEquipInspectRecord 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) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (oConvertUtils.isEmpty(ts)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Integer.parseInt(ts);
|
||||
} catch (NumberFormatException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,403 @@
|
||||
package org.jeecg.modules.xslmes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import jakarta.annotation.Resource;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecg.modules.mes.material.entity.MesMaterial;
|
||||
import org.jeecg.modules.mes.material.entity.MesMixerMaterial;
|
||||
import org.jeecg.modules.mes.material.service.IMesMaterialService;
|
||||
import org.jeecg.modules.mes.material.service.IMesMixerMaterialService;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecLineMapper;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
|
||||
import org.jeecg.modules.system.entity.SysUser;
|
||||
import org.jeecg.modules.system.service.ISysUserService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
@Service
|
||||
public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecMapper, MesXslFormulaSpec>
|
||||
implements IMesXslFormulaSpecService {
|
||||
|
||||
private static final Set<String> RUBBER_CATEGORY_KEYS = Set.of("S", "P", "T", "C");
|
||||
private static final Pattern RUBBER_CODE_VERSION_PATTERN = Pattern.compile("([A-Z])01$");
|
||||
|
||||
@Resource
|
||||
private MesXslFormulaSpecLineMapper lineMapper;
|
||||
|
||||
@Resource
|
||||
private IMesMixerMaterialService mesMixerMaterialService;
|
||||
|
||||
@Resource
|
||||
private IMesMaterialService mesMaterialService;
|
||||
|
||||
@Resource
|
||||
private IMesXslFormulaSpecSettingService mesXslFormulaSpecSettingService;
|
||||
|
||||
@Resource
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
|
||||
fillMainDefaults(main);
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方新增时服务端生成胶料代号-----------
|
||||
fillRubberCodeOnCreate(main);
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方新增时服务端生成胶料代号-----------
|
||||
this.save(main);
|
||||
insertLines(main, lineList);
|
||||
refreshMainSummary(main.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
|
||||
fillMainDefaults(main);
|
||||
this.updateById(main);
|
||||
lineMapper.delete(new LambdaQueryWrapper<MesXslFormulaSpecLine>().eq(MesXslFormulaSpecLine::getFormulaSpecId, main.getId()));
|
||||
insertLines(main, lineList);
|
||||
refreshMainSummary(main.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
lineMapper.delete(new LambdaQueryWrapper<MesXslFormulaSpecLine>().eq(MesXslFormulaSpecLine::getFormulaSpecId, id));
|
||||
this.removeById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delBatchMain(Collection<? extends Serializable> idList) {
|
||||
if (idList == null || idList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for (Serializable id : idList) {
|
||||
if (id != null) {
|
||||
delMain(id.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesXslFormulaSpecLine> selectLinesByMainId(String mainId) {
|
||||
return lineMapper.selectList(
|
||||
new LambdaQueryWrapper<MesXslFormulaSpecLine>()
|
||||
.eq(MesXslFormulaSpecLine::getFormulaSpecId, mainId)
|
||||
.orderByAsc(MesXslFormulaSpecLine::getSortNo)
|
||||
.orderByAsc(MesXslFormulaSpecLine::getId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesXslFormulaSpec getByIdWithLines(String id) {
|
||||
MesXslFormulaSpec main = this.getById(id);
|
||||
if (main == null) {
|
||||
return null;
|
||||
}
|
||||
main.setLineList(selectLinesByMainId(id));
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】queryById补充创建人姓名供审批进度展示-----------
|
||||
fillCreateByDictText(main);
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】queryById补充创建人姓名供审批进度展示-----------
|
||||
return main;
|
||||
}
|
||||
|
||||
private void fillCreateByDictText(MesXslFormulaSpec main) {
|
||||
if (main == null || StringUtils.isBlank(main.getCreateBy())) {
|
||||
return;
|
||||
}
|
||||
SysUser user = sysUserService.getUserByName(main.getCreateBy());
|
||||
if (user != null && StringUtils.isNotBlank(user.getRealname())) {
|
||||
main.setCreateBy_dictText(user.getRealname());
|
||||
}
|
||||
}
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方胶料代号自动生成 D+胶料名称+分类+版本号-----------
|
||||
@Override
|
||||
public String generateRubberCode(String rubberMaterialId, String category, String excludeSpecId) {
|
||||
if (StringUtils.isBlank(rubberMaterialId)) {
|
||||
throw new IllegalArgumentException("请选择胶料信息");
|
||||
}
|
||||
if (StringUtils.isBlank(category) || !RUBBER_CATEGORY_KEYS.contains(category)) {
|
||||
throw new IllegalArgumentException("请选择有效的示方分类");
|
||||
}
|
||||
MesMaterial material = mesMaterialService.getById(rubberMaterialId);
|
||||
if (material == null || StringUtils.isBlank(material.getMaterialName())) {
|
||||
throw new IllegalArgumentException("所选胶料不存在或未维护胶料名称");
|
||||
}
|
||||
String basePrefix = buildRubberCodePrefix(material.getMaterialName(), category);
|
||||
Set<Character> usedLetters = loadUsedRubberCodeLetters(rubberMaterialId, category, basePrefix, excludeSpecId);
|
||||
for (char letter = 'A'; letter <= 'Z'; letter++) {
|
||||
if (!usedLetters.contains(letter)) {
|
||||
return basePrefix + letter + "01";
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("该胶料在当前分类下的代号版本已用尽(A01-Z01)");
|
||||
}
|
||||
|
||||
private void fillRubberCodeOnCreate(MesXslFormulaSpec main) {
|
||||
if (StringUtils.isBlank(main.getRubberMaterialId()) || StringUtils.isBlank(main.getCategory())) {
|
||||
return;
|
||||
}
|
||||
main.setRubberCode(generateRubberCode(main.getRubberMaterialId(), main.getCategory(), null));
|
||||
main.setSpecCode(main.getRubberCode());
|
||||
}
|
||||
|
||||
private String buildRubberCodePrefix(String materialName, String category) {
|
||||
return "D" + materialName.trim() + category;
|
||||
}
|
||||
|
||||
private Set<Character> loadUsedRubberCodeLetters(
|
||||
String rubberMaterialId, String category, String basePrefix, String excludeSpecId) {
|
||||
LambdaQueryWrapper<MesXslFormulaSpec> queryWrapper = new LambdaQueryWrapper<MesXslFormulaSpec>()
|
||||
.eq(MesXslFormulaSpec::getRubberMaterialId, rubberMaterialId)
|
||||
.eq(MesXslFormulaSpec::getCategory, category)
|
||||
.likeRight(MesXslFormulaSpec::getRubberCode, basePrefix);
|
||||
if (StringUtils.isNotBlank(excludeSpecId)) {
|
||||
queryWrapper.ne(MesXslFormulaSpec::getId, excludeSpecId);
|
||||
}
|
||||
List<MesXslFormulaSpec> existingList = this.list(queryWrapper);
|
||||
Set<Character> usedLetters = new HashSet<>();
|
||||
for (MesXslFormulaSpec item : existingList) {
|
||||
if (item == null || StringUtils.isBlank(item.getRubberCode())) {
|
||||
continue;
|
||||
}
|
||||
if (!item.getRubberCode().startsWith(basePrefix) || item.getRubberCode().length() <= basePrefix.length()) {
|
||||
continue;
|
||||
}
|
||||
String suffix = item.getRubberCode().substring(basePrefix.length());
|
||||
Matcher matcher = RUBBER_CODE_VERSION_PATTERN.matcher(suffix);
|
||||
if (matcher.matches()) {
|
||||
usedLetters.add(matcher.group(1).charAt(0));
|
||||
}
|
||||
}
|
||||
return usedLetters;
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方胶料代号自动生成 D+胶料名称+分类+版本号-----------
|
||||
|
||||
private void fillMainDefaults(MesXslFormulaSpec main) {
|
||||
if (StringUtils.isBlank(main.getCategory())) {
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方分类字典默认值改为 S-----------
|
||||
main.setCategory("S");
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方分类字典默认值改为 S-----------
|
||||
}
|
||||
if (StringUtils.isBlank(main.getStatus())) {
|
||||
main.setStatus("compile");
|
||||
}
|
||||
if (main.getHasManualBatch() == null) {
|
||||
main.setHasManualBatch(0);
|
||||
}
|
||||
}
|
||||
|
||||
private void insertLines(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
|
||||
if (CollectionUtils.isEmpty(lineList)) {
|
||||
return;
|
||||
}
|
||||
Date now = new Date();
|
||||
int sort = 0;
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
BigDecimal totalPhr = BigDecimal.ZERO;
|
||||
for (MesXslFormulaSpecLine line : lineList) {
|
||||
if (line == null || StringUtils.isBlank(line.getMixerMaterialId()) || line.getPhr() == null) {
|
||||
continue;
|
||||
}
|
||||
totalPhr = totalPhr.add(line.getPhr());
|
||||
}
|
||||
if (main.getTotalPhr() == null) {
|
||||
main.setTotalPhr(totalPhr);
|
||||
}
|
||||
BigDecimal weightBase = main.getTotalPhr() != null && main.getTotalPhr().compareTo(BigDecimal.ZERO) > 0
|
||||
? main.getTotalPhr()
|
||||
: totalPhr;
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
boolean hasManual = false;
|
||||
for (MesXslFormulaSpecLine line : lineList) {
|
||||
if (line == null || StringUtils.isBlank(line.getMixerMaterialId())) {
|
||||
continue;
|
||||
}
|
||||
line.setId(null);
|
||||
line.setFormulaSpecId(main.getId());
|
||||
line.setSortNo(sort++);
|
||||
fillMaterialInfo(line);
|
||||
fillVolumeIfBlank(line);
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
fillWeightPercent(line, weightBase);
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
if (line.getCreateTime() == null) {
|
||||
line.setCreateTime(now);
|
||||
}
|
||||
if (line.getUpdateTime() == null) {
|
||||
line.setUpdateTime(now);
|
||||
}
|
||||
if ("manual".equals(line.getWeighMode())) {
|
||||
hasManual = true;
|
||||
}
|
||||
lineMapper.insert(line);
|
||||
}
|
||||
if (main.getTotalPhr() == null) {
|
||||
main.setTotalPhr(totalPhr);
|
||||
}
|
||||
if (main.getHasManualBatch() == null || main.getHasManualBatch() == 0) {
|
||||
main.setHasManualBatch(hasManual ? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
||||
private void fillMaterialInfo(MesXslFormulaSpecLine line) {
|
||||
MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
|
||||
if (material == null) {
|
||||
return;
|
||||
}
|
||||
line.setMixerMaterialCode(material.getMaterialCode());
|
||||
line.setMixerMaterialName(material.getMaterialName());
|
||||
if (StringUtils.isBlank(line.getMaterialDesc())) {
|
||||
line.setMaterialDesc(StringUtils.defaultIfBlank(material.getMaterialDesc(), material.getMaterialName()));
|
||||
}
|
||||
}
|
||||
|
||||
private void fillVolumeIfBlank(MesXslFormulaSpecLine line) {
|
||||
if (line.getVolume() != null || line.getPhr() == null || StringUtils.isBlank(line.getMixerMaterialId())) {
|
||||
return;
|
||||
}
|
||||
MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
|
||||
if (material == null || material.getSpecificGravity() == null || material.getSpecificGravity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return;
|
||||
}
|
||||
line.setVolume(line.getPhr().divide(material.getSpecificGravity(), 6, RoundingMode.HALF_UP));
|
||||
}
|
||||
|
||||
private void fillWeightPercent(MesXslFormulaSpecLine line, BigDecimal totalPhr) {
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算（可手工覆盖）-----------
|
||||
if (line.getWeightPercent() != null || line.getPhr() == null || totalPhr == null || totalPhr.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return;
|
||||
}
|
||||
line.setWeightPercent(line.getPhr().multiply(BigDecimal.valueOf(100)).divide(totalPhr, 4, RoundingMode.HALF_UP));
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算（可手工覆盖）-----------
|
||||
}
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】保存后汇总A/Q胶比重写入数据库-----------
|
||||
/** 根据明细重新汇总主表 TOTAL PHR、A胶TOTAL PHR、比重与人工配料标记 */
|
||||
private void refreshMainSummary(String mainId) {
|
||||
List<MesXslFormulaSpecLine> lines = selectLinesByMainId(mainId);
|
||||
if (CollectionUtils.isEmpty(lines)) {
|
||||
return;
|
||||
}
|
||||
BigDecimal totalPhr = BigDecimal.ZERO;
|
||||
BigDecimal aRubberPhr = BigDecimal.ZERO;
|
||||
BigDecimal aRubberVolume = BigDecimal.ZERO;
|
||||
BigDecimal qRubberPhr = BigDecimal.ZERO;
|
||||
BigDecimal qRubberVolume = BigDecimal.ZERO;
|
||||
BigDecimal naturalRubber = BigDecimal.ZERO;
|
||||
BigDecimal syntheticRubber = BigDecimal.ZERO;
|
||||
boolean hasManual = false;
|
||||
Map<String, MesMixerMaterial> materialCache = new HashMap<>();
|
||||
Set<String> naturalCategoryIds = mesXslFormulaSpecSettingService.getNaturalMinorCategoryIds();
|
||||
Set<String> syntheticCategoryIds = mesXslFormulaSpecSettingService.getSyntheticMinorCategoryIds();
|
||||
for (MesXslFormulaSpecLine line : lines) {
|
||||
if (line == null) {
|
||||
continue;
|
||||
}
|
||||
if (line.getPhr() != null) {
|
||||
totalPhr = totalPhr.add(line.getPhr());
|
||||
if ("A".equals(line.getStep())) {
|
||||
aRubberPhr = aRubberPhr.add(line.getPhr());
|
||||
} else if ("Q".equals(line.getStep())) {
|
||||
qRubberPhr = qRubberPhr.add(line.getPhr());
|
||||
}
|
||||
}
|
||||
if ("manual".equals(line.getWeighMode())) {
|
||||
hasManual = true;
|
||||
}
|
||||
BigDecimal volume = resolveLineVolume(line);
|
||||
if (volume == null) {
|
||||
continue;
|
||||
}
|
||||
if ("A".equals(line.getStep())) {
|
||||
aRubberVolume = aRubberVolume.add(volume);
|
||||
} else if ("Q".equals(line.getStep())) {
|
||||
qRubberVolume = qRubberVolume.add(volume);
|
||||
}
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】含胶率按密炼物料小类汇总重量%-----------
|
||||
if (line.getWeightPercent() != null && StringUtils.isNotBlank(line.getMixerMaterialId())) {
|
||||
MesMixerMaterial mixerMaterial = materialCache.computeIfAbsent(
|
||||
line.getMixerMaterialId(), mesMixerMaterialService::getById);
|
||||
if (mixerMaterial != null && StringUtils.isNotBlank(mixerMaterial.getMinorCategoryId())) {
|
||||
String minorCategoryId = mixerMaterial.getMinorCategoryId();
|
||||
if (!naturalCategoryIds.isEmpty() && naturalCategoryIds.contains(minorCategoryId)) {
|
||||
naturalRubber = naturalRubber.add(line.getWeightPercent());
|
||||
} else if (!syntheticCategoryIds.isEmpty() && syntheticCategoryIds.contains(minorCategoryId)) {
|
||||
syntheticRubber = syntheticRubber.add(line.getWeightPercent());
|
||||
}
|
||||
}
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】含胶率按密炼物料小类汇总重量%-----------
|
||||
}
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】STEP全为A/Q时对应胶比重清零并写库-----------
|
||||
BigDecimal aRubberSg = aRubberVolume.compareTo(BigDecimal.ZERO) > 0
|
||||
? aRubberPhr.divide(aRubberVolume, 6, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal qRubberSg = qRubberVolume.compareTo(BigDecimal.ZERO) > 0
|
||||
? qRubberPhr.divide(qRubberVolume, 6, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal aRubberTotalPhr = aRubberPhr.compareTo(BigDecimal.ZERO) > 0 ? aRubberPhr : null;
|
||||
BigDecimal naturalRubberValue = naturalRubber.compareTo(BigDecimal.ZERO) > 0
|
||||
? naturalRubber.setScale(4, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal syntheticRubberValue = syntheticRubber.compareTo(BigDecimal.ZERO) > 0
|
||||
? syntheticRubber.setScale(4, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal totalAmount = null;
|
||||
if (naturalRubberValue != null || syntheticRubberValue != null) {
|
||||
totalAmount = (naturalRubberValue != null ? naturalRubberValue : BigDecimal.ZERO)
|
||||
.add(syntheticRubberValue != null ? syntheticRubberValue : BigDecimal.ZERO)
|
||||
.setScale(4, RoundingMode.HALF_UP);
|
||||
}
|
||||
LambdaUpdateWrapper<MesXslFormulaSpec> updateWrapper = new LambdaUpdateWrapper<MesXslFormulaSpec>()
|
||||
.eq(MesXslFormulaSpec::getId, mainId)
|
||||
.set(MesXslFormulaSpec::getTotalPhr, totalPhr)
|
||||
.set(MesXslFormulaSpec::getHasManualBatch, hasManual ? 1 : 0)
|
||||
.set(MesXslFormulaSpec::getARubberTotalPhr, aRubberTotalPhr)
|
||||
.set(MesXslFormulaSpec::getARubberSg, aRubberSg)
|
||||
.set(MesXslFormulaSpec::getQRubberSg, qRubberSg)
|
||||
.set(MesXslFormulaSpec::getNaturalRubber, naturalRubberValue)
|
||||
.set(MesXslFormulaSpec::getSyntheticRubber, syntheticRubberValue)
|
||||
.set(MesXslFormulaSpec::getTotalAmount, totalAmount);
|
||||
this.update(updateWrapper);
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】STEP全为A/Q时对应胶比重清零并写库-----------
|
||||
}
|
||||
|
||||
/** 优先取明细已保存体积，缺失时按 PHR/物料比重补算 */
|
||||
private BigDecimal resolveLineVolume(MesXslFormulaSpecLine line) {
|
||||
if (line == null) {
|
||||
return null;
|
||||
}
|
||||
if (line.getVolume() != null && line.getVolume().compareTo(BigDecimal.ZERO) > 0) {
|
||||
return line.getVolume();
|
||||
}
|
||||
if (line.getPhr() == null || StringUtils.isBlank(line.getMixerMaterialId())) {
|
||||
return null;
|
||||
}
|
||||
MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
|
||||
if (material == null || material.getSpecificGravity() == null || material.getSpecificGravity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return null;
|
||||
}
|
||||
return line.getPhr().divide(material.getSpecificGravity(), 6, RoundingMode.HALF_UP);
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】保存后汇总A/Q胶比重写入数据库-----------
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package org.jeecg.modules.xslmes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecg.modules.system.entity.SysCategory;
|
||||
import org.jeecg.modules.system.service.ISysCategoryService;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecSettingMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
public class MesXslFormulaSpecSettingServiceImpl extends ServiceImpl<MesXslFormulaSpecSettingMapper, MesXslFormulaSpecSetting>
|
||||
implements IMesXslFormulaSpecSettingService {
|
||||
|
||||
private static final String DEFAULT_NATURAL_CATEGORY_CODE = "XSLMES_MATERIAL_RAW_AUX_TRJ";
|
||||
private static final String DEFAULT_SYNTHETIC_CATEGORY_CODE = "XSLMES_MATERIAL_RAW_AUX_HCJ";
|
||||
|
||||
private final ISysCategoryService sysCategoryService;
|
||||
|
||||
public MesXslFormulaSpecSettingServiceImpl(ISysCategoryService sysCategoryService) {
|
||||
this.sysCategoryService = sysCategoryService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesXslFormulaRubberContentSettingVO getRubberContentSetting() {
|
||||
MesXslFormulaSpecSetting setting = loadOrInitSetting();
|
||||
MesXslFormulaRubberContentSettingVO vo = new MesXslFormulaRubberContentSettingVO();
|
||||
vo.setNaturalMinorCategoryIds(parseIdList(setting.getNaturalMinorCategoryIds()));
|
||||
vo.setSyntheticMinorCategoryIds(parseIdList(setting.getSyntheticMinorCategoryIds()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveRubberContentSetting(MesXslFormulaRubberContentSettingVO settingVo) {
|
||||
MesXslFormulaSpecSetting setting = loadOrInitSetting();
|
||||
setting.setNaturalMinorCategoryIds(joinIdList(settingVo != null ? settingVo.getNaturalMinorCategoryIds() : null));
|
||||
setting.setSyntheticMinorCategoryIds(joinIdList(settingVo != null ? settingVo.getSyntheticMinorCategoryIds() : null));
|
||||
setting.setUpdateTime(new Date());
|
||||
this.updateById(setting);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getNaturalMinorCategoryIds() {
|
||||
return new LinkedHashSet<>(parseIdList(loadOrInitSetting().getNaturalMinorCategoryIds()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getSyntheticMinorCategoryIds() {
|
||||
return new LinkedHashSet<>(parseIdList(loadOrInitSetting().getSyntheticMinorCategoryIds()));
|
||||
}
|
||||
|
||||
private MesXslFormulaSpecSetting loadOrInitSetting() {
|
||||
MesXslFormulaSpecSetting setting = this.getById(MesXslFormulaSpecSetting.DEFAULT_ID);
|
||||
if (setting != null) {
|
||||
return setting;
|
||||
}
|
||||
setting = new MesXslFormulaSpecSetting();
|
||||
setting.setId(MesXslFormulaSpecSetting.DEFAULT_ID);
|
||||
setting.setNaturalMinorCategoryIds(resolveCategoryIdByCode(DEFAULT_NATURAL_CATEGORY_CODE));
|
||||
setting.setSyntheticMinorCategoryIds(resolveCategoryIdByCode(DEFAULT_SYNTHETIC_CATEGORY_CODE));
|
||||
setting.setCreateTime(new Date());
|
||||
this.save(setting);
|
||||
return setting;
|
||||
}
|
||||
|
||||
private String resolveCategoryIdByCode(String categoryCode) {
|
||||
if (StringUtils.isBlank(categoryCode)) {
|
||||
return null;
|
||||
}
|
||||
SysCategory category = sysCategoryService.getOne(
|
||||
new LambdaQueryWrapper<SysCategory>().eq(SysCategory::getCode, categoryCode).last("LIMIT 1"));
|
||||
return category != null ? category.getId() : null;
|
||||
}
|
||||
|
||||
private List<String> parseIdList(String raw) {
|
||||
if (StringUtils.isBlank(raw)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return Arrays.stream(raw.split(","))
|
||||
.map(String::trim)
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private String joinIdList(List<String> ids) {
|
||||
if (ids == null || ids.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
return ids.stream().filter(StringUtils::isNotBlank).map(String::trim).distinct().collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package org.jeecg.modules.xslmes.util;
|
||||
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
|
||||
/**
|
||||
* 设备点检/保养业务提示文案
|
||||
*/
|
||||
public final class MesXslEquipInspectBizMsg {
|
||||
|
||||
private MesXslEquipInspectBizMsg() {}
|
||||
|
||||
public static String recordTypeLabel(String recordType) {
|
||||
return "inspect".equals(recordType) ? "点检" : "保养";
|
||||
}
|
||||
|
||||
/** 未维护该类型设备点检配置（不生成记录） */
|
||||
public static String noConfigMessage(String equipmentName, String recordType) {
|
||||
String name = oConvertUtils.isNotEmpty(equipmentName) ? equipmentName.trim() : "该设备";
|
||||
return name + " 未维护" + recordTypeLabel(recordType) + "类型的设备点检配置";
|
||||
}
|
||||
|
||||
/** 已有点检配置主表但无明细行 */
|
||||
public static String noConfigLineMessage(String equipmentName, String recordType) {
|
||||
String name = oConvertUtils.isNotEmpty(equipmentName) ? equipmentName.trim() : "该设备";
|
||||
return name + " 的" + recordTypeLabel(recordType) + "类型设备点检配置未维护明细项";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
|
||||
/**
|
||||
* 设备点检配置主子保存页 VO，继承主表实体（含 {@link MesXslEquipInspectConfig#lineList} 明细）。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MesXslEquipInspectConfigPage extends MesXslEquipInspectConfig {}
|
||||
@@ -0,0 +1,19 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 从设备台账批量生成点检/保养记录
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "批量生成点检保养记录请求")
|
||||
public class MesXslEquipInspectRecordBatchCreateDTO {
|
||||
|
||||
@Schema(description = "设备台账主键列表")
|
||||
private List<String> equipmentLedgerIds;
|
||||
|
||||
@Schema(description = "记录类型 inspect点检/maintain保养")
|
||||
private String recordType;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 批量生成点检/保养记录结果
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "批量生成点检保养记录结果")
|
||||
public class MesXslEquipInspectRecordBatchCreateResult {
|
||||
|
||||
@Schema(description = "成功条数")
|
||||
private int successCount;
|
||||
|
||||
@Schema(description = "失败说明（按设备）")
|
||||
private List<String> failMessages = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 不合格点检记录处理入参
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "点检保养记录-不合格处理")
|
||||
public class MesXslEquipInspectRecordHandleDTO {
|
||||
|
||||
@Schema(description = "记录主键", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "处理人用户ID")
|
||||
private String handlerUserId;
|
||||
|
||||
@Schema(description = "处理人账号")
|
||||
private String handlerUsername;
|
||||
|
||||
@Schema(description = "处理人姓名")
|
||||
private String handlerRealname;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "处理时间")
|
||||
private Date handleTime;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
|
||||
/**
|
||||
* 点检/保养记录主子保存 VO
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MesXslEquipInspectRecordPage extends MesXslEquipInspectRecord {}
|
||||
@@ -0,0 +1,22 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 配合示方含胶率物料小类配置
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "配合示方含胶率物料小类配置")
|
||||
public class MesXslFormulaRubberContentSettingVO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "天然橡胶物料小类ID列表")
|
||||
private List<String> naturalMinorCategoryIds = new ArrayList<>();
|
||||
|
||||
@Schema(description = "合成橡胶物料小类ID列表")
|
||||
private List<String> syntheticMinorCategoryIds = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
|
||||
/** 配合示方主子保存 VO */
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MesXslFormulaSpecPage extends MesXslFormulaSpec {}
|
||||
Reference in New Issue
Block a user