From 0ac65b10a59bcca5b22bcf03086c8aaa36a8a525 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 12 六月 2025 20:42:41 +0800
Subject: [PATCH] 1，签收送货单接口，添加签收人；2.来料检接口，添加到货时间字段
---
StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs b/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
index dcdcfd9..630e658 100644
--- a/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -33,12 +33,13 @@
throw new NotImplementedException("鎿嶄綔澶辫触");
}) > 0;
}
-
+
private bool InsertItemType(SqlSugarScope db, List<MesItemType> entity)
{
DeleteItemType(entity);
- var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
+ var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull()
+ .ExecuteCommand();
return insert > 0;
}
@@ -47,7 +48,7 @@
// 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
var ids = supplierId.Select(customer => customer.Id.ToString())
.ToList();
-
+
// 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
var u9Ids = Db.Queryable<MesLinkU9>()
.Where(u =>
@@ -59,11 +60,12 @@
// 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
// 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
var idsToDelete = Db.Queryable<MesLinkU9>()
- .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_ITEM_TYPE")
+ .Where(u =>
+ u9Ids.Contains(u.U9Id) && u.TableType == "MES_ITEM_TYPE")
.Select(u => u.MesId)
.Distinct() // 搴旂敤 Distinct 鍘婚噸
.ToList();
-
+
var deleteByIds = Db.Deleteable<MesItemType>().In(idsToDelete)
.ExecuteCommand();
// if (deleteByIds > 0)
@@ -74,9 +76,8 @@
private List<MesItemType> GetMesItemType(ErpItemType department)
{
-
List<MesItemType> list = new();
-
+
foreach (var erpDetail in department.FUseOrgId)
{
var exists = Db.Queryable<MesLinkU9>().Any(u =>
@@ -89,7 +90,8 @@
//鑾峰彇mesid
mesId = Convert.ToDecimal(Db.Queryable<MesLinkU9>()
.Where(u =>
- u.U9Id == department.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.U9Id == department.Id &&
+ u.OrgId == erpDetail.FUseOrgId &&
u.TableType == "MES_ITEM_TYPE")
.Select(u => u.MesId) // 閫夋嫨 MesId 瀛楁
.First());
@@ -107,7 +109,7 @@
};
Db.Insertable(entity).ExecuteCommand();
}
-
+
var mesItemType = new MesItemType
{
Id = mesId,
@@ -117,11 +119,12 @@
Unit = department.Unit,
ForbidStatus = department.FForbidStatus,
IqcType = department.IqcType,
+ UseOrgId = erpDetail.FUseOrgId,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
-
+
list.Add(mesItemType);
}
--
Gitblit v1.9.3