From ffda0baad362ac0b72caae668e2ca229eea2bbe2 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 16 七月 2025 15:11:06 +0800
Subject: [PATCH] 分割前订单增加
---
StandardPda/MES.Service/service/WomcaaManager.cs | 12 +++---------
StandardPda/MES.Service/Dto/webApi/ErpCAA.cs | 6 +++---
StandardPda/MES.Service/Modes/Womcaa.cs | 6 ++++++
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs b/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs
index 6ba7e30..9eb5b37 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs
@@ -27,9 +27,6 @@
public string? FBomId { get; set; }
public string? FCreateType { get; set; }
- public string? PLAN_ID { get; set; }
- public string? PLAN_SEQ { get; set; }
- public string? PLAN_NUM { get; set; }
public string? FSrcBillType { get; set; }
public string? FSrcBillNo { get; set; }
public string? FSrcBillEntrySeq { get; set; }
@@ -66,6 +63,9 @@
public decimal? FTotalReworkingQty { get; set; }
public string? FReasonForRework { get; set; }
public decimal? FIsForceWholeSet { get; set; }
+
+ public string? FPrevMO { get; set; }
+
public string? TypeA { get; set; }
diff --git a/StandardPda/MES.Service/Modes/Womcaa.cs b/StandardPda/MES.Service/Modes/Womcaa.cs
index b46fb02..00b2669 100644
--- a/StandardPda/MES.Service/Modes/Womcaa.cs
+++ b/StandardPda/MES.Service/Modes/Womcaa.cs
@@ -513,6 +513,12 @@
public decimal? Isforcewholeset { get; set; }
/// <summary>
+ /// 鍒嗗壊鍓嶅師璁㈠崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PREVMO")]
+ public string? PREVMO { get; set; }
+
+ /// <summary>
/// 1锛屾柊澧烇紱2锛屽彉鏇�
/// </summary>
[SugarColumn(ColumnName = "TYPEA")]
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 3f38115..6c0f161 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -102,13 +102,7 @@
Caa013 = dto.FBomId,
CreateType = dto.FCreateType,
- Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
- ? Convert.ToInt64(dto.PLAN_ID)
- : null,
- Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
- ? Convert.ToInt64(dto.PLAN_SEQ)
- : null,
- Caa020 = dto.PLAN_NUM,
+ Caa020 = dto.FBillNo,
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
SrcBillentryseq = dto.FSrcBillEntrySeq,
@@ -118,7 +112,6 @@
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
Caa016 = dto.FDescription,
- //BTBZ = dto.BTBZ,
PrdOrg = dto.FPrdOrgId,
TrustOrg = dto.FEnTrustOrgId,
Bomtype = dto.FBOMType,
@@ -140,7 +133,8 @@
Totalrcvqty = dto.FTotalRcvQty,
Totalreworkingqty = dto.FTotalReworkingQty,
Reasonforrework = dto.FReasonForRework,
- Isforcewholeset = dto.FIsForceWholeSet,
+ Isforcewholeset = dto.FIsForceWholeSet,
+ PREVMO = dto.FPrevMO,
Typea = dto.TypeA
};
--
Gitblit v1.9.3