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

密炼生产计划维护表更改

Browse Source
This commit is contained in:
chenx
2026-06-17 16:39:39 +08:00
parent 2ec2b6a628
commit 816af5df6e
9 changed files with 384 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixingProductionPlan.java
View File

@@ -43,91 +43,47 @@ public class MesXslMixingProductionPlan implements Serializable {
@Schema(description = "机台名称")
private String machineName;
@Excel(name = "班次标识", width = 10)
@Schema(description = "班次标识：1早班 2中班 3晚班")
private Integer shiftFlag;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "计划日期（保存时写入当前日期）")
private Date planDate;
@Schema(description = "计划号（yyyyMMddA三位流水）")
private String planNo;
@Schema(description = "早班计划ID")
private String morningPlanId;
@Schema(description = "早班计划类型 M母胶/F终胶")
private String morningPlanType;
@Schema(description = "早班生产订单ID")
private String morningSourceOrderId;
@Excel(name = "早班生产订单", width = 20)
private String morningOrderNo;
@Schema(description = "计划ID（母胶/终胶计划）")
private String planId;
@Schema(description = "计划类型 M母胶/F终胶")
private String planType;
@Schema(description = "生产订单ID")
private String sourceOrderId;
@Schema(description = "胶料ID（取母胶/终胶计划materialCode）")
private String materialId;
@Schema(description = "胶料名称（取母胶/终胶计划mesMaterialName）")
private String materialName;
@Excel(name = "生产订单", width = 20)
private String orderNo;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "早班订单日期")
private Date morningOrderDate;
@Excel(name = "早班配方名称", width = 20)
private String morningFormulaName;
@Excel(name = "早班计划重量", width = 15)
private BigDecimal morningPlanWeight;
@Excel(name = "早班计划车数", width = 12)
private Integer morningPlannedCarCount;
@Excel(name = "早班已排产车数", width = 12)
private Integer morningScheduledCarCount;
@Excel(name = "早班完成车数", width = 12)
private Integer morningFinishedCarCount;
@Excel(name = "早班计划", width = 12)
private Integer morningPlanCount;
@Excel(name = "早班备注", width = 20)
private String morningRemark;
@Schema(description = "中班计划ID")
private String noonPlanId;
@Schema(description = "中班计划类型 M母胶/F终胶")
private String noonPlanType;
@Schema(description = "中班生产订单ID")
private String noonSourceOrderId;
@Excel(name = "中班生产订单", width = 20)
private String noonOrderNo;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "中班订单日期")
private Date noonOrderDate;
@Excel(name = "中班配方名称", width = 20)
private String noonFormulaName;
@Excel(name = "中班计划重量", width = 15)
private BigDecimal noonPlanWeight;
@Excel(name = "中班计划车数", width = 12)
private Integer noonPlannedCarCount;
@Excel(name = "中班已排产车数", width = 12)
private Integer noonScheduledCarCount;
@Excel(name = "中班完成车数", width = 12)
private Integer noonFinishedCarCount;
@Excel(name = "中班计划", width = 12)
private Integer noonPlanCount;
@Excel(name = "中班备注", width = 20)
private String noonRemark;
@Schema(description = "晚班计划ID")
private String nightPlanId;
@Schema(description = "晚班计划类型 M母胶/F终胶")
private String nightPlanType;
@Schema(description = "晚班生产订单ID")
private String nightSourceOrderId;
@Excel(name = "晚班生产订单", width = 20)
private String nightOrderNo;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "晚班订单日期")
private Date nightOrderDate;
@Excel(name = "晚班配方名称", width = 20)
private String nightFormulaName;
@Excel(name = "晚班计划重量", width = 15)
private BigDecimal nightPlanWeight;
@Excel(name = "晚班计划车数", width = 12)
private Integer nightPlannedCarCount;
@Excel(name = "晚班已排产车数", width = 12)
private Integer nightScheduledCarCount;
@Excel(name = "晚班完成车数", width = 12)
private Integer nightFinishedCarCount;
@Excel(name = "晚班计划", width = 12)
private Integer nightPlanCount;
@Excel(name = "晚班备注", width = 20)
private String nightRemark;
@Schema(description = "订单日期")
private Date orderDate;
@Excel(name = "配方名称", width = 20)
private String formulaName;
@Excel(name = "计划重量", width = 15)
private BigDecimal planWeight;
@Excel(name = "计划车数", width = 12)
private Integer plannedCarCount;
@Excel(name = "已排产车数", width = 12)
private Integer scheduledCarCount;
@Excel(name = "完成车数", width = 12)
private Integer finishedCarCount;
@Excel(name = "计划", width = 12)
private Integer planCount;
@Excel(name = "备注", width = 20)
private String remark;
private Integer tenantId;
private String sysOrgCode;

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -15,6 +17,8 @@ import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.mes.material.entity.MesMaterial;
import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
import org.jeecg.modules.xslmes.entity.MesXslFinalBatchPlan;
import org.jeecg.modules.xslmes.entity.MesXslMasterBatchPlan;
@@ -35,21 +39,25 @@ import org.springframework.util.CollectionUtils;
public class MesXslMixingProductionPlanServiceImpl
extends ServiceImpl<MesXslMixingProductionPlanMapper, MesXslMixingProductionPlan>
implements IMesXslMixingProductionPlanService {
private static final DateTimeFormatter PLAN_NO_DATE_FMT = DateTimeFormatter.BASIC_ISO_DATE;
private final MesXslEquipmentLedgerMapper equipmentLedgerMapper;
private final MesXslMasterBatchPlanMapper masterBatchPlanMapper;
private final MesXslFinalBatchPlanMapper finalBatchPlanMapper;
private final MesXslMixingSpecMapper mixingSpecMapper;
private final MesMaterialMapper mesMaterialMapper;
public MesXslMixingProductionPlanServiceImpl(
MesXslEquipmentLedgerMapper equipmentLedgerMapper,
MesXslMasterBatchPlanMapper masterBatchPlanMapper,
MesXslFinalBatchPlanMapper finalBatchPlanMapper,
MesXslMixingSpecMapper mixingSpecMapper) {
MesXslMixingSpecMapper mixingSpecMapper,
MesMaterialMapper mesMaterialMapper) {
this.equipmentLedgerMapper = equipmentLedgerMapper;
this.masterBatchPlanMapper = masterBatchPlanMapper;
this.finalBatchPlanMapper = finalBatchPlanMapper;
this.mixingSpecMapper = mixingSpecMapper;
this.mesMaterialMapper = mesMaterialMapper;
}
@Override
@@ -60,13 +68,14 @@ public class MesXslMixingProductionPlanServiceImpl
return;
}
Map<String, String> machineNameCache = new HashMap<>();
Map<String, Integer> dailyPlanNoCounter = new HashMap<>();
List<MesXslMixingProductionPlan> saveList = new ArrayList<>();
int sort = 1;
for (MesXslMixingProductionPlan row : rows) {
if (row == null || !hasBusinessData(row)) {
continue;
}
normalizeRow(row, machineNameCache);
normalizeRow(row, machineNameCache, dailyPlanNoCounter);
row.setSortNo(sort++);
saveList.add(row);
}
@@ -77,26 +86,27 @@ public class MesXslMixingProductionPlanServiceImpl
private boolean hasBusinessData(MesXslMixingProductionPlan row) {
return StringUtils.isNotBlank(row.getMachineId())
|| StringUtils.isNotBlank(row.getMorningPlanId())
|| StringUtils.isNotBlank(row.getNoonPlanId())
|| StringUtils.isNotBlank(row.getNightPlanId())
|| StringUtils.isNotBlank(row.getMorningRemark())
|| StringUtils.isNotBlank(row.getNoonRemark())
|| StringUtils.isNotBlank(row.getNightRemark())
|| row.getMorningPlanCount() != null
|| row.getNoonPlanCount() != null
|| row.getNightPlanCount() != null;
|| StringUtils.isNotBlank(row.getPlanId())
|| StringUtils.isNotBlank(row.getRemark())
|| row.getPlanCount() != null;
}
private void normalizeRow(
MesXslMixingProductionPlan row, Map<String, String> machineNameCache) {
MesXslMixingProductionPlan row,
Map<String, String> machineNameCache,
Map<String, Integer> dailyPlanNoCounter) {
row.setId(null);
row.setMachineId(StringUtils.trimToNull(row.getMachineId()));
row.setMachineName(resolveMachineName(row.getMachineId(), machineNameCache));
Integer shiftFlag = row.getShiftFlag();
if (shiftFlag == null || shiftFlag < 1 || shiftFlag > 3) {
row.setShiftFlag(1);
}
row.setPlanId(StringUtils.trimToNull(row.getPlanId()));
row.setPlanType(StringUtils.upperCase(StringUtils.trimToNull(row.getPlanType())));
row.setPlanDate(new Date());
fillShiftFromPlan(row, "morning");
fillShiftFromPlan(row, "noon");
fillShiftFromPlan(row, "night");
row.setPlanNo(generatePlanNo(row.getPlanDate(), dailyPlanNoCounter));
fillFromPlan(row);
Date now = new Date();
if (row.getCreateTime() == null) {
row.setCreateTime(now);
@@ -107,6 +117,14 @@ public class MesXslMixingProductionPlanServiceImpl
}
}
private String generatePlanNo(Date planDate, Map<String, Integer> dailyPlanNoCounter) {
String datePart = planDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().format(PLAN_NO_DATE_FMT);
Integer current = dailyPlanNoCounter.get(datePart);
int next = current == null ? 1 : current + 1;
dailyPlanNoCounter.put(datePart, next);
return datePart + "A" + String.format("%03d", next);
}
private String resolveMachineName(String machineId, Map<String, String> cache) {
if (StringUtils.isBlank(machineId)) {
return null;
@@ -119,171 +137,118 @@ public class MesXslMixingProductionPlanServiceImpl
});
}
private void fillShiftFromPlan(MesXslMixingProductionPlan row, String shift) {
String planId = getPlanId(row, shift);
String planType = StringUtils.upperCase(StringUtils.trimToEmpty(getPlanType(row, shift)));
private void fillFromPlan(MesXslMixingProductionPlan row) {
String planId = row.getPlanId();
String planType = StringUtils.upperCase(StringUtils.trimToEmpty(row.getPlanType()));
if (StringUtils.isBlank(planId)) {
clearShiftPlanFields(row, shift);
clearPlanFields(row);
return;
}
if ("M".equals(planType)) {
MesXslMasterBatchPlan plan = masterBatchPlanMapper.selectById(planId);
if (plan == null) {
clearShiftPlanFields(row, shift);
clearPlanFields(row);
return;
}
setShiftFromMasterPlan(row, shift, plan);
setFromMasterPlan(row, plan);
return;
}
MesXslFinalBatchPlan finalPlan = finalBatchPlanMapper.selectById(planId);
if (finalPlan == null) {
clearShiftPlanFields(row, shift);
clearPlanFields(row);
return;
}
setShiftFromFinalPlan(row, shift, finalPlan);
setFromFinalPlan(row, finalPlan);
}
private String getPlanId(MesXslMixingProductionPlan row, String shift) {
return switch (shift) {
case "morning" -> StringUtils.trimToNull(row.getMorningPlanId());
case "noon" -> StringUtils.trimToNull(row.getNoonPlanId());
default -> StringUtils.trimToNull(row.getNightPlanId());
};
}
private String getPlanType(MesXslMixingProductionPlan row, String shift) {
return switch (shift) {
case "morning" -> row.getMorningPlanType();
case "noon" -> row.getNoonPlanType();
default -> row.getNightPlanType();
};
}
private void setShiftFromMasterPlan(
MesXslMixingProductionPlan row, String shift, MesXslMasterBatchPlan plan) {
setShiftPlanType(row, shift, "M");
setShiftSourceOrderId(row, shift, plan.getSourceOrderId());
setShiftOrderNo(row, shift, plan.getOrderNo());
setShiftOrderDate(row, shift, plan.getOrderDate());
setShiftFormulaName(
row,
shift,
private void setFromMasterPlan(MesXslMixingProductionPlan row, MesXslMasterBatchPlan plan) {
row.setPlanType("M");
row.setSourceOrderId(plan.getSourceOrderId());
row.setMaterialId(resolveMesMaterialId(plan.getMesMaterialName(), plan.getMaterialCode()));
row.setMaterialName(plan.getMesMaterialName());
row.setOrderNo(plan.getOrderNo());
row.setOrderDate(plan.getOrderDate());
row.setFormulaName(
resolveFormulaNameByMachineAndMaterial(
row.getMachineId(),
row.getMachineName(),
plan.getMaterialCode(),
plan.getMesMaterialName(),
true));
setShiftPlanWeight(row, shift, plan.getPlanWeight());
setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount());
setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount());
setShiftFinishedCarCount(row, shift, plan.getFinishedCarCount());
row.setPlanWeight(plan.getPlanWeight());
row.setPlannedCarCount(plan.getPlannedCarCount());
row.setScheduledCarCount(plan.getScheduledCarCount());
row.setFinishedCarCount(plan.getFinishedCarCount());
}
private void setShiftFromFinalPlan(
MesXslMixingProductionPlan row, String shift, MesXslFinalBatchPlan plan) {
setShiftPlanType(row, shift, "F");
setShiftSourceOrderId(row, shift, plan.getSourceOrderId());
setShiftOrderNo(row, shift, plan.getOrderNo());
setShiftOrderDate(row, shift, plan.getOrderDate());
setShiftFormulaName(
row,
shift,
private void setFromFinalPlan(MesXslMixingProductionPlan row, MesXslFinalBatchPlan plan) {
row.setPlanType("F");
row.setSourceOrderId(plan.getSourceOrderId());
row.setMaterialId(resolveMesMaterialId(plan.getMesMaterialName(), plan.getMaterialCode()));
row.setMaterialName(plan.getMesMaterialName());
row.setOrderNo(plan.getOrderNo());
row.setOrderDate(plan.getOrderDate());
row.setFormulaName(
resolveFormulaNameByMachineAndMaterial(
row.getMachineId(),
row.getMachineName(),
plan.getMaterialCode(),
plan.getMesMaterialName(),
true));
setShiftPlanWeight(row, shift, plan.getPlanWeight());
setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount());
setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount());
setShiftFinishedCarCount(row, shift, plan.getFinishedCarCount());
row.setPlanWeight(plan.getPlanWeight());
row.setPlannedCarCount(plan.getPlannedCarCount());
row.setScheduledCarCount(plan.getScheduledCarCount());
row.setFinishedCarCount(plan.getFinishedCarCount());
}
private void clearShiftPlanFields(MesXslMixingProductionPlan row, String shift) {
setShiftPlanType(row, shift, null);
setShiftSourceOrderId(row, shift, null);
setShiftOrderNo(row, shift, null);
setShiftOrderDate(row, shift, null);
setShiftFormulaName(row, shift, null);
setShiftPlanWeight(row, shift, null);
setShiftPlannedCarCount(row, shift, null);
setShiftScheduledCarCount(row, shift, null);
setShiftFinishedCarCount(row, shift, null);
private void clearPlanFields(MesXslMixingProductionPlan row) {
row.setPlanType(null);
row.setSourceOrderId(null);
row.setMaterialId(null);
row.setMaterialName(null);
row.setOrderNo(null);
row.setOrderDate(null);
row.setFormulaName(null);
row.setPlanWeight(null);
row.setPlannedCarCount(null);
row.setScheduledCarCount(null);
row.setFinishedCarCount(null);
}
private void setShiftPlanType(MesXslMixingProductionPlan row, String shift, String value) {
switch (shift) {
case "morning" -> row.setMorningPlanType(value);
case "noon" -> row.setNoonPlanType(value);
default -> row.setNightPlanType(value);
private String resolveMesMaterialId(String mesMaterialName, String materialCode) {
String name = StringUtils.trimToNull(mesMaterialName);
String code = StringUtils.trimToNull(materialCode);
LambdaQueryWrapper<MesMaterial> byNameWrapper =
new LambdaQueryWrapper<MesMaterial>()
.eq(name != null, MesMaterial::getMaterialName, name)
.and(
w ->
w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesMaterial::getDelFlag))
.orderByDesc(MesMaterial::getUpdateTime)
.orderByDesc(MesMaterial::getCreateTime)
.last("LIMIT 1");
MesMaterial byName = mesMaterialMapper.selectOne(byNameWrapper);
if (byName != null) {
return byName.getId();
}
}
private void setShiftSourceOrderId(MesXslMixingProductionPlan row, String shift, String value) {
switch (shift) {
case "morning" -> row.setMorningSourceOrderId(value);
case "noon" -> row.setNoonSourceOrderId(value);
default -> row.setNightSourceOrderId(value);
}
}
private void setShiftOrderNo(MesXslMixingProductionPlan row, String shift, String value) {
switch (shift) {
case "morning" -> row.setMorningOrderNo(value);
case "noon" -> row.setNoonOrderNo(value);
default -> row.setNightOrderNo(value);
}
}
private void setShiftOrderDate(MesXslMixingProductionPlan row, String shift, Date value) {
switch (shift) {
case "morning" -> row.setMorningOrderDate(value);
case "noon" -> row.setNoonOrderDate(value);
default -> row.setNightOrderDate(value);
}
}
private void setShiftFormulaName(MesXslMixingProductionPlan row, String shift, String value) {
switch (shift) {
case "morning" -> row.setMorningFormulaName(value);
case "noon" -> row.setNoonFormulaName(value);
default -> row.setNightFormulaName(value);
}
}
private void setShiftPlanWeight(
MesXslMixingProductionPlan row, String shift, java.math.BigDecimal value) {
switch (shift) {
case "morning" -> row.setMorningPlanWeight(value);
case "noon" -> row.setNoonPlanWeight(value);
default -> row.setNightPlanWeight(value);
}
}
private void setShiftPlannedCarCount(MesXslMixingProductionPlan row, String shift, Integer value) {
switch (shift) {
case "morning" -> row.setMorningPlannedCarCount(value);
case "noon" -> row.setNoonPlannedCarCount(value);
default -> row.setNightPlannedCarCount(value);
}
}
private void setShiftScheduledCarCount(MesXslMixingProductionPlan row, String shift, Integer value) {
switch (shift) {
case "morning" -> row.setMorningScheduledCarCount(value);
case "noon" -> row.setNoonScheduledCarCount(value);
default -> row.setNightScheduledCarCount(value);
}
}
private void setShiftFinishedCarCount(MesXslMixingProductionPlan row, String shift, Integer value) {
switch (shift) {
case "morning" -> row.setMorningFinishedCarCount(value);
case "noon" -> row.setNoonFinishedCarCount(value);
default -> row.setNightFinishedCarCount(value);
if (code == null) {
return null;
}
LambdaQueryWrapper<MesMaterial> byCodeWrapper =
new LambdaQueryWrapper<MesMaterial>()
.eq(MesMaterial::getMaterialCode, code)
.and(
w ->
w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesMaterial::getDelFlag))
.orderByDesc(MesMaterial::getUpdateTime)
.orderByDesc(MesMaterial::getCreateTime)
.last("LIMIT 1");
MesMaterial byCode = mesMaterialMapper.selectOne(byCodeWrapper);
return byCode == null ? null : byCode.getId();
}
@Override