From 015fdf74f2072de8c1776818721cff861ae6e5f3 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 15 九月 2025 16:39:50 +0800
Subject: [PATCH] 修改委外订单
---
MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs | 2 +-
MES.Service/service/BasicData/ProductionOrderManager.cs | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
index 8e0b94d..3f2a28c 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
@@ -4,7 +4,7 @@
{
public string? FBILLNO { get; set; } // 搴忓彿
public string? FSEQ { get; set; } // 搴忓彿
- public string? FMaterialID2 { get; set; } // 瀛愰」鐗╂枡缂栫爜
+ public string? FMaterialID { get; set; } // 瀛愰」鐗╂枡缂栫爜
public string? FMustQty { get; set; } // 闇�棰嗙敤閲�
public string? FPickedQty { get; set; } // 宸查鐢ㄩ噺
public string? FPositionNO { get; set; } // 浣嶇疆鍙�
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index 28b494d..c0e86fc 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -107,7 +107,15 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss.fff"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss.fff",
+
+ string[] formats = new string[]
+ {
+ "yyyy-MM-dd HH:mm:ss.fff",
+ "yyyy-MM-dd HH:mm:ss",
+ "yyyy-MM-dd"
+ };
+
+ if (DateTime.TryParseExact(dateStr, formats,
CultureInfo.InvariantCulture,
DateTimeStyles.None,
out parsedDate))
@@ -183,7 +191,7 @@
var productionOrderSub = new ProductionOrderSub
{
SequenceNo = Convert.ToInt32(erpDto.FSEQ),
- MaterialCode = erpDto.FMaterialID2,
+ MaterialCode = erpDto.FMaterialID,
RequiredQty = Convert.ToDecimal(erpDto.FMustQty),
IssuedQty = Convert.ToDecimal(erpDto.FPickedQty),
LocationNo = erpDto.FPositionNO,
--
Gitblit v1.9.3