From 1cd4e66b490e4b6cc3368771cdff164990e152e7 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 17:35:57 +0800
Subject: [PATCH] 接口增加单位换算,dab增加两个字段
---
MES.Service/service/BasicData/ProductionOrderManager.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index d07e188..c0e43e8 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -74,9 +74,10 @@
private bool SaveOrUpdateData(SqlSugarScope db, ProductionOrder mesRohIn,
List<ProductionOrderSub> mesRohInDatas, string type)
{
- if(type == "3")
+ if(type == "3" || (mesRohIn.DocumentStatus != null && mesRohIn.DocumentStatus != "C"))
{
mesRohIn.Typea = "3"; // 鏂板瀛楁璧嬪��
+ mesRohIn.OrderNo = mesRohIn.OrderNo + "F" + mesRohIn.ErpProductionEntryCode;
}
if (StringUtil.CheckGuid(mesRohIn.Guid))
@@ -95,9 +96,14 @@
var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
-
- if (orUpdate && baOrUpdate) return true;
+ if (orUpdate && baOrUpdate)
+ {
+ db.Ado.ExecuteCommand("exec [dbo].[prc_unit_check] @billno, @ModuleType",
+ new { billno = mesRohIn.OrderNo, ModuleType = "濮斿宸ュ崟" });
+
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -173,10 +179,18 @@
ReqSrc = erpDto.FReqSrc,
SrcSplitSeq = erpDto.SrcSplitSeq,
Typea = erpDto.TypeA,
+ DocumentStatus = erpDto.FDocumentStatus
+
};
var single = base.GetSingle(it => it.ErpProductionEntryCode == erpDto.FSUBENTRYID);
- if (single != null) productionOrder.Guid = single.Guid;
+ if (single != null)
+ {
+ productionOrder.Guid = single.Guid;
+ productionOrder.AuditDate = single.AuditDate;
+ productionOrder.AuditStatus = single.AuditStatus;
+ productionOrder.Auditor = single.Auditor;
+ }
return productionOrder;
}
--
Gitblit v1.9.3