密炼生产计划优化

2026-06-17 15:47:53 +08:00
parent e28352f8ea
commit 7d7198b802
44 changed files with 2074 additions and 16 deletions
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslAutoSmallMaterialDemandPlanController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslAutoSmallMaterialDemandPlanController.java
@@ -0,0 +1,176 @@
+package org.jeecg.modules.xslmes.controller;
+
+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 java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslSmallMaterialDemandPlanSummary;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+@Tag(name = "自动小料需求计划")
+@RestController
+@RequestMapping("/xslmes/mesXslAutoSmallMaterialDemandPlan")
+public class MesXslAutoSmallMaterialDemandPlanController {
+
+  private static final String TABLE_NAME = "mes_xsl_auto_small_material_demand_plan";
+
+  @Autowired private JdbcTemplate jdbcTemplate;
+
+  @Operation(summary = "自动小料需求计划-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslSmallMaterialDemandPlanSummary>> queryPageList(
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params);
+
+    String countSql = "SELECT COUNT(1) FROM (" + groupedSql + ") t";
+    Long total = jdbcTemplate.queryForObject(countSql, Long.class, params.toArray());
+    long totalCount = total == null ? 0L : total;
+
+    int offset = Math.max((pageNo - 1) * pageSize, 0);
+    String pageSql = groupedSql + buildOrderBy(groupedByMachine) + " LIMIT ? OFFSET ?";
+    List<Object> pageParams = new ArrayList<>(params);
+    pageParams.add(pageSize);
+    pageParams.add(offset);
+    List<MesXslSmallMaterialDemandPlanSummary> rows = queryRows(pageSql, pageParams, groupedByMachine);
+
+    Page<MesXslSmallMaterialDemandPlanSummary> page = new Page<>(pageNo, pageSize, totalCount);
+    page.setRecords(rows);
+    return Result.OK(page);
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_auto_small_material_demand_plan:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(
+      HttpServletRequest request,
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params) + buildOrderBy(groupedByMachine);
+    List<MesXslSmallMaterialDemandPlanSummary> exportList = queryRows(groupedSql, params, groupedByMachine);
+
+    LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+    mv.addObject(NormalExcelConstants.FILE_NAME, "自动小料需求计划");
+    mv.addObject(NormalExcelConstants.CLASS, MesXslSmallMaterialDemandPlanSummary.class);
+    mv.addObject(
+        NormalExcelConstants.PARAMS,
+        new ExportParams(
+            "自动小料需求计划",
+            "导出人:" + (sysUser == null ? "admin" : sysUser.getRealname()),
+            "自动小料需求计划",
+            ExcelType.XSSF));
+    mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+    String exportFields = request.getParameter(NormalExcelConstants.EXPORT_FIELDS);
+    if (oConvertUtils.isNotEmpty(exportFields)) {
+      mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields);
+    }
+    return mv;
+  }
+
+  private String buildGroupedSql(
+      MesXslSmallMaterialDemandPlanSummary query, boolean groupedByMachine, List<Object> params) {
+    String machineExpr = "COALESCE(NULLIF(TRIM(t.machine_name),''), '')";
+    String rawMaterialExpr = "COALESCE(NULLIF(TRIM(t.raw_material_name),''), '')";
+    String statDateExpr = "DATE_FORMAT(t.stat_date, '%Y-%m-%d')";
+
+    StringBuilder sql = new StringBuilder();
+    sql.append("SELECT ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(" AS machineName, ");
+    } else {
+      sql.append("'' AS machineName, ");
+    }
+    sql.append(rawMaterialExpr)
+        .append(" AS rawMaterialName, ")
+        .append("SUM(COALESCE(t.demand_weight,0)) AS demandWeight, ")
+        .append("MAX(")
+        .append(statDateExpr)
+        .append(") AS statDate ")
+        .append("FROM ")
+        .append(TABLE_NAME)
+        .append(" t ")
+        .append("WHERE (t.del_flag = 0 OR t.del_flag IS NULL) ");
+
+    if (query != null && StringUtils.isNotBlank(query.getStatDate())) {
+      sql.append("AND ").append(statDateExpr).append(" = ? ");
+      params.add(query.getStatDate().trim());
+    }
+    if (query != null && StringUtils.isNotBlank(query.getRawMaterialName())) {
+      sql.append("AND ").append(rawMaterialExpr).append(" LIKE ? ");
+      params.add("%" + query.getRawMaterialName().trim() + "%");
+    }
+    if (groupedByMachine && query != null && StringUtils.isNotBlank(query.getMachineName())) {
+      sql.append("AND ").append(machineExpr).append(" LIKE ? ");
+      params.add("%" + query.getMachineName().trim() + "%");
+    }
+
+    sql.append("GROUP BY ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(", ");
+    }
+    sql.append(rawMaterialExpr);
+    return sql.toString();
+  }
+
+  private List<MesXslSmallMaterialDemandPlanSummary> queryRows(
+      String sql, List<Object> params, boolean groupedByMachine) {
+    return jdbcTemplate.query(
+        sql,
+        rs -> {
+          List<MesXslSmallMaterialDemandPlanSummary> list = new ArrayList<>();
+          int seq = 1;
+          while (rs.next()) {
+            MesXslSmallMaterialDemandPlanSummary row = new MesXslSmallMaterialDemandPlanSummary();
+            row.setMachineName(groupedByMachine ? trim(rs.getString("machineName")) : "");
+            row.setRawMaterialName(trim(rs.getString("rawMaterialName")));
+            row.setDemandWeight(rs.getBigDecimal("demandWeight"));
+            row.setStatDate(trim(rs.getString("statDate")));
+            row.setId(buildRowId(row, groupedByMachine, seq++));
+            list.add(row);
+          }
+          return list;
+        },
+        params.toArray());
+  }
+
+  private String buildOrderBy(boolean groupedByMachine) {
+    if (groupedByMachine) {
+      return " ORDER BY machineName, rawMaterialName";
+    }
+    return " ORDER BY rawMaterialName";
+  }
+
+  private String buildRowId(MesXslSmallMaterialDemandPlanSummary row, boolean groupedByMachine, int seq) {
+    String machine = groupedByMachine ? StringUtils.defaultString(row.getMachineName()) : "ALL";
+    return machine + "_" + StringUtils.defaultString(row.getRawMaterialName()) + "_" + seq;
+  }
+
+  private String trim(String value) {
+    return value == null ? "" : value.trim();
+  }
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslAutoSmallMaterialPlanMaintainController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslAutoSmallMaterialPlanMaintainController.java
@@ -0,0 +1,61 @@
+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 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.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.service.IMesXslAutoSmallMaterialPlanMaintainService;
+import org.jeecg.modules.xslmes.vo.MesXslAutoSmallMaterialPlanMaintainSaveAllVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "自动小料计划维护")
+@RestController
+@RequestMapping("/xslmes/mesXslAutoSmallMaterialPlanMaintain")
+public class MesXslAutoSmallMaterialPlanMaintainController
+    extends JeecgController<
+        MesXslAutoSmallMaterialPlanMaintain, IMesXslAutoSmallMaterialPlanMaintainService> {
+
+  private final IMesXslAutoSmallMaterialPlanMaintainService service;
+
+  public MesXslAutoSmallMaterialPlanMaintainController(
+      IMesXslAutoSmallMaterialPlanMaintainService service) {
+    this.service = service;
+  }
+
+  @Operation(summary = "自动小料计划维护-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslAutoSmallMaterialPlanMaintain>> queryPageList(
+      MesXslAutoSmallMaterialPlanMaintain model,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "50") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslAutoSmallMaterialPlanMaintain> queryWrapper =
+        QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+    queryWrapper.orderByAsc("sort_no").orderByAsc("create_time");
+    IPage<MesXslAutoSmallMaterialPlanMaintain> pageList =
+        service.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "自动小料计划维护-整表保存")
+  @Operation(summary = "自动小料计划维护-整表保存")
+  @RequiresPermissions("xslmes:mes_xsl_auto_small_material_plan_maintain:saveAll")
+  @PostMapping("/saveAll")
+  public Result<String> saveAll(@RequestBody MesXslAutoSmallMaterialPlanMaintainSaveAllVO req) {
+    service.saveAllRows(req == null ? null : req.getRows());
+    return Result.OK("保存成功");
+  }
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManualSmallMaterialDemandPlanController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManualSmallMaterialDemandPlanController.java
@@ -0,0 +1,176 @@
+package org.jeecg.modules.xslmes.controller;
+
+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 java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslSmallMaterialDemandPlanSummary;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+@Tag(name = "人工小料需求计划")
+@RestController
+@RequestMapping("/xslmes/mesXslManualSmallMaterialDemandPlan")
+public class MesXslManualSmallMaterialDemandPlanController {
+
+  private static final String TABLE_NAME = "mes_xsl_manual_small_material_demand_plan";
+
+  @Autowired private JdbcTemplate jdbcTemplate;
+
+  @Operation(summary = "人工小料需求计划-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslSmallMaterialDemandPlanSummary>> queryPageList(
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params);
+
+    String countSql = "SELECT COUNT(1) FROM (" + groupedSql + ") t";
+    Long total = jdbcTemplate.queryForObject(countSql, Long.class, params.toArray());
+    long totalCount = total == null ? 0L : total;
+
+    int offset = Math.max((pageNo - 1) * pageSize, 0);
+    String pageSql = groupedSql + buildOrderBy(groupedByMachine) + " LIMIT ? OFFSET ?";
+    List<Object> pageParams = new ArrayList<>(params);
+    pageParams.add(pageSize);
+    pageParams.add(offset);
+    List<MesXslSmallMaterialDemandPlanSummary> rows = queryRows(pageSql, pageParams, groupedByMachine);
+
+    Page<MesXslSmallMaterialDemandPlanSummary> page = new Page<>(pageNo, pageSize, totalCount);
+    page.setRecords(rows);
+    return Result.OK(page);
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_manual_small_material_demand_plan:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(
+      HttpServletRequest request,
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params) + buildOrderBy(groupedByMachine);
+    List<MesXslSmallMaterialDemandPlanSummary> exportList = queryRows(groupedSql, params, groupedByMachine);
+
+    LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+    mv.addObject(NormalExcelConstants.FILE_NAME, "人工小料需求计划");
+    mv.addObject(NormalExcelConstants.CLASS, MesXslSmallMaterialDemandPlanSummary.class);
+    mv.addObject(
+        NormalExcelConstants.PARAMS,
+        new ExportParams(
+            "人工小料需求计划",
+            "导出人:" + (sysUser == null ? "admin" : sysUser.getRealname()),
+            "人工小料需求计划",
+            ExcelType.XSSF));
+    mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+    String exportFields = request.getParameter(NormalExcelConstants.EXPORT_FIELDS);
+    if (oConvertUtils.isNotEmpty(exportFields)) {
+      mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields);
+    }
+    return mv;
+  }
+
+  private String buildGroupedSql(
+      MesXslSmallMaterialDemandPlanSummary query, boolean groupedByMachine, List<Object> params) {
+    String machineExpr = "COALESCE(NULLIF(TRIM(t.machine_name),''), '')";
+    String rawMaterialExpr = "COALESCE(NULLIF(TRIM(t.raw_material_name),''), '')";
+    String statDateExpr = "DATE_FORMAT(t.stat_date, '%Y-%m-%d')";
+
+    StringBuilder sql = new StringBuilder();
+    sql.append("SELECT ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(" AS machineName, ");
+    } else {
+      sql.append("'' AS machineName, ");
+    }
+    sql.append(rawMaterialExpr)
+        .append(" AS rawMaterialName, ")
+        .append("SUM(COALESCE(t.demand_weight,0)) AS demandWeight, ")
+        .append("MAX(")
+        .append(statDateExpr)
+        .append(") AS statDate ")
+        .append("FROM ")
+        .append(TABLE_NAME)
+        .append(" t ")
+        .append("WHERE (t.del_flag = 0 OR t.del_flag IS NULL) ");
+
+    if (query != null && StringUtils.isNotBlank(query.getStatDate())) {
+      sql.append("AND ").append(statDateExpr).append(" = ? ");
+      params.add(query.getStatDate().trim());
+    }
+    if (query != null && StringUtils.isNotBlank(query.getRawMaterialName())) {
+      sql.append("AND ").append(rawMaterialExpr).append(" LIKE ? ");
+      params.add("%" + query.getRawMaterialName().trim() + "%");
+    }
+    if (groupedByMachine && query != null && StringUtils.isNotBlank(query.getMachineName())) {
+      sql.append("AND ").append(machineExpr).append(" LIKE ? ");
+      params.add("%" + query.getMachineName().trim() + "%");
+    }
+
+    sql.append("GROUP BY ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(", ");
+    }
+    sql.append(rawMaterialExpr);
+    return sql.toString();
+  }
+
+  private List<MesXslSmallMaterialDemandPlanSummary> queryRows(
+      String sql, List<Object> params, boolean groupedByMachine) {
+    return jdbcTemplate.query(
+        sql,
+        rs -> {
+          List<MesXslSmallMaterialDemandPlanSummary> list = new ArrayList<>();
+          int seq = 1;
+          while (rs.next()) {
+            MesXslSmallMaterialDemandPlanSummary row = new MesXslSmallMaterialDemandPlanSummary();
+            row.setMachineName(groupedByMachine ? trim(rs.getString("machineName")) : "");
+            row.setRawMaterialName(trim(rs.getString("rawMaterialName")));
+            row.setDemandWeight(rs.getBigDecimal("demandWeight"));
+            row.setStatDate(trim(rs.getString("statDate")));
+            row.setId(buildRowId(row, groupedByMachine, seq++));
+            list.add(row);
+          }
+          return list;
+        },
+        params.toArray());
+  }
+
+  private String buildOrderBy(boolean groupedByMachine) {
+    if (groupedByMachine) {
+      return " ORDER BY machineName, rawMaterialName";
+    }
+    return " ORDER BY rawMaterialName";
+  }
+
+  private String buildRowId(MesXslSmallMaterialDemandPlanSummary row, boolean groupedByMachine, int seq) {
+    String machine = groupedByMachine ? StringUtils.defaultString(row.getMachineName()) : "ALL";
+    return machine + "_" + StringUtils.defaultString(row.getRawMaterialName()) + "_" + seq;
+  }
+
+  private String trim(String value) {
+    return value == null ? "" : value.trim();
+  }
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManualSmallMaterialPlanMaintainController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManualSmallMaterialPlanMaintainController.java
@@ -0,0 +1,61 @@
+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 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.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.service.IMesXslManualSmallMaterialPlanMaintainService;
+import org.jeecg.modules.xslmes.vo.MesXslManualSmallMaterialPlanMaintainSaveAllVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "人工小料计划维护")
+@RestController
+@RequestMapping("/xslmes/mesXslManualSmallMaterialPlanMaintain")
+public class MesXslManualSmallMaterialPlanMaintainController
+    extends JeecgController<
+        MesXslManualSmallMaterialPlanMaintain, IMesXslManualSmallMaterialPlanMaintainService> {
+
+  private final IMesXslManualSmallMaterialPlanMaintainService service;
+
+  public MesXslManualSmallMaterialPlanMaintainController(
+      IMesXslManualSmallMaterialPlanMaintainService service) {
+    this.service = service;
+  }
+
+  @Operation(summary = "人工小料计划维护-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslManualSmallMaterialPlanMaintain>> queryPageList(
+      MesXslManualSmallMaterialPlanMaintain model,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "50") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslManualSmallMaterialPlanMaintain> queryWrapper =
+        QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+    queryWrapper.orderByAsc("sort_no").orderByAsc("create_time");
+    IPage<MesXslManualSmallMaterialPlanMaintain> pageList =
+        service.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "人工小料计划维护-整表保存")
+  @Operation(summary = "人工小料计划维护-整表保存")
+  @RequiresPermissions("xslmes:mes_xsl_manual_small_material_plan_maintain:saveAll")
+  @PostMapping("/saveAll")
+  public Result<String> saveAll(@RequestBody MesXslManualSmallMaterialPlanMaintainSaveAllVO req) {
+    service.saveAllRows(req == null ? null : req.getRows());
+    return Result.OK("保存成功");
+  }
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslAutoSmallMaterialPlanMaintain.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslAutoSmallMaterialPlanMaintain.java
@@ -0,0 +1,69 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 自动小料计划维护
+ */
+@Data
+@TableName("mes_xsl_auto_small_material_plan_maintain")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "自动小料计划维护")
+public class MesXslAutoSmallMaterialPlanMaintain implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Excel(name = "排序号", width = 10)
+  private Integer sortNo;
+
+  @Excel(name = "配方名称", width = 20)
+  private String formulaName;
+
+  @Excel(name = "早班序号", width = 12)
+  private Integer morningSeqNo;
+  @Excel(name = "早班计划", width = 12)
+  private Integer morningPlanCount;
+  @Excel(name = "早班备注", width = 20)
+  private String morningRemark;
+
+  @Excel(name = "中班序号", width = 12)
+  private Integer noonSeqNo;
+  @Excel(name = "中班计划", width = 12)
+  private Integer noonPlanCount;
+  @Excel(name = "中班备注", width = 20)
+  private String noonRemark;
+
+  @Excel(name = "夜班序号", width = 12)
+  private Integer nightSeqNo;
+  @Excel(name = "夜班计划", width = 12)
+  private Integer nightPlanCount;
+  @Excel(name = "夜班备注", width = 20)
+  private String nightRemark;
+
+  private Integer tenantId;
+  private String sysOrgCode;
+  private String createBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  private String updateBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  private Integer delFlag;
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslManualSmallMaterialPlanMaintain.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslManualSmallMaterialPlanMaintain.java
@@ -0,0 +1,69 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 人工小料计划维护
+ */
+@Data
+@TableName("mes_xsl_manual_small_material_plan_maintain")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "人工小料计划维护")
+public class MesXslManualSmallMaterialPlanMaintain implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Excel(name = "排序号", width = 10)
+  private Integer sortNo;
+
+  @Excel(name = "配方名称", width = 20)
+  private String formulaName;
+
+  @Excel(name = "早班序号", width = 12)
+  private Integer morningSeqNo;
+  @Excel(name = "早班计划", width = 12)
+  private Integer morningPlanCount;
+  @Excel(name = "早班备注", width = 20)
+  private String morningRemark;
+
+  @Excel(name = "中班序号", width = 12)
+  private Integer noonSeqNo;
+  @Excel(name = "中班计划", width = 12)
+  private Integer noonPlanCount;
+  @Excel(name = "中班备注", width = 20)
+  private String noonRemark;
+
+  @Excel(name = "夜班序号", width = 12)
+  private Integer nightSeqNo;
+  @Excel(name = "夜班计划", width = 12)
+  private Integer nightPlanCount;
+  @Excel(name = "夜班备注", width = 20)
+  private String nightRemark;
+
+  private Integer tenantId;
+  private String sysOrgCode;
+  private String createBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  private String updateBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  private Integer delFlag;
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixingProductionPlan.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixingProductionPlan.java
@@ -43,10 +43,17 @@ public class MesXslMixingProductionPlan implements Serializable {
  @Schema(description = "机台名称")
  private String machineName;

+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @Schema(description = "计划日期（保存时写入当前日期）")
+  private Date planDate;
+
  @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;
  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@@ -72,6 +79,8 @@ public class MesXslMixingProductionPlan implements Serializable {
  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")
@@ -97,6 +106,8 @@ public class MesXslMixingProductionPlan implements Serializable {
  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")
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslSmallMaterialDemandPlanSummary.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslSmallMaterialDemandPlanSummary.java
@@ -0,0 +1,35 @@
+package org.jeecg.modules.xslmes.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 小料需求计划汇总（自动/人工）
+ */
+@Data
+@Schema(description = "小料需求计划汇总")
+public class MesXslSmallMaterialDemandPlanSummary implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @Schema(description = "主键")
+  private String id;
+
+  @Excel(name = "机台", width = 20)
+  @Schema(description = "机台")
+  private String machineName;
+
+  @Excel(name = "原材料名称", width = 24)
+  @Schema(description = "原材料名称")
+  private String rawMaterialName;
+
+  @Excel(name = "需求重量(KG)", width = 18)
+  @Schema(description = "需求重量(KG)")
+  private BigDecimal demandWeight;
+
+  @Schema(description = "统计日期(yyyy-MM-dd)")
+  private String statDate;
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslAutoSmallMaterialPlanMaintainMapper.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslAutoSmallMaterialPlanMaintainMapper.java
@@ -0,0 +1,7 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+
+public interface MesXslAutoSmallMaterialPlanMaintainMapper
+    extends BaseMapper<MesXslAutoSmallMaterialPlanMaintain> {}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslManualSmallMaterialPlanMaintainMapper.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslManualSmallMaterialPlanMaintainMapper.java
@@ -0,0 +1,7 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+
+public interface MesXslManualSmallMaterialPlanMaintainMapper
+    extends BaseMapper<MesXslManualSmallMaterialPlanMaintain> {}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslAutoSmallMaterialPlanMaintainService.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslAutoSmallMaterialPlanMaintainService.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+
+public interface IMesXslAutoSmallMaterialPlanMaintainService
+    extends IService<MesXslAutoSmallMaterialPlanMaintain> {
+  void saveAllRows(List<MesXslAutoSmallMaterialPlanMaintain> rows);
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslManualSmallMaterialPlanMaintainService.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslManualSmallMaterialPlanMaintainService.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+
+public interface IMesXslManualSmallMaterialPlanMaintainService
+    extends IService<MesXslManualSmallMaterialPlanMaintain> {
+  void saveAllRows(List<MesXslManualSmallMaterialPlanMaintain> rows);
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslAutoSmallMaterialPlanMaintainServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslAutoSmallMaterialPlanMaintainServiceImpl.java
@@ -0,0 +1,66 @@
+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.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.mapper.MesXslAutoSmallMaterialPlanMaintainMapper;
+import org.jeecg.modules.xslmes.service.IMesXslAutoSmallMaterialPlanMaintainService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslAutoSmallMaterialPlanMaintainServiceImpl
+    extends ServiceImpl<MesXslAutoSmallMaterialPlanMaintainMapper, MesXslAutoSmallMaterialPlanMaintain>
+    implements IMesXslAutoSmallMaterialPlanMaintainService {
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public void saveAllRows(List<MesXslAutoSmallMaterialPlanMaintain> rows) {
+    this.remove(new LambdaQueryWrapper<>());
+    if (CollectionUtils.isEmpty(rows)) {
+      return;
+    }
+    List<MesXslAutoSmallMaterialPlanMaintain> saveList = new ArrayList<>();
+    int sort = 1;
+    Date now = new Date();
+    for (MesXslAutoSmallMaterialPlanMaintain row : rows) {
+      if (row == null || !hasBusinessData(row)) {
+        continue;
+      }
+      row.setId(null);
+      row.setSortNo(sort++);
+      row.setFormulaName(StringUtils.trimToNull(row.getFormulaName()));
+      row.setMorningRemark(StringUtils.trimToNull(row.getMorningRemark()));
+      row.setNoonRemark(StringUtils.trimToNull(row.getNoonRemark()));
+      row.setNightRemark(StringUtils.trimToNull(row.getNightRemark()));
+      row.setCreateTime(now);
+      row.setUpdateTime(now);
+      if (row.getDelFlag() == null) {
+        row.setDelFlag(CommonConstant.DEL_FLAG_0);
+      }
+      saveList.add(row);
+    }
+    if (!saveList.isEmpty()) {
+      this.saveBatch(saveList, 200);
+    }
+  }
+
+  private boolean hasBusinessData(MesXslAutoSmallMaterialPlanMaintain row) {
+    return StringUtils.isNotBlank(row.getFormulaName())
+        || row.getMorningSeqNo() != null
+        || row.getMorningPlanCount() != null
+        || StringUtils.isNotBlank(row.getMorningRemark())
+        || row.getNoonSeqNo() != null
+        || row.getNoonPlanCount() != null
+        || StringUtils.isNotBlank(row.getNoonRemark())
+        || row.getNightSeqNo() != null
+        || row.getNightPlanCount() != null
+        || StringUtils.isNotBlank(row.getNightRemark());
+  }
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFinalBatchPlanServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFinalBatchPlanServiceImpl.java
@@ -13,8 +13,12 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.mes.material.entity.MesMaterial;
 import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
 import org.jeecg.modules.xslmes.entity.MesXslFinalBatchPlan;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpec;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpecMaterial;
 import org.jeecg.modules.xslmes.entity.MesXslProductionOrder;
 import org.jeecg.modules.xslmes.mapper.MesXslFinalBatchPlanMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMaterialMapper;
 import org.jeecg.modules.xslmes.service.IMesXslFinalBatchPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,8 @@ public class MesXslFinalBatchPlanServiceImpl
    implements IMesXslFinalBatchPlanService {

  @Autowired private MesMaterialMapper mesMaterialMapper;
+  @Autowired private MesXslMixingSpecMapper mesXslMixingSpecMapper;
+  @Autowired private MesXslMixingSpecMaterialMapper mesXslMixingSpecMaterialMapper;

  @Override
  public MesXslFinalBatchPlan generateFromProductionOrder(MesXslProductionOrder productionOrder) {
@@ -43,7 +49,11 @@ public class MesXslFinalBatchPlanServiceImpl
    }

    BigDecimal planWeight = productionOrder.getPlanQty() == null ? BigDecimal.ZERO : productionOrder.getPlanQty();
-    BigDecimal perCarWeight = BigDecimal.ZERO;
+    BigDecimal perCarWeight = resolvePerCarWeightFromMixingSpec(finalMaterial.getMaterialCode());
+    if (perCarWeight.compareTo(BigDecimal.ZERO) <= 0) {
+      throw new JeecgBootException(
+          "对应混炼示方未配置有效合计重量，无法计算每车重量（物料：" + finalMaterial.getMaterialCode() + "）");
+    }
    int planCarCount = calcPlanCarCount(planWeight, perCarWeight);

    MesXslFinalBatchPlan plan = new MesXslFinalBatchPlan();
@@ -136,4 +146,38 @@ public class MesXslFinalBatchPlanServiceImpl
    }
    return planWeight.divide(perCarWeight, 0, RoundingMode.CEILING).intValue();
  }
+
+  private BigDecimal resolvePerCarWeightFromMixingSpec(String materialCode) {
+    String specName = buildMixingSpecName(materialCode);
+    MesXslMixingSpec spec =
+        mesXslMixingSpecMapper.selectOne(
+            new LambdaQueryWrapper<MesXslMixingSpec>()
+                .eq(MesXslMixingSpec::getSpecName, specName)
+                .and(w -> w.eq(MesXslMixingSpec::getDelFlag, 0).or().isNull(MesXslMixingSpec::getDelFlag))
+                .orderByDesc(MesXslMixingSpec::getCreateTime)
+                .orderByDesc(MesXslMixingSpec::getId)
+                .last("LIMIT 1"));
+    if (spec == null || StringUtils.isBlank(spec.getId())) {
+      return BigDecimal.ZERO;
+    }
+    List<MesXslMixingSpecMaterial> materials =
+        mesXslMixingSpecMaterialMapper.selectList(
+            new LambdaQueryWrapper<MesXslMixingSpecMaterial>()
+                .eq(MesXslMixingSpecMaterial::getMixingSpecId, spec.getId()));
+    BigDecimal total = BigDecimal.ZERO;
+    for (MesXslMixingSpecMaterial item : materials) {
+      if (item != null && item.getUnitWeight() != null) {
+        total = total.add(item.getUnitWeight());
+      }
+    }
+    return total;
+  }
+
+  private String buildMixingSpecName(String materialCode) {
+    String code = StringUtils.trimToEmpty(materialCode).toUpperCase();
+    if (code.matches(".*SA\\d{2}$")) {
+      return code;
+    }
+    return code + "SA01";
+  }
 }
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslManualSmallMaterialPlanMaintainServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslManualSmallMaterialPlanMaintainServiceImpl.java
@@ -0,0 +1,67 @@
+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.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.mapper.MesXslManualSmallMaterialPlanMaintainMapper;
+import org.jeecg.modules.xslmes.service.IMesXslManualSmallMaterialPlanMaintainService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslManualSmallMaterialPlanMaintainServiceImpl
+    extends ServiceImpl<
+        MesXslManualSmallMaterialPlanMaintainMapper, MesXslManualSmallMaterialPlanMaintain>
+    implements IMesXslManualSmallMaterialPlanMaintainService {
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public void saveAllRows(List<MesXslManualSmallMaterialPlanMaintain> rows) {
+    this.remove(new LambdaQueryWrapper<>());
+    if (CollectionUtils.isEmpty(rows)) {
+      return;
+    }
+    List<MesXslManualSmallMaterialPlanMaintain> saveList = new ArrayList<>();
+    int sort = 1;
+    Date now = new Date();
+    for (MesXslManualSmallMaterialPlanMaintain row : rows) {
+      if (row == null || !hasBusinessData(row)) {
+        continue;
+      }
+      row.setId(null);
+      row.setSortNo(sort++);
+      row.setFormulaName(StringUtils.trimToNull(row.getFormulaName()));
+      row.setMorningRemark(StringUtils.trimToNull(row.getMorningRemark()));
+      row.setNoonRemark(StringUtils.trimToNull(row.getNoonRemark()));
+      row.setNightRemark(StringUtils.trimToNull(row.getNightRemark()));
+      row.setCreateTime(now);
+      row.setUpdateTime(now);
+      if (row.getDelFlag() == null) {
+        row.setDelFlag(CommonConstant.DEL_FLAG_0);
+      }
+      saveList.add(row);
+    }
+    if (!saveList.isEmpty()) {
+      this.saveBatch(saveList, 200);
+    }
+  }
+
+  private boolean hasBusinessData(MesXslManualSmallMaterialPlanMaintain row) {
+    return StringUtils.isNotBlank(row.getFormulaName())
+        || row.getMorningSeqNo() != null
+        || row.getMorningPlanCount() != null
+        || StringUtils.isNotBlank(row.getMorningRemark())
+        || row.getNoonSeqNo() != null
+        || row.getNoonPlanCount() != null
+        || StringUtils.isNotBlank(row.getNoonRemark())
+        || row.getNightSeqNo() != null
+        || row.getNightPlanCount() != null
+        || StringUtils.isNotBlank(row.getNightRemark());
+  }
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMasterBatchPlanServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMasterBatchPlanServiceImpl.java
@@ -13,8 +13,12 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.mes.material.entity.MesMaterial;
 import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
 import org.jeecg.modules.xslmes.entity.MesXslMasterBatchPlan;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpec;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpecMaterial;
 import org.jeecg.modules.xslmes.entity.MesXslProductionOrder;
 import org.jeecg.modules.xslmes.mapper.MesXslMasterBatchPlanMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMaterialMapper;
 import org.jeecg.modules.xslmes.service.IMesXslMasterBatchPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,8 @@ public class MesXslMasterBatchPlanServiceImpl
    implements IMesXslMasterBatchPlanService {

  @Autowired private MesMaterialMapper mesMaterialMapper;
+  @Autowired private MesXslMixingSpecMapper mesXslMixingSpecMapper;
+  @Autowired private MesXslMixingSpecMaterialMapper mesXslMixingSpecMaterialMapper;

  @Override
  public List<MesXslMasterBatchPlan> generateBatchFromProductionOrder(MesXslProductionOrder productionOrder) {
@@ -70,7 +76,11 @@ public class MesXslMasterBatchPlanServiceImpl
  private MesXslMasterBatchPlan buildMotherPlan(
      MesXslProductionOrder productionOrder, MesMaterial motherMaterial, int stageIndex) {
    BigDecimal planWeight = productionOrder.getPlanQty() == null ? BigDecimal.ZERO : productionOrder.getPlanQty();
-    BigDecimal perCarWeight = BigDecimal.ZERO;
+    BigDecimal perCarWeight = resolvePerCarWeightFromMixingSpec(motherMaterial.getMaterialCode());
+    if (perCarWeight.compareTo(BigDecimal.ZERO) <= 0) {
+      throw new JeecgBootException(
+          "对应混炼示方未配置有效合计重量，无法计算每车重量（物料：" + motherMaterial.getMaterialCode() + "）");
+    }
    int planCarCount = calcPlanCarCount(planWeight, perCarWeight);

    MesXslMasterBatchPlan plan = new MesXslMasterBatchPlan();
@@ -182,4 +192,38 @@ public class MesXslMasterBatchPlanServiceImpl
    }
    return planWeight.divide(perCarWeight, 0, RoundingMode.CEILING).intValue();
  }
+
+  private BigDecimal resolvePerCarWeightFromMixingSpec(String materialCode) {
+    String specName = buildMixingSpecName(materialCode);
+    MesXslMixingSpec spec =
+        mesXslMixingSpecMapper.selectOne(
+            new LambdaQueryWrapper<MesXslMixingSpec>()
+                .eq(MesXslMixingSpec::getSpecName, specName)
+                .and(w -> w.eq(MesXslMixingSpec::getDelFlag, 0).or().isNull(MesXslMixingSpec::getDelFlag))
+                .orderByDesc(MesXslMixingSpec::getCreateTime)
+                .orderByDesc(MesXslMixingSpec::getId)
+                .last("LIMIT 1"));
+    if (spec == null || StringUtils.isBlank(spec.getId())) {
+      return BigDecimal.ZERO;
+    }
+    List<MesXslMixingSpecMaterial> materials =
+        mesXslMixingSpecMaterialMapper.selectList(
+            new LambdaQueryWrapper<MesXslMixingSpecMaterial>()
+                .eq(MesXslMixingSpecMaterial::getMixingSpecId, spec.getId()));
+    BigDecimal total = BigDecimal.ZERO;
+    for (MesXslMixingSpecMaterial item : materials) {
+      if (item != null && item.getUnitWeight() != null) {
+        total = total.add(item.getUnitWeight());
+      }
+    }
+    return total;
+  }
+
+  private String buildMixingSpecName(String materialCode) {
+    String code = StringUtils.trimToEmpty(materialCode).toUpperCase();
+    if (code.matches(".*SA\\d{2}$")) {
+      return code;
+    }
+    return code + "SA01";
+  }
 }
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingProductionPlanServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingProductionPlanServiceImpl.java
@@ -93,6 +93,7 @@ public class MesXslMixingProductionPlanServiceImpl
    row.setId(null);
    row.setMachineId(StringUtils.trimToNull(row.getMachineId()));
    row.setMachineName(resolveMachineName(row.getMachineId(), machineNameCache));
+    row.setPlanDate(new Date());
    fillShiftFromPlan(row, "morning");
    fillShiftFromPlan(row, "noon");
    fillShiftFromPlan(row, "night");
@@ -161,13 +162,18 @@ public class MesXslMixingProductionPlanServiceImpl
  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(
-            row.getMachineId(), row.getMachineName(), plan.getMaterialCode(), plan.getMesMaterialName()));
+            row.getMachineId(),
+            row.getMachineName(),
+            plan.getMaterialCode(),
+            plan.getMesMaterialName(),
+            true));
    setShiftPlanWeight(row, shift, plan.getPlanWeight());
    setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount());
    setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount());
@@ -177,13 +183,18 @@ public class MesXslMixingProductionPlanServiceImpl
  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,
        resolveFormulaNameByMachineAndMaterial(
-            row.getMachineId(), row.getMachineName(), plan.getMaterialCode(), plan.getMesMaterialName()));
+            row.getMachineId(),
+            row.getMachineName(),
+            plan.getMaterialCode(),
+            plan.getMesMaterialName(),
+            true));
    setShiftPlanWeight(row, shift, plan.getPlanWeight());
    setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount());
    setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount());
@@ -192,6 +203,7 @@ public class MesXslMixingProductionPlanServiceImpl

  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);
@@ -209,6 +221,14 @@ public class MesXslMixingProductionPlanServiceImpl
    }
  }

+  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);
@@ -271,6 +291,9 @@ public class MesXslMixingProductionPlanServiceImpl
      Integer pageNo, Integer pageSize, String keyword, String machineId, String machineName) {
    String machineIdTrimmed = StringUtils.trimToNull(machineId);
    String machineNameTrimmed = StringUtils.trimToNull(machineName);
+    if (machineIdTrimmed == null && machineNameTrimmed == null) {
+      return buildEmptyPage(pageNo, pageSize);
+    }
    List<MesXslMixingProductionPlanOrderOptionVO> all = new ArrayList<>();
    LambdaQueryWrapper<MesXslMasterBatchPlan> masterWrapper =
        new LambdaQueryWrapper<MesXslMasterBatchPlan>()
@@ -297,9 +320,17 @@ public class MesXslMixingProductionPlanServiceImpl
      vo.setPlanType("M");
      vo.setOrderNo(m.getOrderNo());
      vo.setOrderDate(m.getOrderDate());
-      vo.setFormulaName(
+      String formulaName =
          resolveFormulaNameByMachineAndMaterial(
-              machineIdTrimmed, machineNameTrimmed, m.getMaterialCode(), m.getMesMaterialName()));
+              machineIdTrimmed,
+              machineNameTrimmed,
+              m.getMaterialCode(),
+              m.getMesMaterialName(),
+              true);
+      if (StringUtils.isBlank(formulaName)) {
+        continue;
+      }
+      vo.setFormulaName(formulaName);
      vo.setPlanWeight(m.getPlanWeight());
      vo.setPlannedCarCount(m.getPlannedCarCount());
      vo.setScheduledCarCount(m.getScheduledCarCount());
@@ -313,9 +344,17 @@ public class MesXslMixingProductionPlanServiceImpl
      vo.setPlanType("F");
      vo.setOrderNo(f.getOrderNo());
      vo.setOrderDate(f.getOrderDate());
-      vo.setFormulaName(
+      String formulaName =
          resolveFormulaNameByMachineAndMaterial(
-              machineIdTrimmed, machineNameTrimmed, f.getMaterialCode(), f.getMesMaterialName()));
+              machineIdTrimmed,
+              machineNameTrimmed,
+              f.getMaterialCode(),
+              f.getMesMaterialName(),
+              true);
+      if (StringUtils.isBlank(formulaName)) {
+        continue;
+      }
+      vo.setFormulaName(formulaName);
      vo.setPlanWeight(f.getPlanWeight());
      vo.setPlannedCarCount(f.getPlannedCarCount());
      vo.setScheduledCarCount(f.getScheduledCarCount());
@@ -346,7 +385,11 @@ public class MesXslMixingProductionPlanServiceImpl
  }

  private String resolveFormulaNameByMachineAndMaterial(
-      String machineId, String machineName, String materialCode, String fallbackName) {
+      String machineId,
+      String machineName,
+      String materialCode,
+      String fallbackName,
+      boolean requireMachineMatch) {
    String code = StringUtils.trimToEmpty(materialCode);
    if (StringUtils.isBlank(code)) {
      return StringUtils.defaultString(fallbackName);
@@ -382,9 +425,21 @@ public class MesXslMixingProductionPlanServiceImpl
    if (prefix != null && StringUtils.isNotBlank(prefix.getSpecName())) {
      return prefix.getSpecName().trim();
    }
+    if (requireMachineMatch) {
+      return null;
+    }
    return StringUtils.defaultIfBlank(fallbackName, targetSpec);
  }

+  private IPage<MesXslMixingProductionPlanOrderOptionVO> buildEmptyPage(Integer pageNo, Integer pageSize) {
+    long current = pageNo == null || pageNo < 1 ? 1 : pageNo;
+    long size = pageSize == null || pageSize < 1 ? 20 : pageSize;
+    Page<MesXslMixingProductionPlanOrderOptionVO> empty = new Page<>(current, size);
+    empty.setTotal(0);
+    empty.setRecords(Collections.emptyList());
+    return empty;
+  }
+
  private String buildTargetSpecName(String materialCode) {
    String code = StringUtils.trimToEmpty(materialCode).toUpperCase();
    if (code.matches(".*SA\\d{2}$")) {
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslAutoSmallMaterialPlanMaintainSaveAllVO.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslAutoSmallMaterialPlanMaintainSaveAllVO.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.vo;
+
+import java.util.List;
+import lombok.Data;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+
+@Data
+public class MesXslAutoSmallMaterialPlanMaintainSaveAllVO {
+  private List<MesXslAutoSmallMaterialPlanMaintain> rows;
+}
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslManualSmallMaterialPlanMaintainSaveAllVO.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslManualSmallMaterialPlanMaintainSaveAllVO.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.vo;
+
+import java.util.List;
+import lombok.Data;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+
+@Data
+public class MesXslManualSmallMaterialPlanMaintainSaveAllVO {
+  private List<MesXslManualSmallMaterialPlanMaintain> rows;
+}