From eb744ecfecc0f1b6d9c0999c65bc740d93e30eda Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 22 一月 2025 13:38:52 +0800
Subject: [PATCH] 新增接口
---
StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs b/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
index 4e78597..13668bc 100644
--- a/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -1,12 +1,8 @@
-锘縰sing AngleSharp.Dom;
-using Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
-using System.Collections.Generic;
-using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
@@ -52,14 +48,12 @@
//var list = customers.Select(GetSysDepartment).ToList();
//鍥犱负U9鐨勬ā寮忥紝浼氬鑷村缁勭粐鐨勫熀纭�鏁版嵁琚鐞嗘垚List<>,鎵�浠ラ渶瑕佷慨鏀规柟娉曪紝SaveLits涓簲璇ユ槸鎶婂崟鏉″鐞嗗嚭鏉ョ殑List鏁版嵁鍔犺捣鏉ワ紝鑰屼笉鏄箣鍓嶇殑鏂规硶澶勭悊銆�
- List<MesCustomer> mes_customers = new List<MesCustomer>();
- foreach (ErpCustomer customer in customers)
+ List<MesCustomer> mes_customers = new();
+ foreach (var customer in customers)
{
var mesCustomerList = GetSysDepartment(customer);
if (mesCustomerList != null)
- {
mes_customers.AddRange(mesCustomerList);
- }
}
var groupBy = mes_customers.GroupBy(s => s.Type)
@@ -71,11 +65,13 @@
switch (customerGroup.Key)
{
case "0":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"A"))
+ if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+ "A"))
throw new NotImplementedException("鍚敤澶辫触");
break;
case "1":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"B"))
+ if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+ "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
case "3":
@@ -133,13 +129,15 @@
var db = SqlSugarHelper.GetInstance();
//var id = db.Insertable(insertObj).ExecuteReturnIdentity();
//鏍规嵁搴忓垪鑾峰彇鏂扮殑MES_ID
-
- List<MesCustomer> customers = new List<MesCustomer>();
- foreach (ErpDetail erpDetail in customer.ErpDetails)
+ List<MesCustomer> customers = new();
+
+ foreach (var erpDetail in customer.ErpDetails)
{
decimal mesId = 0;
- var exists = db.Queryable<MesLinkU9>().Any(u => u.U9Id == customer.Id && u.OrgId == erpDetail.FUseOrgId && u.TableType == "MES_CUSTOMER");
+ var exists = db.Queryable<MesLinkU9>().Any(u =>
+ u.U9Id == customer.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_CUSTOMER");
if (!exists)
{
mesId = GetSeqUtil.GetSeq("U9_MES_ID");
@@ -147,17 +145,19 @@
{
CreateDate = DateTime.Now,
MesId = mesId.ToString(),
- U9Id = customer.Id.ToString(),
- OrgId = erpDetail.FUseOrgId.ToString(),
+ U9Id = customer.Id,
+ OrgId = erpDetail.FUseOrgId,
TableType = "MES_CUSTOMER"
-
};
var insertUser = db.Insertable(entity).ExecuteCommand();
}
else
{
mesId = Convert.ToDecimal(db.Queryable<MesLinkU9>()
- .Where(u => u.U9Id == customer.Id && u.OrgId == erpDetail.FUseOrgId && u.TableType == "MES_CUSTOMER")
+ .Where(u =>
+ u.U9Id == customer.Id &&
+ u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_CUSTOMER")
.Select(u => u.MesId) // 閫夋嫨 MesId 瀛楁
.First());
}
@@ -179,7 +179,7 @@
customers.Add(mesCustomer);
}
-
+
//customers = customer.ErpDetails.Select(ErpDetails => new MesCustomer
//{
// Id = GetSeqUtil.GetSeq("U9_MES_ID"),
@@ -194,7 +194,7 @@
// UseOrg = Convert.ToDecimal(ErpDetails.FUseOrgId),
//}).ToList();
-
+
return customers;
}
@@ -226,31 +226,34 @@
List<MesCustomer> customerList)
{
// 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
- var mesIds = customerList.Select(customer => customer.Id.ToString()).ToList();
+ var mesIds = customerList.Select(customer => customer.Id.ToString())
+ .ToList();
// 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
var u9Ids = db.Queryable<MesLinkU9>()
- .Where(u => mesIds.Contains(u.MesId) && u.TableType == "MES_CUSTOMER")
- .Select(u => u.U9Id)
- .Distinct() // 搴旂敤 Distinct 鍘婚噸
- .ToList();
+ .Where(u =>
+ mesIds.Contains(u.MesId) && u.TableType == "MES_CUSTOMER")
+ .Select(u => u.U9Id)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
// 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
// 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
var idsToDelete = db.Queryable<MesLinkU9>()
- .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_CUSTOMER")
- .Select(u => u.MesId)
- .Distinct() // 搴旂敤 Distinct 鍘婚噸
- .ToList();
+ .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_CUSTOMER")
+ .Select(u => u.MesId)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
//浠ヤ笂鏂规硶鍙互鑰冭檻浼樺寲锛屽皢U9id鎵句釜鏂板缓瀛楁瀛樺湪MES_CUSTOMER涓紝灏卞彲浠ュ皯涓�姝ユ煡璇簡銆�
- var deleteByIds = db.Deleteable<MesCustomer>().In(idsToDelete).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ var deleteByIds = db.Deleteable<MesCustomer>().In(idsToDelete)
+ .ExecuteCommand();
+ // if (deleteByIds > 0)
+ // return true;
+ return true;
+ //throw new NotImplementedException("鍒犻櫎澶辫触");
}
/// <summary>
--
Gitblit v1.9.3