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 = "机台名称") @Schema(description = "机台名称")
private String machineName; private String machineName;
@Excel(name = "班次标识", width = 10)
@Schema(description = "班次标识：1早班 2中班 3晚班")
private Integer shiftFlag;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "计划日期（保存时写入当前日期）") @Schema(description = "计划日期（保存时写入当前日期）")
private Date planDate; private Date planDate;
@Schema(description = "计划号（yyyyMMddA三位流水）")
private String planNo;
@Schema(description = "早班计划ID") @Schema(description = "计划ID（母胶/终胶计划）")
private String morningPlanId; private String planId;
@Schema(description = "早班计划类型 M母胶/F终胶") @Schema(description = "计划类型 M母胶/F终胶")
private String morningPlanType; private String planType;
@Schema(description = "早班生产订单ID") @Schema(description = "生产订单ID")
private String morningSourceOrderId; private String sourceOrderId;
@Excel(name = "早班生产订单", width = 20) @Schema(description = "胶料ID（取母胶/终胶计划materialCode）")
private String morningOrderNo; private String materialId;
@Schema(description = "胶料名称（取母胶/终胶计划mesMaterialName）")
private String materialName;
@Excel(name = "生产订单", width = 20)
private String orderNo;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "早班订单日期") @Schema(description = "订单日期")
private Date morningOrderDate; private Date orderDate;
@Excel(name = "早班配方名称", width = 20) @Excel(name = "配方名称", width = 20)
private String morningFormulaName; private String formulaName;
@Excel(name = "早班计划重量", width = 15) @Excel(name = "计划重量", width = 15)
private BigDecimal morningPlanWeight; private BigDecimal planWeight;
@Excel(name = "早班计划车数", width = 12) @Excel(name = "计划车数", width = 12)
private Integer morningPlannedCarCount; private Integer plannedCarCount;
@Excel(name = "早班已排产车数", width = 12) @Excel(name = "已排产车数", width = 12)
private Integer morningScheduledCarCount; private Integer scheduledCarCount;
@Excel(name = "早班完成车数", width = 12) @Excel(name = "完成车数", width = 12)
private Integer morningFinishedCarCount; private Integer finishedCarCount;
@Excel(name = "早班计划", width = 12) @Excel(name = "计划", width = 12)
private Integer morningPlanCount; private Integer planCount;
@Excel(name = "早班备注", width = 20) @Excel(name = "备注", width = 20)
private String morningRemark; private String remark;
@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;
private Integer tenantId; private Integer tenantId;
private String sysOrgCode; 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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -15,6 +17,8 @@ import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant; 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.MesXslEquipmentLedger;
import org.jeecg.modules.xslmes.entity.MesXslFinalBatchPlan; import org.jeecg.modules.xslmes.entity.MesXslFinalBatchPlan;
import org.jeecg.modules.xslmes.entity.MesXslMasterBatchPlan; import org.jeecg.modules.xslmes.entity.MesXslMasterBatchPlan;
@@ -35,21 +39,25 @@ import org.springframework.util.CollectionUtils;
public class MesXslMixingProductionPlanServiceImpl public class MesXslMixingProductionPlanServiceImpl
extends ServiceImpl<MesXslMixingProductionPlanMapper, MesXslMixingProductionPlan> extends ServiceImpl<MesXslMixingProductionPlanMapper, MesXslMixingProductionPlan>
implements IMesXslMixingProductionPlanService { implements IMesXslMixingProductionPlanService {
private static final DateTimeFormatter PLAN_NO_DATE_FMT = DateTimeFormatter.BASIC_ISO_DATE;
private final MesXslEquipmentLedgerMapper equipmentLedgerMapper; private final MesXslEquipmentLedgerMapper equipmentLedgerMapper;
private final MesXslMasterBatchPlanMapper masterBatchPlanMapper; private final MesXslMasterBatchPlanMapper masterBatchPlanMapper;
private final MesXslFinalBatchPlanMapper finalBatchPlanMapper; private final MesXslFinalBatchPlanMapper finalBatchPlanMapper;
private final MesXslMixingSpecMapper mixingSpecMapper; private final MesXslMixingSpecMapper mixingSpecMapper;
private final MesMaterialMapper mesMaterialMapper;
public MesXslMixingProductionPlanServiceImpl( public MesXslMixingProductionPlanServiceImpl(
MesXslEquipmentLedgerMapper equipmentLedgerMapper, MesXslEquipmentLedgerMapper equipmentLedgerMapper,
MesXslMasterBatchPlanMapper masterBatchPlanMapper, MesXslMasterBatchPlanMapper masterBatchPlanMapper,
MesXslFinalBatchPlanMapper finalBatchPlanMapper, MesXslFinalBatchPlanMapper finalBatchPlanMapper,
MesXslMixingSpecMapper mixingSpecMapper) { MesXslMixingSpecMapper mixingSpecMapper,
MesMaterialMapper mesMaterialMapper) {
this.equipmentLedgerMapper = equipmentLedgerMapper; this.equipmentLedgerMapper = equipmentLedgerMapper;
this.masterBatchPlanMapper = masterBatchPlanMapper; this.masterBatchPlanMapper = masterBatchPlanMapper;
this.finalBatchPlanMapper = finalBatchPlanMapper; this.finalBatchPlanMapper = finalBatchPlanMapper;
this.mixingSpecMapper = mixingSpecMapper; this.mixingSpecMapper = mixingSpecMapper;
this.mesMaterialMapper = mesMaterialMapper;
} }
@Override @Override
@@ -60,13 +68,14 @@ public class MesXslMixingProductionPlanServiceImpl
return; return;
} }
Map<String, String> machineNameCache = new HashMap<>(); Map<String, String> machineNameCache = new HashMap<>();
Map<String, Integer> dailyPlanNoCounter = new HashMap<>();
List<MesXslMixingProductionPlan> saveList = new ArrayList<>(); List<MesXslMixingProductionPlan> saveList = new ArrayList<>();
int sort = 1; int sort = 1;
for (MesXslMixingProductionPlan row : rows) { for (MesXslMixingProductionPlan row : rows) {
if (row == null || !hasBusinessData(row)) { if (row == null || !hasBusinessData(row)) {
continue; continue;
} }
normalizeRow(row, machineNameCache); normalizeRow(row, machineNameCache, dailyPlanNoCounter);
row.setSortNo(sort++); row.setSortNo(sort++);
saveList.add(row); saveList.add(row);
} }
@@ -77,26 +86,27 @@ public class MesXslMixingProductionPlanServiceImpl
private boolean hasBusinessData(MesXslMixingProductionPlan row) { private boolean hasBusinessData(MesXslMixingProductionPlan row) {
return StringUtils.isNotBlank(row.getMachineId()) return StringUtils.isNotBlank(row.getMachineId())
|| StringUtils.isNotBlank(row.getMorningPlanId()) || StringUtils.isNotBlank(row.getPlanId())
|| StringUtils.isNotBlank(row.getNoonPlanId()) || StringUtils.isNotBlank(row.getRemark())
|| StringUtils.isNotBlank(row.getNightPlanId()) || row.getPlanCount() != null;
|| StringUtils.isNotBlank(row.getMorningRemark())
|| StringUtils.isNotBlank(row.getNoonRemark())
|| StringUtils.isNotBlank(row.getNightRemark())
|| row.getMorningPlanCount() != null
|| row.getNoonPlanCount() != null
|| row.getNightPlanCount() != null;
} }
private void normalizeRow( private void normalizeRow(
MesXslMixingProductionPlan row, Map<String, String> machineNameCache) { MesXslMixingProductionPlan row,
Map<String, String> machineNameCache,
Map<String, Integer> dailyPlanNoCounter) {
row.setId(null); row.setId(null);
row.setMachineId(StringUtils.trimToNull(row.getMachineId())); row.setMachineId(StringUtils.trimToNull(row.getMachineId()));
row.setMachineName(resolveMachineName(row.getMachineId(), machineNameCache)); 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()); row.setPlanDate(new Date());
fillShiftFromPlan(row, "morning"); row.setPlanNo(generatePlanNo(row.getPlanDate(), dailyPlanNoCounter));
fillShiftFromPlan(row, "noon"); fillFromPlan(row);
fillShiftFromPlan(row, "night");
Date now = new Date(); Date now = new Date();
if (row.getCreateTime() == null) { if (row.getCreateTime() == null) {
row.setCreateTime(now); 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) { private String resolveMachineName(String machineId, Map<String, String> cache) {
if (StringUtils.isBlank(machineId)) { if (StringUtils.isBlank(machineId)) {
return null; return null;
@@ -119,171 +137,118 @@ public class MesXslMixingProductionPlanServiceImpl
}); });
} }
private void fillShiftFromPlan(MesXslMixingProductionPlan row, String shift) { private void fillFromPlan(MesXslMixingProductionPlan row) {
String planId = getPlanId(row, shift); String planId = row.getPlanId();
String planType = StringUtils.upperCase(StringUtils.trimToEmpty(getPlanType(row, shift))); String planType = StringUtils.upperCase(StringUtils.trimToEmpty(row.getPlanType()));
if (StringUtils.isBlank(planId)) { if (StringUtils.isBlank(planId)) {
clearShiftPlanFields(row, shift); clearPlanFields(row);
return; return;
} }
if ("M".equals(planType)) { if ("M".equals(planType)) {
MesXslMasterBatchPlan plan = masterBatchPlanMapper.selectById(planId); MesXslMasterBatchPlan plan = masterBatchPlanMapper.selectById(planId);
if (plan == null) { if (plan == null) {
clearShiftPlanFields(row, shift); clearPlanFields(row);
return; return;
} }
setShiftFromMasterPlan(row, shift, plan); setFromMasterPlan(row, plan);
return; return;
} }
MesXslFinalBatchPlan finalPlan = finalBatchPlanMapper.selectById(planId); MesXslFinalBatchPlan finalPlan = finalBatchPlanMapper.selectById(planId);
if (finalPlan == null) { if (finalPlan == null) {
clearShiftPlanFields(row, shift); clearPlanFields(row);
return; return;
} }
setShiftFromFinalPlan(row, shift, finalPlan); setFromFinalPlan(row, finalPlan);
} }
private String getPlanId(MesXslMixingProductionPlan row, String shift) { private void setFromMasterPlan(MesXslMixingProductionPlan row, MesXslMasterBatchPlan plan) {
return switch (shift) { row.setPlanType("M");
case "morning" -> StringUtils.trimToNull(row.getMorningPlanId()); row.setSourceOrderId(plan.getSourceOrderId());
case "noon" -> StringUtils.trimToNull(row.getNoonPlanId()); row.setMaterialId(resolveMesMaterialId(plan.getMesMaterialName(), plan.getMaterialCode()));
default -> StringUtils.trimToNull(row.getNightPlanId()); row.setMaterialName(plan.getMesMaterialName());
}; row.setOrderNo(plan.getOrderNo());
} row.setOrderDate(plan.getOrderDate());
row.setFormulaName(
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,
resolveFormulaNameByMachineAndMaterial( resolveFormulaNameByMachineAndMaterial(
row.getMachineId(), row.getMachineId(),
row.getMachineName(), row.getMachineName(),
plan.getMaterialCode(), plan.getMaterialCode(),
plan.getMesMaterialName(), plan.getMesMaterialName(),
true)); true));
setShiftPlanWeight(row, shift, plan.getPlanWeight()); row.setPlanWeight(plan.getPlanWeight());
setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount()); row.setPlannedCarCount(plan.getPlannedCarCount());
setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount()); row.setScheduledCarCount(plan.getScheduledCarCount());
setShiftFinishedCarCount(row, shift, plan.getFinishedCarCount()); row.setFinishedCarCount(plan.getFinishedCarCount());
} }
private void setShiftFromFinalPlan( private void setFromFinalPlan(MesXslMixingProductionPlan row, MesXslFinalBatchPlan plan) {
MesXslMixingProductionPlan row, String shift, MesXslFinalBatchPlan plan) { row.setPlanType("F");
setShiftPlanType(row, shift, "F"); row.setSourceOrderId(plan.getSourceOrderId());
setShiftSourceOrderId(row, shift, plan.getSourceOrderId()); row.setMaterialId(resolveMesMaterialId(plan.getMesMaterialName(), plan.getMaterialCode()));
setShiftOrderNo(row, shift, plan.getOrderNo()); row.setMaterialName(plan.getMesMaterialName());
setShiftOrderDate(row, shift, plan.getOrderDate()); row.setOrderNo(plan.getOrderNo());
setShiftFormulaName( row.setOrderDate(plan.getOrderDate());
row, row.setFormulaName(
shift,
resolveFormulaNameByMachineAndMaterial( resolveFormulaNameByMachineAndMaterial(
row.getMachineId(), row.getMachineId(),
row.getMachineName(), row.getMachineName(),
plan.getMaterialCode(), plan.getMaterialCode(),
plan.getMesMaterialName(), plan.getMesMaterialName(),
true)); true));
setShiftPlanWeight(row, shift, plan.getPlanWeight()); row.setPlanWeight(plan.getPlanWeight());
setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount()); row.setPlannedCarCount(plan.getPlannedCarCount());
setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount()); row.setScheduledCarCount(plan.getScheduledCarCount());
setShiftFinishedCarCount(row, shift, plan.getFinishedCarCount()); row.setFinishedCarCount(plan.getFinishedCarCount());
} }
private void clearShiftPlanFields(MesXslMixingProductionPlan row, String shift) { private void clearPlanFields(MesXslMixingProductionPlan row) {
setShiftPlanType(row, shift, null); row.setPlanType(null);
setShiftSourceOrderId(row, shift, null); row.setSourceOrderId(null);
setShiftOrderNo(row, shift, null); row.setMaterialId(null);
setShiftOrderDate(row, shift, null); row.setMaterialName(null);
setShiftFormulaName(row, shift, null); row.setOrderNo(null);
setShiftPlanWeight(row, shift, null); row.setOrderDate(null);
setShiftPlannedCarCount(row, shift, null); row.setFormulaName(null);
setShiftScheduledCarCount(row, shift, null); row.setPlanWeight(null);
setShiftFinishedCarCount(row, shift, null); row.setPlannedCarCount(null);
row.setScheduledCarCount(null);
row.setFinishedCarCount(null);
} }
private void setShiftPlanType(MesXslMixingProductionPlan row, String shift, String value) { private String resolveMesMaterialId(String mesMaterialName, String materialCode) {
switch (shift) { String name = StringUtils.trimToNull(mesMaterialName);
case "morning" -> row.setMorningPlanType(value); String code = StringUtils.trimToNull(materialCode);
case "noon" -> row.setNoonPlanType(value); LambdaQueryWrapper<MesMaterial> byNameWrapper =
default -> row.setNightPlanType(value); 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();
} }
} if (code == null) {
return null;
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);
} }
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 @Override

18
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_134__mes_xsl_mixing_production_plan_shared_shift_fields.sql Normal file
View File

@@ -0,0 +1,18 @@
-- 密炼生产计划维护：早中晚共用字段 + 班次标识
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `shift_flag` int DEFAULT NULL COMMENT '班次标识：1早班 2中班 3晚班' AFTER `machine_name`,
ADD COLUMN IF NOT EXISTS `plan_id` varchar(32) DEFAULT NULL COMMENT '计划ID（母胶/终胶计划）' AFTER `plan_date`,
ADD COLUMN IF NOT EXISTS `plan_type` varchar(2) DEFAULT NULL COMMENT '计划类型：M母胶/F终胶' AFTER `plan_id`,
ADD COLUMN IF NOT EXISTS `source_order_id` varchar(32) DEFAULT NULL COMMENT '生产订单ID' AFTER `plan_type`,
ADD COLUMN IF NOT EXISTS `order_no` varchar(64) DEFAULT NULL COMMENT '生产订单号' AFTER `source_order_id`,
ADD COLUMN IF NOT EXISTS `order_date` date DEFAULT NULL COMMENT '订单日期' AFTER `order_no`,
ADD COLUMN IF NOT EXISTS `formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称' AFTER `order_date`,
ADD COLUMN IF NOT EXISTS `plan_weight` decimal(18,6) DEFAULT NULL COMMENT '计划重量' AFTER `formula_name`,
ADD COLUMN IF NOT EXISTS `planned_car_count` int DEFAULT NULL COMMENT '计划车数' AFTER `plan_weight`,
ADD COLUMN IF NOT EXISTS `scheduled_car_count` int DEFAULT NULL COMMENT '已排产车数' AFTER `planned_car_count`,
ADD COLUMN IF NOT EXISTS `finished_car_count` int DEFAULT NULL COMMENT '完成车数' AFTER `scheduled_car_count`,
ADD COLUMN IF NOT EXISTS `plan_count` int DEFAULT NULL COMMENT '计划' AFTER `finished_car_count`,
ADD COLUMN IF NOT EXISTS `remark` varchar(500) DEFAULT NULL COMMENT '备注' AFTER `plan_count`;

31
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_135__mes_xsl_mixing_production_plan_drop_redundant_shift_columns.sql Normal file
View File

@@ -0,0 +1,31 @@
-- 密炼生产计划维护：删除早/中/晚冗余字段，保留共用字段 + 班次标识
SET NAMES utf8mb4;
SET @drop_sql = (
SELECT IFNULL(
CONCAT(
'ALTER TABLE `mes_xsl_mixing_production_plan` ',
GROUP_CONCAT(CONCAT('DROP COLUMN `', column_name, '`') ORDER BY ordinal_position SEPARATOR ', ')
),
'SELECT 1'
)
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'mes_xsl_mixing_production_plan'
AND COLUMN_NAME IN (
'morning_plan_id', 'morning_plan_type', 'morning_source_order_id', 'morning_order_no', 'morning_order_date',
'morning_formula_name', 'morning_plan_weight', 'morning_planned_car_count', 'morning_scheduled_car_count',
'morning_finished_car_count', 'morning_plan_count', 'morning_remark',
'noon_plan_id', 'noon_plan_type', 'noon_source_order_id', 'noon_order_no', 'noon_order_date',
'noon_formula_name', 'noon_plan_weight', 'noon_planned_car_count', 'noon_scheduled_car_count',
'noon_finished_car_count', 'noon_plan_count', 'noon_remark',
'night_plan_id', 'night_plan_type', 'night_source_order_id', 'night_order_no', 'night_order_date',
'night_formula_name', 'night_plan_weight', 'night_planned_car_count', 'night_scheduled_car_count',
'night_finished_car_count', 'night_plan_count', 'night_remark'
)
);
PREPARE stmt FROM @drop_sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;

44
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_136__mes_xsl_mixing_production_plan_recreate.sql Normal file
View File

@@ -0,0 +1,44 @@
-- 密炼生产计划维护：删表重建（注意：会清空原表数据）
SET NAMES utf8mb4;
DROP TABLE IF EXISTS `mes_xsl_mixing_production_plan`;
CREATE TABLE `mes_xsl_mixing_production_plan` (
`id` varchar(32) NOT NULL COMMENT '主键',
`sort_no` int DEFAULT NULL COMMENT '排序号',
`machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID（mes_xsl_equipment_ledger.id）',
`machine_name` varchar(128) DEFAULT NULL COMMENT '机台名称冗余',
`shift_flag` int DEFAULT NULL COMMENT '班次标识：1早班 2中班 3晚班',
`plan_date` date DEFAULT NULL COMMENT '计划日期（保存时写入当前日期）',
`plan_no` varchar(32) DEFAULT NULL COMMENT '计划号（yyyyMMddA三位流水）',
`plan_id` varchar(32) DEFAULT NULL COMMENT '计划ID（母胶/终胶计划）',
`plan_type` varchar(2) DEFAULT NULL COMMENT '计划类型：M母胶/F终胶',
`source_order_id` varchar(32) DEFAULT NULL COMMENT '生产订单ID',
`material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）',
`material_name` varchar(128) DEFAULT NULL COMMENT '胶料名称（取母胶/终胶计划mesMaterialName）',
`order_no` varchar(64) DEFAULT NULL COMMENT '生产订单号',
`order_date` date DEFAULT NULL COMMENT '订单日期',
`formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
`plan_weight` decimal(18,6) DEFAULT NULL COMMENT '计划重量',
`planned_car_count` int DEFAULT NULL COMMENT '计划车数',
`scheduled_car_count` int DEFAULT NULL COMMENT '已排产车数',
`finished_car_count` int DEFAULT NULL COMMENT '完成车数',
`plan_count` int DEFAULT NULL COMMENT '计划',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`tenant_id` int DEFAULT NULL COMMENT '租户',
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门编码',
`create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
PRIMARY KEY (`id`),
KEY `idx_mxmp_machine` (`machine_id`),
KEY `idx_mxmp_plan_date` (`plan_date`),
KEY `idx_mxmp_plan_no` (`plan_no`),
KEY `idx_mxmp_shift_flag` (`shift_flag`),
KEY `idx_mxmp_plan_id` (`plan_id`),
KEY `idx_mxmp_sort` (`sort_no`),
KEY `idx_mxmp_tenant` (`tenant_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES密炼生产计划维护';

7
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_137__mes_xsl_mixing_production_plan_add_material_fields.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 密炼生产计划维护：新增胶料ID和胶料名称字段
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）' AFTER `source_order_id`,
ADD COLUMN IF NOT EXISTS `material_name` varchar(128) DEFAULT NULL COMMENT '胶料名称（取母胶/终胶计划mesMaterialName）' AFTER `material_id`;

6
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_138__mes_xsl_mixing_production_plan_fix_material_id_definition.sql Normal file
View File

@@ -0,0 +1,6 @@
-- 密炼生产计划维护：修正胶料ID字段定义为mes_material主键ID
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
MODIFY COLUMN `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）';

7
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_139__mes_xsl_mixing_production_plan_add_plan_no.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 密炼生产计划维护：新增计划号字段
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_production_plan`
ADD COLUMN IF NOT EXISTS `plan_no` varchar(32) DEFAULT NULL COMMENT '计划号（yyyyMMddA三位流水）' AFTER `plan_date`,
ADD INDEX `idx_mxmp_plan_no` (`plan_no`);

146
jeecgboot-vue3/src/views/xslmes/mesXslMixingProductionPlan/MesXslMixingProductionPlanList.vue
View File

@@ -14,15 +14,7 @@
<a-button preIcon="ant-design:reload-outlined" :loading="refreshing" :disabled="saving" @click="handleRefresh">刷新</a-button> <a-button preIcon="ant-design:reload-outlined" :loading="refreshing" :disabled="saving" @click="handleRefresh">刷新</a-button>
</div> </div>
<a-table <a-table :columns="columns" :data-source="rows" :pagination="false" :scroll="{ x: 1560 }" row-key="_rowKey" size="small" bordered>
:columns="columns"
:data-source="rows"
:pagination="false"
:scroll="{ x: 1560 }"
row-key="_rowKey"
size="small"
bordered
>
<template #bodyCell="{ column, record, index }"> <template #bodyCell="{ column, record, index }">
<template v-if="column.dataIndex === 'machineName'"> <template v-if="column.dataIndex === 'machineName'">
<a-input <a-input
@@ -108,13 +100,15 @@
import MesXslMixingPlanOrderSelectModal from './components/MesXslMixingPlanOrderSelectModal.vue'; import MesXslMixingPlanOrderSelectModal from './components/MesXslMixingPlanOrderSelectModal.vue';
import { list, saveAll } from './MesXslMixingProductionPlan.api'; import { list, saveAll } from './MesXslMixingProductionPlan.api';
type ShiftKey = 'morning' | 'noon' | 'night';
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const saving = ref(false); const saving = ref(false);
const refreshing = ref(false); const refreshing = ref(false);
const querying = ref(false); const querying = ref(false);
const queryPlanDate = ref<string>(''); const queryPlanDate = ref<string>('');
const rows = ref<Recordable[]>([]); const rows = ref<Recordable[]>([]);
const pickerContext = ref<{ rowIndex: number; shift?: 'morning' | 'noon' | 'night' } | null>(null); const pickerContext = ref<{ rowIndex: number; shift?: ShiftKey } | null>(null);
const [registerEquipmentModal, { openModal: openEquipmentModal }] = useModal(); const [registerEquipmentModal, { openModal: openEquipmentModal }] = useModal();
const [registerOrderModal, { openModal: openOrderModal }] = useModal(); const [registerOrderModal, { openModal: openOrderModal }] = useModal();
@@ -158,11 +152,14 @@
function createEmptyRow(): Recordable { function createEmptyRow(): Recordable {
return { return {
_rowKey: buildUUID(), _rowKey: buildUUID(),
id: '', planDate: queryPlanDate.value || '',
machineId: '', machineId: '',
machineName: '', machineName: '',
morningId: '',
morningShiftFlag: 1,
morningPlanId: '', morningPlanId: '',
morningPlanType: '', morningPlanType: '',
morningSourceOrderId: '',
morningOrderNo: '', morningOrderNo: '',
morningOrderDate: '', morningOrderDate: '',
morningFormulaName: '', morningFormulaName: '',
@@ -172,8 +169,11 @@
morningFinishedCarCount: null, morningFinishedCarCount: null,
morningPlanCount: null, morningPlanCount: null,
morningRemark: '', morningRemark: '',
noonId: '',
noonShiftFlag: 2,
noonPlanId: '', noonPlanId: '',
noonPlanType: '', noonPlanType: '',
noonSourceOrderId: '',
noonOrderNo: '', noonOrderNo: '',
noonOrderDate: '', noonOrderDate: '',
noonFormulaName: '', noonFormulaName: '',
@@ -183,8 +183,11 @@
noonFinishedCarCount: null, noonFinishedCarCount: null,
noonPlanCount: null, noonPlanCount: null,
noonRemark: '', noonRemark: '',
nightId: '',
nightShiftFlag: 3,
nightPlanId: '', nightPlanId: '',
nightPlanType: '', nightPlanType: '',
nightSourceOrderId: '',
nightOrderNo: '', nightOrderNo: '',
nightOrderDate: '', nightOrderDate: '',
nightFormulaName: '', nightFormulaName: '',
@@ -197,7 +200,7 @@
}; };
} }
function shiftByOrderField(field: string): 'morning' | 'noon' | 'night' { function shiftByOrderField(field: string): ShiftKey {
if (field.startsWith('morning')) return 'morning'; if (field.startsWith('morning')) return 'morning';
if (field.startsWith('noon')) return 'noon'; if (field.startsWith('noon')) return 'noon';
return 'night'; return 'night';
@@ -240,7 +243,7 @@
pickerContext.value = null; pickerContext.value = null;
} }
function openOrderPicker(rowIndex: number, shift: 'morning' | 'noon' | 'night') { function openOrderPicker(rowIndex: number, shift: ShiftKey) {
const row = rows.value[rowIndex]; const row = rows.value[rowIndex];
if (!row?.machineId && !row?.machineName) { if (!row?.machineId && !row?.machineName) {
createMessage.warning('请先选择机台信息'); createMessage.warning('请先选择机台信息');
@@ -283,6 +286,102 @@
return Math.max(0, remain); return Math.max(0, remain);
} }
function applyShiftRecord(row: Recordable, shift: ShiftKey, record: Recordable) {
if (!record) return;
row[`${shift}Id`] = record.id || '';
row[`${shift}ShiftFlag`] = record.shiftFlag ?? (shift === 'morning' ? 1 : shift === 'noon' ? 2 : 3);
row[`${shift}PlanId`] = record.planId || '';
row[`${shift}PlanType`] = record.planType || '';
row[`${shift}SourceOrderId`] = record.sourceOrderId || '';
row[`${shift}OrderNo`] = record.orderNo || '';
row[`${shift}OrderDate`] = record.orderDate || '';
row[`${shift}FormulaName`] = record.formulaName || '';
row[`${shift}PlanWeight`] = record.planWeight ?? null;
row[`${shift}PlannedCarCount`] = record.plannedCarCount ?? null;
row[`${shift}ScheduledCarCount`] = record.scheduledCarCount ?? null;
row[`${shift}FinishedCarCount`] = record.finishedCarCount ?? null;
row[`${shift}PlanCount`] = record.planCount ?? null;
row[`${shift}Remark`] = record.remark || '';
}
function convertSharedRecordsToDisplayRows(records: Recordable[]) {
const groupMap = new Map<string, { machineId: string; machineName: string; planDate: string; morning: Recordable[]; noon: Recordable[]; night: Recordable[] }>();
(records || []).forEach((rec) => {
const machineId = rec.machineId || '';
const machineName = rec.machineName || '';
const planDate = rec.planDate || '';
const key = `${planDate}__${machineId}__${machineName}`;
if (!groupMap.has(key)) {
groupMap.set(key, {
machineId,
machineName,
planDate,
morning: [],
noon: [],
night: [],
});
}
const group = groupMap.get(key)!;
const flag = Number(rec.shiftFlag);
if (flag === 1) group.morning.push(rec);
else if (flag === 2) group.noon.push(rec);
else group.night.push(rec);
});
const result: Recordable[] = [];
Array.from(groupMap.values()).forEach((group) => {
const maxLen = Math.max(group.morning.length, group.noon.length, group.night.length);
for (let i = 0; i < maxLen; i++) {
const row = createEmptyRow();
row._rowKey = buildUUID();
row.planDate = group.planDate;
row.machineId = group.machineId;
row.machineName = group.machineName;
applyShiftRecord(row, 'morning', group.morning[i]);
applyShiftRecord(row, 'noon', group.noon[i]);
applyShiftRecord(row, 'night', group.night[i]);
result.push(row);
}
});
return result;
}
function hasShiftData(row: Recordable, shift: ShiftKey) {
return !!(
row?.[`${shift}PlanId`] ||
row?.[`${shift}OrderNo`] ||
row?.[`${shift}FormulaName`] ||
row?.[`${shift}PlanCount`] != null ||
row?.[`${shift}Remark`]
);
}
function buildSharedShiftRecord(row: Recordable, shift: ShiftKey): Recordable | null {
if (!hasShiftData(row, shift) || (!row?.machineId && !row?.machineName)) {
return null;
}
const shiftFlag = shift === 'morning' ? 1 : shift === 'noon' ? 2 : 3;
return {
id: row?.[`${shift}Id`] || '',
planDate: row?.planDate || queryPlanDate.value || '',
machineId: row?.machineId || '',
machineName: row?.machineName || '',
shiftFlag,
planId: row?.[`${shift}PlanId`] || '',
planType: row?.[`${shift}PlanType`] || '',
sourceOrderId: row?.[`${shift}SourceOrderId`] || '',
orderNo: row?.[`${shift}OrderNo`] || '',
orderDate: row?.[`${shift}OrderDate`] || '',
formulaName: row?.[`${shift}FormulaName`] || '',
planWeight: row?.[`${shift}PlanWeight`] ?? null,
plannedCarCount: row?.[`${shift}PlannedCarCount`] ?? null,
scheduledCarCount: row?.[`${shift}ScheduledCarCount`] ?? null,
finishedCarCount: row?.[`${shift}FinishedCarCount`] ?? null,
planCount: row?.[`${shift}PlanCount`] ?? null,
remark: row?.[`${shift}Remark`] || '',
};
}
async function loadRows() { async function loadRows() {
const res = await list({ const res = await list({
pageNo: 1, pageNo: 1,
@@ -290,18 +389,29 @@
planDate: queryPlanDate.value || undefined, planDate: queryPlanDate.value || undefined,
}); });
const records = (res?.records || res?.result?.records || []) as Recordable[]; const records = (res?.records || res?.result?.records || []) as Recordable[];
rows.value = (records || []).map((item) => ({ ...createEmptyRow(), ...item, _rowKey: item.id || buildUUID() })); rows.value = convertSharedRecordsToDisplayRows(records);
const minRows = 20;
if (!rows.value.length) { if (!rows.value.length) {
rows.value = createBlankRows(); rows.value = createBlankRows(minRows);
return;
}
if (rows.value.length < minRows) {
rows.value.push(...createBlankRows(minRows - rows.value.length));
} }
} }
async function handleSaveAll() { async function handleSaveAll() {
saving.value = true; saving.value = true;
try { try {
const payload = rows.value.map((r) => { const payload = rows.value.flatMap((row) => {
const { _rowKey, ...rest } = r; const list: Recordable[] = [];
return rest; const morning = buildSharedShiftRecord(row, 'morning');
const noon = buildSharedShiftRecord(row, 'noon');
const night = buildSharedShiftRecord(row, 'night');
if (morning) list.push(morning);
if (noon) list.push(noon);
if (night) list.push(night);
return list;
}); });
await saveAll({ rows: payload }); await saveAll({ rows: payload });
createMessage.success('保存成功'); createMessage.success('保存成功');