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 |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index ff6b3f2..08c4e2e 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -37,7 +37,9 @@
                 //         ? 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":
@@ -86,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();
@@ -105,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("鎻掑叆鎴栨洿鏂板け璐�");
     }

--
Gitblit v1.9.3