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/MesUnitManager.cs | 16 ++++-
MES.Service/service/BasicData/MesStaffManager.cs | 9 +++
MES.Service/service/BasicData/MesCustomerManager.cs | 17 ++++-
MES.Service/service/BasicData/MesSupplierManager.cs | 13 ++++
MES.Service/service/BasicData/MesPositionManager.cs | 16 ++++
MES.Service/service/BasicData/MesDepotsManager.cs | 13 ++++
MES.Service/service/BasicData/MesItemsManager.cs | 41 +++++++++++--
MES.Service/service/BasicData/SysDepartmentManager.cs | 13 ++++
MES.Service/service/BasicData/MesItemTypeManager.cs | 13 ++++
9 files changed, 131 insertions(+), 20 deletions(-)
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 260f7be..772c306 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -125,10 +125,10 @@
fForbidStatus = "B";
}
- return new MesCustomer
+ var entity = new MesCustomer
{
- Id = string.IsNullOrEmpty(customer.Id)
- ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ Id = string.IsNullOrEmpty(customer.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
: Convert.ToDecimal(customer.Id),
CustNo = customer.FNumber,
CustSname = customer.FShortName,
@@ -150,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,
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index d89e904..dc15001 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -89,7 +89,7 @@
// 灏� ErpDepots 瀵硅薄杞崲涓� MesDepots 瀵硅薄鐨勬柟娉�
private MesDepots GetMesDepots(ErpDepots depots)
{
- return new MesDepots
+ var entity = new MesDepots
{
DepotCode = depots.FNumber,
DepotName = depots.FName,
@@ -114,6 +114,17 @@
Company = "1000",
Factory = "1000"
};
+
+ var mesDepots = Db.Queryable<MesDepots>()
+ .Where(s => s.DepotCode == entity.DepotCode)
+ .First();
+
+ if (mesDepots != null)
+ {
+ entity.DepotId = mesDepots.DepotId;
+ }
+
+ return entity;
}
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜浠撳簱璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index 6f74c23..751613d 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -62,7 +62,7 @@
private MesItemType GetMesItemType(ErpItemType department)
{
- return new MesItemType
+ var entity = new MesItemType
{
Id = string.IsNullOrEmpty(department.Id)
? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
@@ -76,6 +76,17 @@
Company = "1000",
Factory = "1000"
};
+
+ var mesItemType = Db.Queryable<MesItemType>()
+ .Where(it => it.Tcode == entity.Tcode)
+ .First();
+
+ if (mesItemType != null)
+ {
+ entity.Id = mesItemType.Id;
+ }
+
+ return entity;
}
public bool SaveList(List<ErpItemType> departments)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 301b4f8..a8933ba 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -113,7 +113,7 @@
private MesItems GetMesItems(ErpItems item)
{
- return new MesItems
+ var entity = new MesItems
{
Id = string.IsNullOrEmpty(item.Id)
? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
@@ -123,15 +123,26 @@
ItemName = item.FName,
ItemModel = item.FSpecification,
ItemUnit = item.FBaseUnitId,
- Lowlimit = !string.IsNullOrEmpty(item.FSafeStock) ? Convert.ToDecimal(item.FSafeStock) : null,
- Highlimit = !string.IsNullOrEmpty(item.FMaxStock) ? Convert.ToDecimal(item.FMaxStock) : null,
- PrdPack = !string.IsNullOrEmpty(item.FMinPackCount) ? Convert.ToDecimal(item.FMinPackCount) : null,
+ Lowlimit = !string.IsNullOrEmpty(item.FSafeStock)
+ ? Convert.ToDecimal(item.FSafeStock)
+ : null,
+ Highlimit = !string.IsNullOrEmpty(item.FMaxStock)
+ ? Convert.ToDecimal(item.FMaxStock)
+ : null,
+ PrdPack = !string.IsNullOrEmpty(item.FMinPackCount)
+ ? Convert.ToDecimal(item.FMinPackCount)
+ : null,
DepotCode = item.FStockId,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
- Ffinishreceiptoverrate = !string.IsNullOrEmpty(item.FFinishReceiptOverRate) ? Convert.ToInt32(item.FFinishReceiptOverRate) : null,
+ Ffinishreceiptoverrate =
+ !string.IsNullOrEmpty(item.FFinishReceiptOverRate)
+ ? Convert.ToInt32(item.FFinishReceiptOverRate)
+ : null,
Fissuetype = item.FIssueType,
- Fisbatchmanage = !string.IsNullOrEmpty(item.FIsBatchManage) ? Convert.ToInt32(item.FIsBatchManage) : null,
+ Fisbatchmanage = !string.IsNullOrEmpty(item.FIsBatchManage)
+ ? Convert.ToInt32(item.FIsBatchManage)
+ : null,
Fpurchaserid = item.FPurchaserId,
Fpurchaseunitid = item.FPurchaseUnitId,
Storeunit = item.FStoreUnitID,
@@ -150,13 +161,27 @@
LossPercent = item.FLOSSPERCENT,
MnemonicCode = item.FMnemonicCode,
ExpPeriod = item.FExpPeriod,
- EItemId = !string.IsNullOrEmpty(item.Id) ? long.Parse(item.Id) : null,
- ItemId = !string.IsNullOrEmpty(item.Id) ? long.Parse(item.Id) : null,
+ EItemId = !string.IsNullOrEmpty(item.Id)
+ ? long.Parse(item.Id)
+ : null,
+ ItemId =
+ !string.IsNullOrEmpty(item.Id) ? long.Parse(item.Id) : null,
LastupdateDate = DateTime.Now,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
+
+ var mesItems = Db.Queryable<MesItems>()
+ .Where(s => s.ItemNo == entity.ItemNo)
+ .First();
+
+ if (mesItems != null)
+ {
+ entity.Id = mesItems.Id;
+ }
+
+ return entity;
}
private bool UpdateItemStatusBatch(SqlSugarScope db,
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index 1a008bb..8d6aa14 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Masuit.Tools;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -80,7 +81,7 @@
// 灏� ErpPosition 瀵硅薄杞崲涓� MesPosition 瀵硅薄鐨勬柟娉�
private MesPosition GetMesPosition(ErpPosition position)
{
- return new MesPosition
+ var entity = new MesPosition
{
Id = string.IsNullOrEmpty(position.Id)
? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
@@ -106,6 +107,17 @@
"yyyy-MM-dd HH:mm:ss", null)
: null,
};
+
+ var mesPosition = Db.Queryable<MesPosition>()
+ .Where(s => s.PositionId == entity.PositionId)
+ .First();
+
+ if (mesPosition != null)
+ {
+ entity.Id = mesPosition.Id;
+ }
+
+ return entity;
}
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜宀椾綅璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index d25ad5e..a0081d3 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -611,6 +611,15 @@
entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate, "yyyy-MM-dd HH:mm:ss", null);
}
+ var mesStaff = Db.Queryable<MesStaff>()
+ .Where(s => s.StaffNo == entity.StaffNo)
+ .First();
+
+ if (mesStaff != null)
+ {
+ entity.Id = mesStaff.Id;
+ }
+
return entity;
}
catch (Exception ex)
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 022fb52..acb391c 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -114,7 +114,7 @@
private MesSupplier GetMesSupplier(ErpSupplier supplier)
{
- return new MesSupplier
+ var entity = new MesSupplier
{
Id = string.IsNullOrEmpty(supplier.Id)
? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
@@ -139,6 +139,17 @@
Company = "1000",
Factory = "1000",
};
+
+ var mesSupplier = Db.Queryable<MesSupplier>()
+ .Where(s => s.SuppNo == entity.SuppNo)
+ .First();
+
+ if (mesSupplier != null)
+ {
+ entity.Id = mesSupplier.Id;
+ }
+
+ return entity;
}
private bool UpdateSupplierStatusBatch(SqlSugarScope db,
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 74f8467..e966f28 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -112,7 +112,6 @@
private MesUnit GetMesUnit(ErpUnit unit)
{
-
var fForbidStatus = unit.FForbidStatus;
if (unit.FForbidStatus == "0")
{
@@ -122,8 +121,8 @@
{
fForbidStatus = "B";
}
-
- return new MesUnit
+
+ var entity = new MesUnit
{
Id = string.IsNullOrEmpty(unit.Id)
? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
@@ -145,6 +144,17 @@
Factory = "1000",
Type = unit.Type
};
+
+ var mesUnit = Db.Queryable<MesUnit>()
+ .Where(s => s.Fnumber == entity.Fnumber)
+ .First();
+
+ if (mesUnit != null)
+ {
+ entity.Id = mesUnit.Id;
+ }
+
+ return entity;
}
private bool UpdateUnitStatusBatch(SqlSugarScope db, List<MesUnit> unitList,
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 25f3b0f..3e6e181 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -108,7 +108,7 @@
fForbidStatus = "B";
}
- return new SysDepartment
+ var entity = new SysDepartment
{
Departmentcode = department.FNumber,
Departmentname = department.FName,
@@ -130,6 +130,17 @@
Company = "1000",
Factory = "1000"
};
+
+ var sysDepartment = Db.Queryable<SysDepartment>()
+ .Where(s => s.Departmentcode == entity.Departmentcode)
+ .First();
+
+ if (sysDepartment != null)
+ {
+ entity.Id = sysDepartment.Id;
+ }
+
+ return entity;
}
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
--
Gitblit v1.9.3