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

新增配合示方模块，包括主子表结构、控制器、服务及映射器的实现，支持增删改查功能，优化胶料代号生成逻辑及相关字段，增强数据验证和用户体验。

Browse Source
This commit is contained in:
geht
2026-05-21 18:49:20 +08:00
parent a10aae420a
commit 89407d1f1d
32 changed files with 5711 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志 Normal file
View 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

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

@@ -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：【配合示方】主子表保存校验-----------
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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胶比重写入数据库-----------
}

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

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

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

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

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

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