From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/service/BasicData/ProductionOrderManager.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index 42349c4..a47432f 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -54,7 +54,7 @@
var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesRohIn.Id);
var insertOrUpdate = db
- .Deleteable<MesRohInData>().In(decimals)
+ .Deleteable<ProductionOrderSub>().In(decimals)
.ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
@@ -75,7 +75,7 @@
var baOrUpdate = _productionOrderSubManager.InsertRange(mesRohInDatas);
if (orUpdate && baOrUpdate)
{
- if ("4".Equals(type))
+ if ("4".Equals(type)||"3".Equals(type)||"2".Equals(type))
{
//璋冪敤瀛樺偍杩囩▼
try
@@ -134,10 +134,10 @@
{
DateTime parsedDate;
- // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss.fff"
+ // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss.fff",
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
CultureInfo.InvariantCulture,
DateTimeStyles.None,
out parsedDate))
@@ -159,9 +159,9 @@
WorkOrderQty = Convert.ToDouble(erpDto.FQty),
PlanningGroup = erpDto.FWorkGroupId,
Planner = erpDto.FPlannerID,
- EstimatedStartTime =
+ PlanStartDate =
ParseDateTime(erpDto.FPlanStartDate) ?? null,
- EstimatedEndTime =
+ PlanFinishDate =
ParseDateTime(erpDto.FPlanFinishDate) ?? null,
StorageUpperLimit = Convert.ToDouble(erpDto.FStockInLimitH),
StorageLowerLimit = Convert.ToDouble(erpDto.FStockInLimitL),
--
Gitblit v1.9.3