From fb745c842df36edc5101291a7f239c11c97bcc2f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 11 九月 2025 16:46:33 +0800
Subject: [PATCH] 最新代码更新，BST，MES部分
---
项目代码/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs"
index b548127..02e7383 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs"
@@ -39,19 +39,71 @@
try
{
List<Dt_SupplierInfo> OldsupplierInfos = BaseDal.QueryData(x => x.InvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt());
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_SupplierInfo? ExistSupplier = OldsupplierInfos.FirstOrDefault(x => bSTSupplierDTOs.Where(x => x.Way == 1).Select(x => x.VendId).Contains(x.SupplierSourceId));
- if (ExistSupplier != null)
+ //鏂板
+ List<BSTSupplierDTO> bSTSupplierDTOsAdd = bSTSupplierDTOs.Where(x => x.Way == 1).ToList();
+ //淇敼
+ List<BSTSupplierDTO> bSTSupplierDTOsUpdate = bSTSupplierDTOs.Where(x => x.Way == 2).ToList();
+ //鍒犻櫎
+ List<BSTSupplierDTO> bSTSupplierDTOsDTODel = bSTSupplierDTOs.Where(x => x.Way == 3).ToList();
+ List<Dt_SupplierInfo> supplierInfosAdd = new List<Dt_SupplierInfo>();
+ List<Dt_SupplierInfo> supplierInfosUpdate = new List<Dt_SupplierInfo>();
+ //鏂板
+ if (bSTSupplierDTOsAdd.Count > 0)
{
- return content.Error($"鐗╂枡Id{nameof(BSTSupplierDTO.VendId)}:{ExistSupplier.SupplierSourceId}宸插瓨鍦�");
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_SupplierInfo? ExistSupplier = OldsupplierInfos.FirstOrDefault(x => bSTSupplierDTOsAdd.Select(x => x.VendId).Contains(x.SupplierSourceId));
+ if (ExistSupplier != null)
+ {
+ return content.Error($"渚涘簲鍟唟nameof(BSTSupplierDTO.VendId)}:{ExistSupplier.SupplierSourceId}宸插瓨鍦�");
+ }
+
+ foreach (var item in bSTSupplierDTOsAdd)
+ {
+ if (bSTSupplierDTOsUpdate.FirstOrDefault(x => x.VendId == item.VendId) != null)
+ {
+ continue;
+ }
+ Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(item);
+ supplierInfosAdd.Add(supplierInfo);
+ }
}
- List<Dt_SupplierInfo> supplierInfos = new List<Dt_SupplierInfo>();
- foreach (var item in bSTSupplierDTOs)
+ //鏇存柊
+ if (bSTSupplierDTOsUpdate.Count > 0)
{
- Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(item);
- supplierInfos.Add(supplierInfo);
+ //鑾峰彇宸插瓨鍦ㄧ殑鐗╂枡
+ List<Dt_SupplierInfo>? ExistbSTSuppliersUpdate = OldsupplierInfos.Where(x => bSTSupplierDTOsUpdate.Select(x => x.VendId).Contains(x.SupplierSourceId)).ToList();
+ foreach (var item in bSTSupplierDTOsUpdate)
+ {
+ Dt_SupplierInfo? supplierInfoUpdate = ExistbSTSuppliersUpdate.FirstOrDefault(x => x.SupplierSourceId == item.VendId);
+ //濡傛灉鐗╂枡宸插瓨鍦ㄥ垯杩涜鏇存敼
+ if (supplierInfoUpdate != null)
+ {
+ supplierInfoUpdate.SupplierSourceId = item.VendId;
+ supplierInfoUpdate.SupplierCode = item.VendNo;
+ supplierInfoUpdate.SupplierShortName = item.ShortName;
+ supplierInfoUpdate.SupplierName = item.ShortName;
+ supplierInfoUpdate.Contacts = item.BusinessContact;
+ supplierInfoUpdate.ContactNumber = item.Tel;
+ supplierInfoUpdate.ContactAddress = item.Address;
+ supplierInfosUpdate.Add(supplierInfoUpdate);
+ }
+ else//濡傛灉涓嶅瓨鍦ㄥ垯杩涜鏂板
+ {
+ Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(item);
+ supplierInfosAdd.Add(supplierInfo);
+ }
+ }
}
- BaseDal.AddData(supplierInfos);
+ //鍒犻櫎
+ if (bSTSupplierDTOsDTODel.Count > 0)
+ {
+
+ }
+ //鏇存柊鏁版嵁
+ _unitOfWorkManage.CommitTran();
+ BaseDal.AddData(supplierInfosAdd);
+ BaseDal.UpdateData(supplierInfosUpdate);
+ _unitOfWorkManage.CommitTran();
content.OK("鎺ユ敹鎴愬姛");
}
catch (Exception ex)
--
Gitblit v1.9.3