From ed0b898d7f0c05516e83133c8bc5b45e14876a28 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 17 二月 2025 14:43:52 +0800
Subject: [PATCH] 1.采购订单时间调整 2.采购订单接口新增route
---
MES.Service/service/BasicData/MesRohInManager.cs | 34 ++++++++++++++++++++++++++--------
MESApplication/Controllers/BasicData/MesRohInController.cs | 1 +
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 83bf792..d820b54 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -3,6 +3,7 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using System.Globalization;
namespace MES.Service.service.BasicData;
@@ -194,16 +195,21 @@
BusinessClose = s.FMRPCloseStatus,
BusinessFreeze = s.FMRPFreezeStatus,
Freezer = s.FFreezerId,
- FreezeTime = s.FFreezeDate != null
- ? DateTime.ParseExact(s.FFreezeDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
+ //FreezeTime = !string.IsNullOrEmpty(s.FFreezeDate)
+ // && DateTime.TryParseExact(s.FFreezeDate,
+ // new[] { "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd" }, // 鏀寔澶氱鏍煎紡
+ // CultureInfo.InvariantCulture,
+ // DateTimeStyles.None,
+ // out var parsedDate)
+ // && parsedDate > new DateTime(1900, 1, 1)
+ // ? parsedDate
+ // : (DateTime?)null,
BusinessTerminate = s.FMRPTerminateStatus,
Terminator = s.FTerminaterId,
- TerminateTime = s.FTerminateDate != null
- ? DateTime.ParseExact(s.FTerminateDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
+ //TerminateTime = s.FTerminateDate != null
+ // ? DateTime.ParseExact(s.FTerminateDate,
+ // "yyyy-MM-dd HH:mm:ss", null)
+ // : null,
TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //绱鏀舵枡鏁�
RemainingReceivedQty =
Convert.ToDecimal(s.FRemainReceiveQty),
@@ -232,6 +238,18 @@
ReceivingDepartment = s.FReceiveDeptId
};
+ if (s.FFreezeDate != null)
+ if (!s.FFreezerId.IsNullOrEmpty())
+ entity.FreezeTime =
+ DateTime.ParseExact(s.FFreezeDate,
+ "yyyy-MM-dd HH:mm:ss", null);
+
+ if (s.FTerminateDate != null)
+ if (!s.FTerminaterId.IsNullOrEmpty())
+ entity.TerminateTime =
+ DateTime.ParseExact(s.FTerminateDate,
+ "yyyy-MM-dd HH:mm:ss", null);
+
var single = rohInDataManager.GetSingle(it =>
it.EbelnK3id == entity.EbelnK3id);
if (single != null) entity.Guid = single.Guid;
diff --git a/MESApplication/Controllers/BasicData/MesRohInController.cs b/MESApplication/Controllers/BasicData/MesRohInController.cs
index 6e5c8d1..f68d757 100644
--- a/MESApplication/Controllers/BasicData/MesRohInController.cs
+++ b/MESApplication/Controllers/BasicData/MesRohInController.cs
@@ -33,6 +33,7 @@
entity.Data = JsonConvert.SerializeObject(rohIn);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = rohIn.ErpRohIn.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
--
Gitblit v1.9.3