From cdd325cf78ca5bac74f941a917d8c90f34fa63e6 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 25 八月 2025 10:03:41 +0800
Subject: [PATCH] 11

---
 MES.Service/service/BasicData/MesCustomerManager.cs |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 4fd7e79..772c306 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -115,19 +115,34 @@
     private MesCustomer GetSysDepartment(ErpCustomer customer)
     {
         //ERP鍌宠几鐨勬帴鍙f暩鎿氳綁鎻涚偤MES鏁告摎搴瓧娈�
-
-        return new MesCustomer
+        var fForbidStatus = customer.FForbidStatus;
+        if (customer.FForbidStatus == "0")
         {
-            Id = Convert.ToDecimal(customer.Id),
+            fForbidStatus = "A";
+        }
+        else if (customer.FForbidStatus == "1")
+        {
+            fForbidStatus = "B";
+        }
+
+        var entity = new MesCustomer
+        {
+            Id = string.IsNullOrEmpty(customer.Id)
+                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+                : Convert.ToDecimal(customer.Id),
             CustNo = customer.FNumber,
             CustSname = customer.FShortName,
             CustName = customer.FName,
             Anred = customer.FTContact,
             Telf1 = customer.Fmobilephone,
             Fseller = customer.Fseller,
-            Fforbidstatus = customer.FForbidStatus,
-            FSubsidiary = customer.FUseOrgId,
-            Fumbrella = customer.FCreateOrgId,
+            Fforbidstatus = fForbidStatus,
+            FSubsidiary = string.IsNullOrEmpty(customer.FUseOrgId)
+                ? "1"
+                : customer.FUseOrgId,
+            Fumbrella = string.IsNullOrEmpty(customer.FCreateOrgId)
+                ? "1"
+                : customer.FCreateOrgId,
             CreateDate = DateTime.Now,
             LastupdateDate = DateTime.Now,
             Company = "1000",
@@ -135,6 +150,17 @@
             DataType = customer.FDocumentStatus,
             Type = customer.Type,
         };
+
+        var mesCustomer = Db.Queryable<MesCustomer>()
+            .Where(s => s.CustNo == entity.CustNo)
+            .First();
+
+        if (mesCustomer != null)
+        {
+            entity.Id = mesCustomer.Id;
+        }
+
+        return entity;
     }
 
     private bool UpdateCustomerStatusBatch(SqlSugarScope db,

--
Gitblit v1.9.3