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/SalesOrderManager.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 1992058..08c4e2e 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -37,9 +37,12 @@
// ? 1
// : 0;
case "3":
- return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0; ;//UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;//鍙嶅鏍镐笉鍒犻櫎锛屽仛update銆�
case "2":
case "4":
+ case "5":
return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
? 1
: 0;
@@ -85,6 +88,11 @@
{
//if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
+ if (type == "3" || (mesSalesOrder.DocumentStatus != null && mesSalesOrder.DocumentStatus != "C"))
+ {
+ mesSalesOrder.BillNo = mesSalesOrder.BillNo + "F" + mesSalesOrder.ErpID.ToString();
+ }
+
if (mesSalesOrder.ErpID != null)
db.Deleteable<SalesOrder>()
.Where(s => s.ErpID == mesSalesOrder.ErpID).ExecuteCommand();
@@ -104,7 +112,13 @@
var baOrUpdate = db.Insertable(mesSalesOrderDatas).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 = mesSalesOrder.BillNo, ModuleType = "閿�鍞鍗�" });
+
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -164,17 +178,24 @@
///ChargeId = erpDto.FChargeId, // 浠樻鏂�
///LinkPhone = erpDto.FLinkPhone, // 鑱旂郴鐢佃瘽
CreatorId = erpDto.FCreatorId, // 鍒涘缓浜�
- CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃ユ湡
+ //CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃ユ湡
+ CreateDate = DateTime.TryParse(erpDto.FCreateDate, out var conveyDate)
+ ? (conveyDate <= new DateTime(1900, 1, 1) ? null : conveyDate)
+ : null, // 鍒涘缓鏃ユ湡
ModifierId = erpDto.FModifierId, // 鏈�鍚庝慨鏀逛汉
ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 鏈�鍚庝慨鏀规棩鏈�
ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
CloserId = erpDto.FCloserId, // 鍏抽棴浜�
//CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
- ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // 鍙樻洿鏃ユ湡
+ //ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // 鍙樻洿鏃ユ湡
+ ChangeDate = DateTime.TryParse(erpDto.FChangeDate, out var ChangeDate)
+ ? (ChangeDate <= new DateTime(1900, 1, 1) ? null : ChangeDate)
+ : null, // 鍙樻洿鏃ユ湡
CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
CancellerId = erpDto.FCancellerId, // 浣滃簾浜�
VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
+ SynchronousDate = DateTime.Now
//EntryNote = erpDto.FEntryNote // 澶囨敞
//ParseDateTime() ?? null
//long.Parse()
--
Gitblit v1.9.3