SNAPSHOT W7 已部署稳定态 — 凯迪ERP+OA一体化平台 (MET 73.3%)

恢复点(restore point)。别人改崩后可 git reset --hard 回到此提交。

== 此快照内容 ==
- 后端 oa-backend: 734 控制器 / 711 实体 (Spring Boot 3.2.5 + SQLite, 端口8091)
- 前端 modern-ui/app: Vue3+Vite, 约700页 (构建产物已在 oa-backend/src/main/resources/static)
- 数据库 oa-backend/data/oa.db: 含全部演示数据 (强制入库, 6.6MB)
- 交接文档 go.md + go-code-reference/endpoints/entities/database.md
- 多代理建设脚本 .claude/wf-*.js

== 状态 ==
- 对 凯迪科技ERP_20260507.xlsx 合规 MET ~73.3% (PARTIAL 75: 34可建+6种子/bug+35外部硬天花板)
- 安全: 5轮红队+5轮复检, default-deny分级鉴权, 连续零可利用
- W3~W7 累计补完436缺口; W8末轮(40缺口)为半成品(源码树可编译但未集成)
- 运行: cd oa-backend; java -jar build/libs/oa-backend-0.1.0.jar --server.port=8091; admin/123456

== 排除(gitignore, 可再生) ==
node_modules / oa-backend/build / .jdks / *.log / Backup-ERP-* / 弃用的OFBiz核心(只保留modern-ui)
完整文件夹备份见同目录 Backup-ERP-20260615-191517/ (含上述全部, 仅缺 node_modules)

时间戳: 20260615-191517

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Qiufeng
2026-06-15 19:19:15 +08:00
co-authored by Claude Opus 4.8
commit 5e51dc3f56
10584 changed files with 2501339 additions and 0 deletions
@@ -0,0 +1,172 @@
package com.kaidi.oa.web;
import com.kaidi.oa.common.ApiException;
import com.kaidi.oa.common.ApiResp;
import com.kaidi.oa.common.Money;
import com.kaidi.oa.common.NotFoundException;
import com.kaidi.oa.domain.FertProcurePlan;
import com.kaidi.oa.repository.FertProcurePlanRepository;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
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;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
import java.util.List;
/**
* 生物质肥料制造中心·原料采购/收购计划(需求 §1,补深审计 PARTIAL[med])。
*
* 据需求量与在库量算建议采购量(planQty - onHandQty)与预计金额;季节性原料锁收购窗口期;
* 供应商准入资料附件登记(检测报告/无害化证明);状态机 草稿→已审批→执行中→已完成。
* 写口受 AuthInterceptor default-deny(ADMIN/APPROVER) 保护,前缀已登记入 FINANCE/SENSITIVE_READ。
*/
@RestController
@RequestMapping("/api/oa/fert-procure-plans")
public class FertProcurePlanController {
private final FertProcurePlanRepository repo;
public FertProcurePlanController(FertProcurePlanRepository repo) {
this.repo = repo;
}
@GetMapping
public ApiResp<List<FertProcurePlan>> list(@RequestParam(required = false) String status,
@RequestParam(required = false) Boolean seasonalOnly) {
if (Boolean.TRUE.equals(seasonalOnly)) return ApiResp.ok(repo.findBySeasonalTrue());
if (status != null && !status.isBlank()) return ApiResp.ok(repo.findByStatus(status));
return ApiResp.ok(repo.findAll());
}
@GetMapping("/{id}")
public ApiResp<FertProcurePlan> get(@PathVariable Long id) {
return ApiResp.ok(find(id));
}
public record PlanRequest(String planNo, String period, String materialName, String category,
Double planQty, Double onHandQty, Double estUnitPrice, Boolean seasonal,
String windowStart, String windowEnd, String supplier, String admitDocs,
String owner, String remark) {
}
@PostMapping
public ApiResp<FertProcurePlan> create(@RequestBody PlanRequest req) {
if (req.materialName() == null || req.materialName().isBlank()) {
throw new ApiException(400, "原料名称(materialName) 不能为空");
}
FertProcurePlan p = new FertProcurePlan();
p.setPlanNo(req.planNo() == null || req.planNo().isBlank()
? "PP-" + (repo.count() + 1) : req.planNo().trim());
p.setStatus("草稿");
p.setReceivedQty(BigDecimal.ZERO);
p.setCreatedAt(Instant.now());
apply(p, req);
return ApiResp.ok(repo.save(p));
}
@PutMapping("/{id}")
public ApiResp<FertProcurePlan> update(@PathVariable Long id, @RequestBody PlanRequest req) {
FertProcurePlan p = find(id);
if ("已完成".equals(p.getStatus()) || "已作废".equals(p.getStatus())) {
throw new ApiException(409, "已完成/已作废计划不可编辑");
}
apply(p, req);
return ApiResp.ok(repo.save(p));
}
private void apply(FertProcurePlan p, PlanRequest req) {
if (req.materialName() != null && !req.materialName().isBlank()) p.setMaterialName(req.materialName().trim());
p.setPeriod(req.period());
p.setCategory(req.category());
BigDecimal planQty = Money.of(req.planQty());
BigDecimal onHand = Money.of(req.onHandQty());
p.setPlanQty(planQty);
p.setOnHandQty(onHand);
BigDecimal suggest = planQty.subtract(onHand).max(BigDecimal.ZERO);
p.setSuggestQty(suggest);
BigDecimal price = Money.of(req.estUnitPrice());
p.setEstUnitPrice(price);
p.setEstAmount(Money.of(suggest.multiply(price)));
p.setSeasonal(Boolean.TRUE.equals(req.seasonal()));
p.setWindowStart(req.windowStart());
p.setWindowEnd(req.windowEnd());
p.setSupplier(req.supplier());
p.setAdmitDocs(req.admitDocs());
p.setOwner(req.owner());
p.setRemark(req.remark());
}
public record ApproveRequest(String approver) {
}
@PostMapping("/{id}/approve")
public ApiResp<FertProcurePlan> approve(@PathVariable Long id, @RequestBody(required = false) ApproveRequest req) {
FertProcurePlan p = find(id);
if (!"草稿".equals(p.getStatus())) {
throw new ApiException(409, "仅草稿计划可审批,当前:" + p.getStatus());
}
p.setStatus("已审批");
p.setApprover(req == null ? null : req.approver());
return ApiResp.ok(repo.save(p));
}
@PostMapping("/{id}/start")
public ApiResp<FertProcurePlan> start(@PathVariable Long id) {
FertProcurePlan p = find(id);
if (!"已审批".equals(p.getStatus())) {
throw new ApiException(409, "仅已审批计划可转执行,当前:" + p.getStatus());
}
p.setStatus("执行中");
return ApiResp.ok(repo.save(p));
}
public record ReceiveRequest(Double receivedQty) {
}
/** 登记到货进度;累计到货达建议量自动完成。 */
@PostMapping("/{id}/receive")
public ApiResp<FertProcurePlan> receive(@PathVariable Long id, @RequestBody ReceiveRequest req) {
FertProcurePlan p = find(id);
if (!"执行中".equals(p.getStatus()) && !"已审批".equals(p.getStatus())) {
throw new ApiException(409, "计划需审批/执行中才能登记到货,当前:" + p.getStatus());
}
BigDecimal add = Money.of(req.receivedQty());
if (add.signum() <= 0) {
throw new ApiException(400, "到货量必须大于 0");
}
p.setReceivedQty(Money.of(p.getReceivedQty().add(add)));
if ("已审批".equals(p.getStatus())) p.setStatus("执行中");
if (p.getReceivedQty().compareTo(p.getSuggestQty()) >= 0 && p.getSuggestQty().signum() > 0) {
p.setStatus("已完成");
}
return ApiResp.ok(repo.save(p));
}
@PostMapping("/{id}/cancel")
public ApiResp<FertProcurePlan> cancel(@PathVariable Long id) {
FertProcurePlan p = find(id);
if ("已完成".equals(p.getStatus())) {
throw new ApiException(409, "已完成计划不可作废");
}
p.setStatus("已作废");
return ApiResp.ok(repo.save(p));
}
@DeleteMapping("/{id}")
public ApiResp<Void> delete(@PathVariable Long id) {
repo.delete(find(id));
return ApiResp.ok();
}
private FertProcurePlan find(Long id) {
return repo.findById(id).orElseThrow(() -> new NotFoundException("采购计划不存在:" + id));
}
}