From 74ab9465837f8a6f9eae854059e9783eff24e173 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 14 七月 2025 18:06:24 +0800
Subject: [PATCH] 多组织修改
---
MES.Service/service/BasicData/MesItemsManager.cs | 153 ++++++++++++++++++++++++--------------------------
1 files changed, 73 insertions(+), 80 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 0c878cb..8813567 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,5 +1,5 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -8,6 +8,12 @@
public class MesItemsManager : Repository<MesItems>
{
+ public MesItems GetItemQcPrint(WarehouseQuery query)
+ {
+ return Db.Queryable<MesItems>().Where(c => c.Factory == query.Factory && c.Company == query.Company && c.ItemNo == query.ItemNo).First();
+ }
+
+
public bool Save(ErpItems item)
{
var entity = GetMesItems(item);
@@ -29,7 +35,7 @@
return 1;
break;
case "3":
- if (DeleteItem(db, entity.Id))
+ if (UpdateItemStatus(db, entity.Id, "B"))
return 1;
break;
case "4":
@@ -37,8 +43,7 @@
return 1;
break;
default:
- throw new ArgumentNullException(
- $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ throw new ArgumentNullException($"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
}
throw new NotImplementedException("鎿嶄綔澶辫触");
@@ -48,8 +53,7 @@
public bool SaveList(List<ErpItems> items)
{
var list = items.Select(GetMesItems).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
+ var groupBy = list.GroupBy(s => s.Type).ToDictionary(g => g.Key, g => g.ToList());
return UseTransaction(db =>
{
@@ -69,7 +73,7 @@
throw new NotImplementedException("鎻掑叆澶辫触");
break;
case "3":
- if (!DeleteItemBatch(db, itemGroup.Value))
+ if (!UpdateItemStatusBatch(db, itemGroup.Value, "B"))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "4":
@@ -77,43 +81,61 @@
throw new NotImplementedException("鍚屾澶辫触");
break;
default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+ throw new ArgumentNullException($"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
}
return 1;
}) > 0;
}
- private bool UpdateItemStatus(SqlSugarScope db, decimal itemId,
- string status)
+ private bool UpdateItemStatus(SqlSugarScope db, decimal itemId,string status)
{
- var result = db.Updateable<MesItems>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == itemId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ var result = db.Updateable<MesItems>().SetColumns(s => s.Fforbidstatus == status).Where(s => s.Id == itemId).ExecuteCommand();
+ return true;
}
private bool InsertItem(SqlSugarScope db, MesItems entity)
{
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
+ var exists = db.Queryable<MesItems>().Any(e => e.Id == entity.Id);
+ if (exists)
+ {
+ var result = db.Updateable<MesItems>().ExecuteCommand();
return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+ else
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ {
+ return true;
+ }
+ else
+ {
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+ }
}
- private bool DeleteItem(SqlSugarScope db, decimal itemId)
+ private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
{
- var deleteById = db.Deleteable<MesItems>().In(itemId).ExecuteCommand();
- if (deleteById > 0)
+ var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
+ if (exists)
+ {
+ var update = db.Updateable(entity).ExecuteCommand();
return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+ else
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
}
private MesItems GetMesItems(ErpItems item)
@@ -121,6 +143,7 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
+ ItemId = Convert.ToDecimal(item.Id),
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
@@ -129,7 +152,7 @@
Highlimit = item.FMaxStock,
PrdPack = item.FMinPackCount,
DepotCode = item.FStockId,
- //Ppbom00019124 = item.PPBOM00019124,
+ Ppbom00019124 = item.PPBOM00019124,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
@@ -144,76 +167,46 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
- FSubsidiary = item.FSubsidiary,
- Fumbrella = item.Fumbrella,
- FLOSSPERCENT = item.FLOSSPERCENT ,
- FMnemonicCode = item.FMnemonicCode,
- FExpPeriod = item.FExpPeriod,
- LastupdateDate=DateTime.Now,
- CreateDate=DateTime.Now,
+ CreateOrg = Convert.ToDecimal(item.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(item.FUseOrgId),
+ LossPercent = item.FLOSSPERCENT,
+ MnemonicCode = item.FMnemonicCode,
+ ExpPeriod = item.FExpPeriod,
+ ColorName = item.FColor,
+ CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
}
- private bool UpdateItemStatusBatch(SqlSugarScope db,
- List<MesItems> itemList, string status)
+ private bool UpdateItemStatusBatch(SqlSugarScope db,List<MesItems> itemList, string status)
{
var ids = itemList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesItems>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ var result = db.Updateable<MesItems>().SetColumns(s => s.Fforbidstatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand();
+ return true;
}
private bool InsertItemBatch(SqlSugarScope db, List<MesItems> itemList)
{
- var insertRange = db.Insertable(itemList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemBatch(SqlSugarScope db, List<MesItems> itemList)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
- {
- var exists = db.Queryable<MesItems>().Any(e => e.Id == entity.Id);
- if (exists)
+ foreach (var entity in itemList)
{
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
+ if (!InsertItem(db, entity))
+ {
+ return false;
+ }
}
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
+ return true;
}
private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesItems> itemList)
{
foreach (var entity in itemList)
+ {
if (!InsertOrUpdate(db, entity))
+ {
return false;
-
+ }
+ }
return true;
}
}
\ No newline at end of file
--
Gitblit v1.9.3