From eb7aabaca44f5be20ad9fa533f130c96a7342a51 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 10 九月 2025 17:39:31 +0800
Subject: [PATCH] 1.生产、委外订单新增单据状态字段 2.反审核单据编号+'F'
---
MES.Service/Modes/Womcaa.cs | 7 +++++++
MES.Service/service/BasicData/MesRohInManager.cs | 12 +++++++++---
MES.Service/Dto/webApi/ErpCAA.cs | 2 ++
MES.Service/Dto/webApi/ErpProductionOrderDto.cs | 2 ++
MES.Service/Modes/ProductionOrder.cs | 6 ++++++
MES.Service/service/WomcaaManager.cs | 4 +++-
MES.Service/service/BasicData/SalesOrderManager.cs | 5 +++++
MES.Service/service/BasicData/ProductionOrderManager.cs | 3 +++
8 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 5851070..ec54331 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -46,4 +46,6 @@
public string? Btbz { get; set; }
public string? TypeA { get; set; }
+
+ public string? FDocumentStatus { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
index 8121ae0..df19ef6 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -46,5 +46,7 @@
public string? SrcSplitSeq { get; set; } //婧愭媶鍒嗚鍗曡鍙�
public string? TypeA { get; set; } //鍗曟嵁鐘舵��
+ public string? FDocumentStatus { get; set; }
+
// public string? FSUPPLIERID { get; set; } // 渚涘簲鍟咺D
}
\ No newline at end of file
diff --git a/MES.Service/Modes/ProductionOrder.cs b/MES.Service/Modes/ProductionOrder.cs
index 8217687..7869c6c 100644
--- a/MES.Service/Modes/ProductionOrder.cs
+++ b/MES.Service/Modes/ProductionOrder.cs
@@ -351,4 +351,10 @@
/// </summary>
[SugarColumn(ColumnName = "TYPEA")]
public string? Typea { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index d5f7e5f..afc4714 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -426,4 +426,11 @@
/// </summary>
[SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
public DateTime? SynchronousDate { get; set; }
+
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index a9de51d..6c318d5 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -24,11 +24,11 @@
return rohInErpRohIn.Type switch
{
"2" or "4" or "5" => SaveOrUpdateData(db, mesRohIn,
- mesRohInDatas)
+ mesRohInDatas, rohInErpRohIn.Type)
? 1
: 0,
"3" => SaveOrUpdateData(db, mesRohIn,
- mesRohInDatas)
+ mesRohInDatas, rohInErpRohIn.Type)
? 1
: 0, //UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0,//鍙嶅鏍镐笉鍒犻櫎锛屽仛update銆�
_ => throw new NotImplementedException(
@@ -59,8 +59,14 @@
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn,
- List<MesRohInData> mesRohInDatas)
+ List<MesRohInData> mesRohInDatas, string type)
{
+
+ if (type == "3")
+ {
+ mesRohIn.BillNo = mesRohIn.BillNo + "F";
+ }
+
if (mesRohIn.Guid != null)
db.Deleteable<MesRohIn>().Where(s => s.Guid == mesRohIn.Guid)
.ExecuteCommand();
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index d07e188..de814af 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -77,6 +77,7 @@
if(type == "3")
{
mesRohIn.Typea = "3"; // 鏂板瀛楁璧嬪��
+ mesRohIn.OrderNo = mesRohIn.OrderNo + "F";
}
if (StringUtil.CheckGuid(mesRohIn.Guid))
@@ -173,6 +174,8 @@
ReqSrc = erpDto.FReqSrc,
SrcSplitSeq = erpDto.SrcSplitSeq,
Typea = erpDto.TypeA,
+ DocumentStatus = erpDto.FDocumentStatus
+
};
var single = base.GetSingle(it => it.ErpProductionEntryCode == erpDto.FSUBENTRYID);
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 1358bad..24023ab 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -88,6 +88,11 @@
{
//if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
+ if (type == "3")
+ {
+ mesSalesOrder.BillNo = mesSalesOrder.BillNo + "F";
+ }
+
if (mesSalesOrder.ErpID != null)
db.Deleteable<SalesOrder>()
.Where(s => s.ErpID == mesSalesOrder.ErpID).ExecuteCommand();
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 970982a..062a5f3 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -57,6 +57,7 @@
if(type == "3")
{
mesWomcaa.Typea = "3"; // 鏂板瀛楁璧嬪��
+ mesWomcaa.Caa001 = mesWomcaa.Caa001 + "F";
}
@@ -177,7 +178,8 @@
Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
//Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
- SynchronousDate = DateTime.Now
+ SynchronousDate = DateTime.Now,
+ DocumentStatus = dto.FDocumentStatus
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
--
Gitblit v1.9.3