diff --git a/samples/actual-csv/13_shipping-orders.csv b/samples/actual-csv/13_shipping-orders.csv
new file mode 100644
index 0000000..50f5d4b
--- /dev/null
+++ b/samples/actual-csv/13_shipping-orders.csv
@@ -0,0 +1,3 @@
+ShippingNo,Destination,PlannedDate,ProductCode,Quantity
+SMP-SH-001,サンプル商事株式会社,2026-10-16,FG-1000,5
+SMP-SH-002,サンプル工業株式会社,2026-10-30,FG-1000,3
diff --git a/samples/actual-csv/14_shipment-judgments.csv b/samples/actual-csv/14_shipment-judgments.csv
new file mode 100644
index 0000000..329a535
--- /dev/null
+++ b/samples/actual-csv/14_shipment-judgments.csv
@@ -0,0 +1,3 @@
+ShippingNo,LotNumber,Result,Approve,Note
+SMP-SH-001,FG1000-S001,Approved,true,完成品検査合格（グレードA）を確認
+SMP-SH-002,,Hold,false,納期調整中のため保留（出荷実行はできない）
diff --git a/samples/actual-csv/15_shipments.csv b/samples/actual-csv/15_shipments.csv
new file mode 100644
index 0000000..fa40f2c
--- /dev/null
+++ b/samples/actual-csv/15_shipments.csv
@@ -0,0 +1,2 @@
+ShippingNo,LotNumber,LocationCode,Quantity
+SMP-SH-001,FG1000-S001,WH-P01,5
diff --git a/samples/actual-csv/README.md b/samples/actual-csv/README.md
index 4242b56..c649ed0 100644
--- a/samples/actual-csv/README.md
+++ b/samples/actual-csv/README.md
@@ -17,11 +17,14 @@
| 10 | `10_inspections.csv` | 検査 | 受入・工程内・完成品検査。`InspectionKey` が同じ行が1件の検査。測定値の自動判定と、定性項目の判定 |
| 11 | `11_work-time-records.csv` | 作業時間 | 直接作業（作業指示あり）と間接作業 |
| 12 | `12_trouble-reports.csv` | 製造トラブル報告 | 作業指示・設備に紐づく報告と、紐づかない安全の報告 |
+| 13 | `13_shipping-orders.csv` | 出荷指示 | サンプル商事株式会社へ FG-1000 ×5（SMP-SH-001）と、別の出荷先へ ×3（SMP-SH-002） |
+| 14 | `14_shipment-judgments.csv` | 出荷判定 | SMP-SH-001 は「可」で承認まで。SMP-SH-002 は「保留」のまま（出荷できないことを確かめる用） |
+| 15 | `15_shipments.csv` | 出荷実行 | SMP-SH-001 を FG1000-S001 から5台出荷して完了にする |
## 取り込み方
画面上部の **ZIPで一括取込** に、このフォルダのCSVをまとめたZIPを渡せば1回で取り込めます。個別に取り込むときは、メニューの **管理 → 実績CSV取込** の種別ごとのパネルから取り込みます（受入は在庫・物流、製造指図は生産管理、
-段取り〜製造条件データと作業時間は現場記録、検査は品質管理の権限が必要。トラブル報告は誰でも取り込める）。種別はファイル名の `_` より後ろです
+段取り〜製造条件データと作業時間は現場記録、検査は品質管理、出荷判定は品質保証、出荷指示・出荷実行は在庫・物流の権限が必要。トラブル報告は誰でも取り込める）。種別はファイル名の `_` より後ろです
（`05_consumptions.csv` と `07_consumptions.csv` はどちらも `consumptions`）。
APIへ直接送ることもできます。
@@ -49,6 +52,10 @@ GET /api/actuals/csv/receiving/template … ヘッダーだけのCSV
生産実績は**開始日時で直を決める**ので、夜勤の実績は夜勤の時間帯に入る時刻にしてください。
- 実行記録・検査・作業時間・トラブル報告の**記録者は取り込んだユーザー**になります。
CSVで別の作業者の名前を書く列はありません（他人の名義で実績を作れないようにするため）。
+- **出荷指示は「出荷番号」で指します**。出荷判定・出荷実行のCSVから指せるよう、出荷指示CSVの `ShippingNo` は必須です
+ （`SH` で始まる番号は自動採番用のため指定できません）。出荷番号が同じ行は1件の指示・1回の出荷にまとまります。
+- 出荷実行には、その出荷指示を対象にした**承認済みの出荷判定（可・特採）**が要ります。判定の無い指示・保留の指示を
+ 出荷実行CSVに書くと、そのファイルは取り込めません。
- `DV-03`（校正期限切れ）を `DeviceCode` に書くと、その検査は取り込めません。
- 部材はバックフラッシュ（`Backflush=true`）でも消費できます。ただし代替部品は消費されない
（主材料だけを引く）ので、代替部品を使ったときは投入CSVで理由とともに投入してください。
diff --git a/src/MesApp.Api/Controllers/ShipmentJudgmentsController.cs b/src/MesApp.Api/Controllers/ShipmentJudgmentsController.cs
index e7a49c7..767cd68 100644
--- a/src/MesApp.Api/Controllers/ShipmentJudgmentsController.cs
+++ b/src/MesApp.Api/Controllers/ShipmentJudgmentsController.cs
@@ -1,7 +1,5 @@
-using MesApp.Api.Localization;
using System.Security.Claims;
using MesApp.Api.Services;
-using MesApp.Core.Abstractions;
using MesApp.Core.Contracts.Common;
using MesApp.Core.Contracts.Quality;
using MesApp.Core.Entities;
@@ -21,8 +19,7 @@ namespace MesApp.Api.Controllers;
[Authorize]
public class ShipmentJudgmentsController(
MesAppDbContext db,
- NumberingService numbering,
- IAuditLogger auditLogger) : ControllerBase
+ ShipmentJudgmentService judgments) : ControllerBase
{
///
出荷判定一覧（H-10-10-01）
[HttpGet]
@@ -53,35 +50,14 @@ public async Task
> Get(int id, Cancellati
public async Task> Create(
ShipmentJudgmentCreateRequest request, CancellationToken ct)
{
- if (request.LotId is null && request.ShippingOrderId is null)
+ var outcome = await judgments.CreateAsync(request, User.FindFirstValue(ClaimTypes.NameIdentifier)!, ct);
+ if (outcome.Failed)
{
- return this.BadRequestProblem(ApiText.T("対象ロットIDまたは出荷指示IDを指定してください。"));
+ return ToProblem(outcome);
}
- if (request.LotId is int lotId && !await db.Lots.AnyAsync(l => l.Id == lotId, ct))
- {
- return this.BadRequestProblem(ApiText.T("存在しないロットIDです。"));
- }
- if (request.ShippingOrderId is int shippingOrderId
- && !await db.ShippingOrders.AnyAsync(s => s.Id == shippingOrderId, ct))
- {
- return this.BadRequestProblem(ApiText.T("存在しない出荷指示IDです。"));
- }
-
- var judgment = new ShipmentJudgment
- {
- JudgmentNo = await numbering.NextJudgmentNoAsync(ct),
- LotId = request.LotId,
- ShippingOrderId = request.ShippingOrderId,
- Result = request.Result,
- JudgedByUserId = User.FindFirstValue(ClaimTypes.NameIdentifier)!,
- Note = request.Note,
- };
- db.ShipmentJudgments.Add(judgment);
- await db.SaveChangesAsync(ct);
- await auditLogger.LogAsync("Quality", "ShipmentJudge", nameof(ShipmentJudgment), judgment.Id.ToString(),
- detail: $"judgmentNo={judgment.JudgmentNo}, result={judgment.Result}", ct: ct);
- var saved = await BaseQuery().FirstAsync(j => j.Id == judgment.Id, ct);
- return CreatedAtAction(nameof(Get), new { id = judgment.Id }, ToResponse(saved));
+ var id = outcome.Value!.Id;
+ var saved = await BaseQuery().FirstAsync(j => j.Id == id, ct);
+ return CreatedAtAction(nameof(Get), new { id }, ToResponse(saved));
}
/// 判定承認（H-10-10-03）
@@ -89,24 +65,22 @@ await auditLogger.LogAsync("Quality", "ShipmentJudge", nameof(ShipmentJudgment),
[Authorize(Roles = MesRoleGroups.QaManage)]
public async Task> Approve(int id, CancellationToken ct)
{
- var judgment = await db.ShipmentJudgments.FirstOrDefaultAsync(j => j.Id == id, ct);
- if (judgment is null)
- {
- return NotFound();
- }
- if (judgment.ApprovedAt is not null)
+ var outcome = await judgments.ApproveAsync(id, User.FindFirstValue(ClaimTypes.NameIdentifier), ct);
+ if (outcome.Failed)
{
- return this.ConflictProblem(ApiText.T("既に承認済みです。"));
+ return ToProblem(outcome);
}
- judgment.ApprovedByUserId = User.FindFirstValue(ClaimTypes.NameIdentifier);
- judgment.ApprovedAt = DateTimeOffset.UtcNow;
- await db.SaveChangesAsync(ct);
- await auditLogger.LogAsync("Quality", "ShipmentJudgeApprove", nameof(ShipmentJudgment), id.ToString(),
- detail: $"judgmentNo={judgment.JudgmentNo}", ct: ct);
var saved = await BaseQuery().FirstAsync(j => j.Id == id, ct);
return ToResponse(saved);
}
+ private ActionResult ToProblem(Outcome outcome) => outcome.Kind switch
+ {
+ OutcomeError.NotFound => NotFound(),
+ OutcomeError.Conflict => this.ConflictProblem(outcome.Error),
+ _ => this.BadRequestProblem(outcome.Error),
+ };
+
private IQueryable BaseQuery() =>
db.ShipmentJudgments.AsNoTracking()
.Include(j => j.Lot)
diff --git a/src/MesApp.Api/Controllers/ShippingOrdersController.cs b/src/MesApp.Api/Controllers/ShippingOrdersController.cs
index 1c7fcdf..c006a88 100644
--- a/src/MesApp.Api/Controllers/ShippingOrdersController.cs
+++ b/src/MesApp.Api/Controllers/ShippingOrdersController.cs
@@ -55,7 +55,7 @@ public async Task> Get(int id, CancellationT
public async Task> Create(
ShippingOrderCreateRequest request, CancellationToken ct)
{
- var outcome = await shipping.CreateAsync(request, CurrentUserId, ct);
+ var outcome = await shipping.CreateAsync(request, shippingNo: null, CurrentUserId, ct);
if (outcome.Failed)
{
return ToProblem(outcome);
diff --git a/src/MesApp.Api/Localization/ApiText.en.resx b/src/MesApp.Api/Localization/ApiText.en.resx
index 12ac27f..7cca82f 100644
--- a/src/MesApp.Api/Localization/ApiText.en.resx
+++ b/src/MesApp.Api/Localization/ApiText.en.resx
@@ -1896,4 +1896,91 @@
Product '{1}', process '{2}' on production date {0:yyyy-MM-dd} already has a plan for work center '{3}', which overlaps with work center '{4}'. Plans with and without a work center, or for a parent and its child work center, cannot coexist because the plan-vs-actual view would count them twice.
+
+ The shipment judgment ID does not exist.
+
+
+ Shipping number '{0}' cannot be specified because it overlaps the auto-numbering format ({1}...).
+
+
+ Shipping number '{0}' already exists.
+
+
+ Quantity (instructed quantity) is required.
+
+
+ Shipping number '{0}' has duplicate rows for product '{1}'.
+
+
+ Either ShippingNo (shipping number) or LotNumber (target lot number) is required.
+
+
+ Quantity (shipping quantity) is required.
+
+
+ Shipping order '{0}' is not registered (ShippingNo).
+
+
+ Shipping orders
+
+
+ Shipment judgments
+
+
+ Shipments
+
+
+ Shipping number
+
+
+ Destination
+
+
+ Planned shipping date
+
+
+ Instructed quantity
+
+
+ Shipping lot number
+
+
+ Source location code
+
+
+ Shipping quantity
+
+
+ Rows with the same number are grouped into one shipping order. Later shipment judgment and shipment CSVs refer to the order by this number. Numbers starting with SH are reserved for auto-numbering.
+
+
+ The value of the first row in the group is used.
+
+
+ yyyy-MM-dd. The value of the first row in the group is used.
+
+
+ A registered, active product code. The same product cannot appear on two rows of one order.
+
+
+ A registered shipping number (ShippingNo in the shipping order CSV). Shipping requires an approved judgment on the shipping order.
+
+
+ A registered lot number. At least one of this and ShippingNo is required.
+
+
+ Approved / Hold / SpecialAcceptance
+
+
+ true approves the judgment right after registering it.
+
+
+ A registered shipping number (ShippingNo in the shipping order CSV). Rows with the same number are shipped together.
+
+
+ A registered lot number of a product in the shipping order, in a usable state (normal and not expired).
+
+
+ A number greater than 0. Together with the quantity already shipped, it cannot exceed the instructed quantity.
+
diff --git a/src/MesApp.Api/MesAppHost.cs b/src/MesApp.Api/MesAppHost.cs
index 141285a..4743996 100644
--- a/src/MesApp.Api/MesAppHost.cs
+++ b/src/MesApp.Api/MesAppHost.cs
@@ -85,6 +85,7 @@ public static WebApplication Build(string[] args)
builder.Services.AddScoped();
builder.Services.AddScoped();
builder.Services.AddScoped();
+ builder.Services.AddScoped();
builder.Services.AddScoped();
builder.Services.AddScoped();
builder.Services.AddScoped();
diff --git a/src/MesApp.Api/Services/ActualCsvKinds.cs b/src/MesApp.Api/Services/ActualCsvKinds.cs
index 982e89a..e5bf0f5 100644
--- a/src/MesApp.Api/Services/ActualCsvKinds.cs
+++ b/src/MesApp.Api/Services/ActualCsvKinds.cs
@@ -28,9 +28,13 @@ public static class ActualCsvKinds
public const string WorkTimeRecords = "work-time-records";
public const string TroubleReports = "trouble-reports";
public const string EquipmentLogs = "equipment-logs";
+ public const string ShippingOrders = "shipping-orders";
+ public const string ShipmentJudgments = "shipment-judgments";
+ public const string Shipments = "shipments";
private const string OrderNoNote = "登録済みの指図番号（製造指図CSVの OrderNo）";
private const string SequenceNote = "工順の工程順序。指図番号と合わせて作業指示を指す（展開済みであること）";
+ private const string ShippingNoNote = "登録済みの出荷番号（出荷指示CSVの ShippingNo）";
private const string DateTimeNote = "yyyy-MM-dd HH:mm（工場の時刻）。+09:00 などのオフセット付きも可";
public static readonly List All =
@@ -158,6 +162,30 @@ public static class ActualCsvKinds
new("Sequence", "工程順序", false, "指図番号を書いたときは必須"),
new("Note", "備考", false, null),
]), AnyRole),
+ new(new CsvKindInfo(ShippingOrders, "出荷指示", false,
+ [
+ new("ShippingNo", "出荷番号", true,
+ "同じ番号の行を1件の出荷指示にまとめる。後続の出荷判定・出荷実行CSVから指示を指す。SHで始まる番号は自動採番用のため使えない"),
+ new("Destination", "出荷先", true, "まとまりの最初の行の値を使う"),
+ new("PlannedDate", "出荷予定日", false, "yyyy-MM-dd。まとまりの最初の行の値を使う"),
+ new("ProductCode", "品目コード", true, "登録済みで有効な品目コード。1件の指示に同じ品目を2行書けない"),
+ new("Quantity", "指示数量", true, "0より大きい数値"),
+ ]), MesRoleGroups.InventoryManage),
+ new(new CsvKindInfo(ShipmentJudgments, "出荷判定", false,
+ [
+ new("ShippingNo", "出荷番号", false, ShippingNoNote + "。出荷実行には出荷指示を対象にした承認済みの判定が必要"),
+ new("LotNumber", "対象ロット番号", false, "登録済みのロット番号。ShippingNo と少なくともどちらかは必須"),
+ new("Result", "判定", true, "Approved（可）/ Hold（保留）/ SpecialAcceptance（特採）"),
+ new("Approve", "承認する", false, "true で判定の登録に続けて承認する"),
+ new("Note", "備考", false, null),
+ ]), MesRoleGroups.QaManage),
+ new(new CsvKindInfo(Shipments, "出荷実行", false,
+ [
+ new("ShippingNo", "出荷番号", true, ShippingNoNote + "。同じ番号の行を1回の出荷にまとめる"),
+ new("LotNumber", "出荷ロット番号", true, "登録済みのロット番号。出荷指示に含まれる品目で、使える状態（正常・期限内）であること"),
+ new("LocationCode", "出荷元ロケーションコード", true, null),
+ new("Quantity", "出荷数量", true, "0より大きい数値。出荷済みと合わせて指示数量を超えられない"),
+ ]), MesRoleGroups.InventoryManage),
];
///
diff --git a/src/MesApp.Api/Services/ActualCsvService.Shipping.cs b/src/MesApp.Api/Services/ActualCsvService.Shipping.cs
new file mode 100644
index 0000000..a0ab0d9
--- /dev/null
+++ b/src/MesApp.Api/Services/ActualCsvService.Shipping.cs
@@ -0,0 +1,220 @@
+using MesApp.Api.Localization;
+using MesApp.Core.Contracts.Inventory;
+using MesApp.Core.Contracts.Masters;
+using MesApp.Core.Contracts.Quality;
+using MesApp.Core.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace MesApp.Api.Services;
+
+// 実績CSVのうち出荷（D-40-20 出荷指示、H-10-10 出荷判定、D-40-30 出荷実行）。
+// 出荷判定は品質保証、指示と実行は物流の権限なので、1つの種別にまとめず3つに分ける（ActualCsvKinds）
+public sealed partial class ActualCsvService
+{
+ ///
+ /// 出荷指示（D-40-20-01）。出荷番号が同じ行を1件の指示にまとめ、1行＝1明細（品目）とする。
+ /// 後続の出荷判定・出荷実行のCSVは指示を出荷番号で指すため、番号はここで確定させる
+ ///
+ private async Task ImportShippingOrdersAsync(
+ CsvTable table, List errors, string? userId, CancellationToken ct)
+ {
+ var productIds = await db.Products.AsNoTracking().Where(p => p.IsActive)
+ .ToDictionaryAsync(p => p.Code, p => p.Id, StringComparer.Ordinal, ct);
+
+ var groups = table.Rows
+ .GroupBy(row => table.Value(row, "ShippingNo"))
+ .Select(g => g.ToList())
+ .ToList();
+
+ var created = 0;
+ foreach (var group in groups)
+ {
+ var head = new CsvRowReader(table, group[0], errors);
+ var shippingNo = head.RequiredText("ShippingNo", 50);
+ var destination = head.RequiredText("Destination", 200);
+ var plannedDate = head.DateOrNull("PlannedDate", null);
+ if (head.Failed)
+ {
+ continue;
+ }
+
+ var lines = new List();
+ var failed = false;
+ foreach (var row in group)
+ {
+ var reader = new CsvRowReader(table, row, errors);
+ reader.RequiredText("ProductCode");
+ var productId = reader.Reference("ProductCode", null, productIds, "有効な品目");
+ var quantity = reader.NumberOrNull("Quantity", null, 0.000001m);
+ if (quantity is null && !reader.Failed)
+ {
+ reader.Fail(ApiText.T("Quantity（指示数量）は必須です。"));
+ }
+ // 出荷実行はロットの品目で明細を1つに決めて突き合わせるため、同じ品目の明細を2つ持たせない
+ if (productId is not null && lines.Any(l => l.ProductId == productId))
+ {
+ reader.Fail(ApiText.T("出荷番号 '{0}' に品目 '{1}' の行が重複しています。", shippingNo, table.Value(row, "ProductCode")));
+ }
+ if (reader.Failed)
+ {
+ failed = true;
+ continue;
+ }
+ lines.Add(new ShippingLineRequest(productId!.Value, quantity!.Value));
+ }
+ if (failed)
+ {
+ continue;
+ }
+
+ var outcome = await shipping.CreateAsync(
+ new ShippingOrderCreateRequest(destination, plannedDate, lines), shippingNo, userId, ct);
+ if (outcome.Failed)
+ {
+ FailRow(head, outcome.Error!);
+ continue;
+ }
+ created++;
+ }
+ return created;
+ }
+
+ /// 出荷判定（H-10-10-02）。1行＝1件の判定で、列の指定に応じて承認（H-10-10-03）まで進める
+ private async Task ImportShipmentJudgmentsAsync(
+ CsvTable table, List errors, string userId, CancellationToken ct)
+ {
+ var created = 0;
+ foreach (var row in table.Rows)
+ {
+ var reader = new CsvRowReader(table, row, errors);
+ var shippingNo = reader.Text("ShippingNo", null);
+ var lotNumber = reader.Text("LotNumber", null);
+ reader.RequiredText("Result");
+ var result = reader.Enum("Result", ShipmentJudgmentResult.Hold, CsvEnumLabels.ShipmentJudgmentResults);
+ var approve = reader.Bool("Approve", false);
+ var note = reader.Text("Note", null, 1000);
+ if (shippingNo is null && lotNumber is null && !reader.Failed)
+ {
+ reader.Fail(ApiText.T("ShippingNo（出荷番号）と LotNumber（対象ロット番号）のどちらかは必須です。"));
+ }
+ // 前のファイル（出荷指示・工程展開）で作られた指示・ロットも指せるよう、行ごとにDBを引く
+ var shippingOrderId = await ResolveShippingOrderAsync(reader, shippingNo, ct);
+ int? lotId = null;
+ if (lotNumber is not null)
+ {
+ lotId = await db.Lots.Where(l => l.LotNumber == lotNumber)
+ .Select(l => (int?)l.Id).FirstOrDefaultAsync(ct);
+ if (lotId is null)
+ {
+ reader.Fail(ApiText.T("ロット '{0}' は登録されていません（LotNumber）。", lotNumber));
+ }
+ }
+ if (reader.Failed)
+ {
+ continue;
+ }
+
+ var outcome = await judgments.CreateAsync(
+ new ShipmentJudgmentCreateRequest(lotId, shippingOrderId, result, note), userId, ct);
+ if (outcome.Value is { } judgment && approve)
+ {
+ outcome = await judgments.ApproveAsync(judgment.Id, userId, ct);
+ }
+ if (outcome.Failed)
+ {
+ FailRow(reader, outcome.Error!);
+ continue;
+ }
+ created++;
+ }
+ return created;
+ }
+
+ ///
+ /// 出荷実行（D-40-30）。出荷番号が同じ行を1回の出荷にまとめ、1行＝1ロットの引落しとする。
+ /// 出荷判定のゲートとロットの使用可否は単票APIと同じく が判定する
+ ///
+ private async Task ImportShipmentsAsync(
+ CsvTable table, List errors, string? userId, CancellationToken ct)
+ {
+ var locationIds = await db.Locations.AsNoTracking()
+ .ToDictionaryAsync(l => l.Code, l => l.Id, StringComparer.Ordinal, ct);
+
+ var groups = table.Rows
+ .GroupBy(row => table.Value(row, "ShippingNo"))
+ .Select(g => g.ToList())
+ .ToList();
+
+ var created = 0;
+ foreach (var group in groups)
+ {
+ var head = new CsvRowReader(table, group[0], errors);
+ var shippingNo = head.RequiredText("ShippingNo");
+ var shippingOrderId = await ResolveShippingOrderAsync(head, shippingNo, ct);
+ if (head.Failed)
+ {
+ continue;
+ }
+
+ var lines = new List();
+ var failed = false;
+ foreach (var row in group)
+ {
+ var reader = new CsvRowReader(table, row, errors);
+ var lotNumber = reader.RequiredText("LotNumber");
+ reader.RequiredText("LocationCode");
+ var locationId = reader.Reference("LocationCode", null, locationIds, "ロケーション");
+ var quantity = reader.NumberOrNull("Quantity", null, 0.000001m);
+ if (quantity is null && !reader.Failed)
+ {
+ reader.Fail(ApiText.T("Quantity（出荷数量）は必須です。"));
+ }
+ int? lotId = null;
+ if (lotNumber.Length > 0)
+ {
+ lotId = await db.Lots.Where(l => l.LotNumber == lotNumber)
+ .Select(l => (int?)l.Id).FirstOrDefaultAsync(ct);
+ if (lotId is null)
+ {
+ reader.Fail(ApiText.T("ロット '{0}' は登録されていません（LotNumber）。", lotNumber));
+ }
+ }
+ if (reader.Failed)
+ {
+ failed = true;
+ continue;
+ }
+ lines.Add(new ShipLineRequest(lotId!.Value, locationId!.Value, quantity!.Value));
+ }
+ if (failed)
+ {
+ continue;
+ }
+
+ var outcome = await shipping.ShipAsync(shippingOrderId!.Value, new ShipExecuteRequest(lines), userId, ct);
+ if (outcome.Failed)
+ {
+ FailRow(head, outcome.Error!);
+ continue;
+ }
+ created++;
+ }
+ return created;
+ }
+
+ /// 出荷番号→出荷指示ID（番号が空ならnull。見つからなければ行をエラーにする）
+ private async Task ResolveShippingOrderAsync(CsvRowReader reader, string? shippingNo, CancellationToken ct)
+ {
+ if (string.IsNullOrEmpty(shippingNo))
+ {
+ return null;
+ }
+ var id = await db.ShippingOrders.Where(s => s.ShippingNo == shippingNo)
+ .Select(s => (int?)s.Id).FirstOrDefaultAsync(ct);
+ if (id is null)
+ {
+ reader.Fail(ApiText.T("出荷指示 '{0}' は登録されていません（ShippingNo）。", shippingNo));
+ }
+ return id;
+ }
+}
diff --git a/src/MesApp.Api/Services/ActualCsvService.cs b/src/MesApp.Api/Services/ActualCsvService.cs
index ea3bed0..8c58dec 100644
--- a/src/MesApp.Api/Services/ActualCsvService.cs
+++ b/src/MesApp.Api/Services/ActualCsvService.cs
@@ -27,13 +27,15 @@ namespace MesApp.Api.Services;
/// 前の行を登録しないと判定できない条件があるため。
///
///
-public sealed class ActualCsvService(
+public sealed partial class ActualCsvService(
MesAppDbContext db,
ReceivingService receiving,
ManufacturingOrderService orders,
WorkOrderExecutionService execution,
InspectionService inspections,
ShopFloorReportService reports,
+ ShippingService shipping,
+ ShipmentJudgmentService judgments,
IBusinessDateService businessDate,
IAuditLogger auditLogger)
{
@@ -71,6 +73,9 @@ private async Task ImportOneAsync(
ActualCsvKinds.WorkTimeRecords => await ImportWorkTimeRecordsAsync(table, errors, userId!, ct),
ActualCsvKinds.TroubleReports => await ImportTroubleReportsAsync(table, errors, userId!, ct),
ActualCsvKinds.EquipmentLogs => await ImportEquipmentLogsAsync(table, errors, userId, ct),
+ ActualCsvKinds.ShippingOrders => await ImportShippingOrdersAsync(table, errors, userId, ct),
+ ActualCsvKinds.ShipmentJudgments => await ImportShipmentJudgmentsAsync(table, errors, userId!, ct),
+ ActualCsvKinds.Shipments => await ImportShipmentsAsync(table, errors, userId, ct),
_ => throw new ArgumentOutOfRangeException(nameof(kind)),
};
if (errors.Count == 0)
diff --git a/src/MesApp.Api/Services/MasterCsvKinds.cs b/src/MesApp.Api/Services/MasterCsvKinds.cs
index aa85aa6..cf9e31f 100644
--- a/src/MesApp.Api/Services/MasterCsvKinds.cs
+++ b/src/MesApp.Api/Services/MasterCsvKinds.cs
@@ -307,6 +307,10 @@ public static class CsvEnumLabels
("段取り", EquipmentLogStatus.Setup), ("故障", EquipmentLogStatus.Failure),
("アイドル", EquipmentLogStatus.Idle), ("待機", EquipmentLogStatus.Idle));
+ public static readonly IReadOnlyDictionary ShipmentJudgmentResults = Build(
+ ("可", ShipmentJudgmentResult.Approved), ("保留", ShipmentJudgmentResult.Hold),
+ ("特採", ShipmentJudgmentResult.SpecialAcceptance), ("特別採用", ShipmentJudgmentResult.SpecialAcceptance));
+
public static readonly IReadOnlyDictionary MakeOrBuys = Build(
("内製", MakeOrBuy.InHouse), ("外注", MakeOrBuy.Outsourced));
diff --git a/src/MesApp.Api/Services/ShipmentJudgmentService.cs b/src/MesApp.Api/Services/ShipmentJudgmentService.cs
new file mode 100644
index 0000000..d6019d6
--- /dev/null
+++ b/src/MesApp.Api/Services/ShipmentJudgmentService.cs
@@ -0,0 +1,74 @@
+using MesApp.Api.Localization;
+using MesApp.Core.Abstractions;
+using MesApp.Core.Contracts.Quality;
+using MesApp.Core.Entities;
+using MesApp.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+
+namespace MesApp.Api.Services;
+
+///
+/// 出荷判定（H-10-10。判定（可/保留/特採）→承認の単段階承認）。
+/// 単票API（ShipmentJudgmentsController）と実績CSV取込（ActualCsvService）の両方から呼ぶ。
+/// 出荷実行のゲートの条件は に置く。
+/// 保存と監査ログまで行う。トランザクションは呼び出し側が張る。
+///
+public sealed class ShipmentJudgmentService(
+ MesAppDbContext db,
+ NumberingService numbering,
+ IAuditLogger auditLogger)
+{
+ /// 出荷判定（H-10-10-02。対象はロットまたは出荷指示）
+ public async Task> CreateAsync(
+ ShipmentJudgmentCreateRequest request, string userId, CancellationToken ct)
+ {
+ if (request.LotId is null && request.ShippingOrderId is null)
+ {
+ return Outcome.Invalid(ApiText.T("対象ロットIDまたは出荷指示IDを指定してください。"));
+ }
+ if (request.LotId is int lotId && !await db.Lots.AnyAsync(l => l.Id == lotId, ct))
+ {
+ return Outcome.Invalid(ApiText.T("存在しないロットIDです。"));
+ }
+ if (request.ShippingOrderId is int shippingOrderId
+ && !await db.ShippingOrders.AnyAsync(s => s.Id == shippingOrderId, ct))
+ {
+ return Outcome.Invalid(ApiText.T("存在しない出荷指示IDです。"));
+ }
+
+ var judgment = new ShipmentJudgment
+ {
+ JudgmentNo = await numbering.NextJudgmentNoAsync(ct),
+ LotId = request.LotId,
+ ShippingOrderId = request.ShippingOrderId,
+ Result = request.Result,
+ JudgedByUserId = userId,
+ Note = request.Note,
+ };
+ db.ShipmentJudgments.Add(judgment);
+ await db.SaveChangesAsync(ct);
+ await auditLogger.LogAsync("Quality", "ShipmentJudge", nameof(ShipmentJudgment), judgment.Id.ToString(),
+ detail: $"judgmentNo={judgment.JudgmentNo}, result={judgment.Result}", ct: ct);
+ return Outcome.Ok(judgment);
+ }
+
+ /// 判定承認（H-10-10-03）
+ public async Task> ApproveAsync(int id, string? userId, CancellationToken ct)
+ {
+ var judgment = await db.ShipmentJudgments.FirstOrDefaultAsync(j => j.Id == id, ct);
+ if (judgment is null)
+ {
+ return Outcome.NotFound(ApiText.T("存在しない出荷判定IDです。"));
+ }
+ if (judgment.ApprovedAt is not null)
+ {
+ return Outcome.Conflict(ApiText.T("既に承認済みです。"));
+ }
+ judgment.ApprovedByUserId = userId;
+ judgment.ApprovedAt = DateTimeOffset.UtcNow;
+ await db.SaveChangesAsync(ct);
+ await auditLogger.LogAsync("Quality", "ShipmentJudgeApprove", nameof(ShipmentJudgment), id.ToString(),
+ detail: $"judgmentNo={judgment.JudgmentNo}", ct: ct);
+ return Outcome.Ok(judgment);
+ }
+}
diff --git a/src/MesApp.Api/Services/ShippingService.cs b/src/MesApp.Api/Services/ShippingService.cs
index 04d9f21..dd6c5f3 100644
--- a/src/MesApp.Api/Services/ShippingService.cs
+++ b/src/MesApp.Api/Services/ShippingService.cs
@@ -23,9 +23,15 @@ public sealed class ShippingService(
IBusinessDateService businessDate,
IAuditLogger auditLogger)
{
- /// 出荷指示の作成（D-40-20-01）
+ /// 自動採番の出荷番号の接頭辞（手入力の番号と衝突させないため、手入力では使わせない）
+ public const string AutoShippingNoPrefix = "SH";
+
+ ///
+ /// 出荷指示の作成（D-40-20-01）。
+ /// shippingNo を渡すとその番号で登録する（CSV取込で後続の出荷判定・出荷実行から指示を指すため。空なら自動採番）
+ ///
public async Task> CreateAsync(
- ShippingOrderCreateRequest request, string? userId, CancellationToken ct)
+ ShippingOrderCreateRequest request, string? shippingNo, string? userId, CancellationToken ct)
{
if (request.Lines.Count == 0)
{
@@ -37,9 +43,24 @@ public async Task> CreateAsync(
return Outcome.Invalid(ApiText.T("存在しない品目IDが含まれています。"));
}
+ if (string.IsNullOrWhiteSpace(shippingNo))
+ {
+ shippingNo = await numbering.NextShippingNoAsync(ct);
+ }
+ else if (shippingNo.StartsWith(AutoShippingNoPrefix, StringComparison.OrdinalIgnoreCase))
+ {
+ // 自動採番の連番は採番テーブルで管理しており、同じ形式の手入力番号があると後で衝突する
+ return Outcome.Invalid(
+ ApiText.T("出荷番号 '{0}' は自動採番の形式（{1}〜）と重なるため指定できません。", shippingNo, AutoShippingNoPrefix));
+ }
+ else if (await db.ShippingOrders.AnyAsync(s => s.ShippingNo == shippingNo, ct))
+ {
+ return Outcome.Conflict(ApiText.T("出荷番号 '{0}' は既に存在します。", shippingNo));
+ }
+
var order = new ShippingOrder
{
- ShippingNo = await numbering.NextShippingNoAsync(ct),
+ ShippingNo = shippingNo,
Destination = request.Destination,
PlannedDate = request.PlannedDate,
CreatedByUserId = userId,
diff --git a/tests/MesApp.Api.Tests/InventoryTests.cs b/tests/MesApp.Api.Tests/InventoryTests.cs
index ceac1fa..9849865 100644
--- a/tests/MesApp.Api.Tests/InventoryTests.cs
+++ b/tests/MesApp.Api.Tests/InventoryTests.cs
@@ -234,6 +234,71 @@ await admin.PostAsJsonAsync("/api/inventory/move",
Assert.Equal(HttpStatusCode.BadRequest, created.StatusCode);
}
+ [Fact]
+ public async Task 出荷指示と出荷判定と出荷実行をCSVで取り込め_判定の無い出荷は全件取り消される()
+ {
+ using var factory = new ApiFactory();
+ using var admin = await TestAuth.CreateAdminClientAsync(factory);
+ await Phase3TestData.SetupAsync(admin);
+ Assert.True((await Phase3TestData.ImportActualCsvAsync(admin, "receiving",
+ "ProductCode,Quantity,LocationCode,LotNumber\nFG-01,100,LOC-P,FG-LOT-1\n")).Succeeded);
+ const string orderHeader = "ShippingNo,Destination,PlannedDate,ProductCode,Quantity\n";
+ const string shipHeader = "ShippingNo,LotNumber,LocationCode,Quantity\n";
+
+ // 自動採番の形式（SH〜）の番号と、1件の指示に同じ品目を2行書いたものは拒否し、正しい行も登録しない
+ var invalid = await Phase3TestData.ImportActualCsvAsync(admin, "shipping-orders",
+ orderHeader
+ + "CSV-SH-1,出荷先A,2026-10-16,FG-01,60\n"
+ + "SH20260101-0001,出荷先B,,FG-01,10\n"
+ + "CSV-SH-3,出荷先C,,FG-01,5\n"
+ + "CSV-SH-3,出荷先C,,FG-01,5\n");
+ Assert.False(invalid.Succeeded);
+ Assert.Contains(invalid.Errors, e => e.Line == 3 && e.Message.Contains("SH20260101-0001"));
+ Assert.Contains(invalid.Errors, e => e.Line == 5 && e.Message.Contains("FG-01"));
+
+ // 出荷番号が同じ行は1件の指示にまとまる（ここでは1行ずつ2件）
+ var orders = await Phase3TestData.ImportActualCsvAsync(admin, "shipping-orders",
+ orderHeader + "CSV-SH-1,出荷先A,2026-10-16,FG-01,60\nCSV-SH-2,出荷先B,,FG-01,10\n");
+ Assert.True(orders.Succeeded);
+ Assert.Equal(2, orders.Created);
+
+ // 判定の無い指示は出荷できず、在庫も動かない（単票APIと同じゲート）
+ var blocked = await Phase3TestData.ImportActualCsvAsync(admin, "shipments", shipHeader + "CSV-SH-1,FG-LOT-1,LOC-P,20\n");
+ Assert.False(blocked.Succeeded);
+ Assert.Contains("H-10-10", Assert.Single(blocked.Errors).Message);
+ Assert.Equal(100m, await StockOfProductAsync(admin, "FG-01"));
+
+ // 出荷判定の取込は単票の判定APIと同じ権限（品質保証）。物流は取り込めない
+ var kinds = await admin.GetFromJsonAsync>("/api/actuals/csv/kinds");
+ Assert.Equal(MesRoleGroups.QaManage, kinds!.Single(k => k.Kind == "shipment-judgments").WriteRoles);
+ Assert.Equal(MesRoleGroups.InventoryManage, kinds!.Single(k => k.Kind == "shipments").WriteRoles);
+ const string judgmentCsv = "ShippingNo,LotNumber,Result,Approve,Note\nCSV-SH-1,FG-LOT-1,可,true,\nCSV-SH-2,,Hold,false,保留\n";
+ using var logistics = await TestAuth.CreateUserClientAsync(
+ factory, admin, "logistics1", "Passw0rd123", MesRoles.Logistics);
+ Assert.Equal(HttpStatusCode.Forbidden,
+ (await Phase3TestData.PostActualCsvAsync(logistics, "shipment-judgments", judgmentCsv)).StatusCode);
+ var judged = await Phase3TestData.ImportActualCsvAsync(admin, "shipment-judgments", judgmentCsv);
+ Assert.True(judged.Succeeded);
+ Assert.Equal(2, judged.Created);
+
+ // 保留の判定しか無い指示は出荷できない
+ var held = await Phase3TestData.ImportActualCsvAsync(logistics, "shipments", shipHeader + "CSV-SH-2,FG-LOT-1,LOC-P,10\n");
+ Assert.False(held.Succeeded);
+
+ // 出荷番号が同じ行は1回の出荷にまとまり、指示数量に達すると完了になる
+ var shipped = await Phase3TestData.ImportActualCsvAsync(logistics, "shipments",
+ shipHeader + "CSV-SH-1,FG-LOT-1,LOC-P,20\nCSV-SH-1,FG-LOT-1,LOC-P,40\n");
+ Assert.True(shipped.Succeeded, string.Join(" / ", shipped.Errors.Select(e => e.Message)));
+ Assert.Equal(1, shipped.Created);
+ Assert.Equal(40m, await StockOfProductAsync(admin, "FG-01"));
+ using var scope = factory.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ var order = await db.ShippingOrders.Include(s => s.Lines).SingleAsync(s => s.ShippingNo == "CSV-SH-1");
+ Assert.Equal(ShippingOrderStatus.Completed, order.Status);
+ Assert.Equal(new DateOnly(2026, 10, 16), order.PlannedDate);
+ Assert.Equal(60m, Assert.Single(order.Lines).ShippedQuantity);
+ }
+
[Fact]
public async Task 出荷指示から出荷実行で在庫が引き落とされ完了になる()
{
diff --git a/tests/MesApp.Api.Tests/MasterCsvTests.cs b/tests/MesApp.Api.Tests/MasterCsvTests.cs
index 7933199..7c44af5 100644
--- a/tests/MesApp.Api.Tests/MasterCsvTests.cs
+++ b/tests/MesApp.Api.Tests/MasterCsvTests.cs
@@ -1315,7 +1315,12 @@ decimal MachiningRate(DateOnly from) => planActual
// 実績は同じ種別を番号違いで複数含む（05_consumptions と 07_consumptions）
var actualResult = await PostBundleAsync(client, "actuals", actuals);
Assert.True(actualResult.Succeeded, Describe(actualResult));
- Assert.Equal(12, actualResult.Files.Count);
+ Assert.Equal(15, actualResult.Files.Count);
+ // 出荷は判定を承認した SMP-SH-001 だけが出荷まで進み、保留の SMP-SH-002 は指示のまま残る
+ var shipping = (await client.GetFromJsonAsync>(
+ "/api/shipping-orders"))!.Items;
+ Assert.Equal(ShippingOrderStatus.Completed, shipping.Single(s => s.ShippingNo == "SMP-SH-001").Status);
+ Assert.Equal(ShippingOrderStatus.Instructed, shipping.Single(s => s.ShippingNo == "SMP-SH-002").Status);
// マスタと実績が混ざったZIPはどちらの一括取込でも受け付けない
var mixed = ZipFiles(("01_processes.csv", "Code,Name\nPR-99,検査\n"), ("02_receiving.csv", "ProductCode,Quantity,LocationCode\nRM-3001,1,WH-M01\n"));
-
-