From 38339731265cb8ffef7954fb90874036fd46f09d Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:46:11 +0800
Subject: [PATCH] 供应商分数获取调整
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 73 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index d26a2e7..a0d3fb0 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -26,21 +26,21 @@
var freeze = 0;
decimal cSyQty = 0;
- //if (string.IsNullOrEmpty(sectionCode))
- // throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
+ if (string.IsNullOrEmpty(sectionCode))
+ throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
var itemBarcodeDetails = Db.Queryable<MesInvItemBarcodes>()
.Where(it => it.ItemBarcode == itemBarcode)
.First();
- //if (itemBarcodeDetails == null)
- // throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
+ if (itemBarcodeDetails == null)
+ throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
if (string.IsNullOrEmpty(itemBarcodeDetails.Memo) || itemBarcodeDetails.Memo != "閲囪喘鍏ュ簱")
throw new Exception("姝ゆ潯鐮佷笉灞炰簬鍒拌揣鏉＄爜锛屾棤娉曠敤閲囪喘鍏ュ簱锛�");
var inventory = Db.Queryable<MesInvItemArn>()
- .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Status == 1 )
+ .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Fstatus == true )
.First();
if (inventory == null)
@@ -60,6 +60,9 @@
var cgddDetails = Db.Queryable<MesRohInData>()
.Where(it => it.EbelnK3id == inventoryDetails.LineK3id)
.First();
+
+ if (cgddDetails == null)
+ throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲閲囪喘璁㈠崟鏄庣粏锛�");
if (inventoryDetails == null)
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
@@ -87,10 +90,10 @@
MesDepots mesDepost = null;
var checkGuid = UtilityHelper.CheckGuid(depotCode);
- if (checkGuid && depotCode2 != null)
+ if (checkGuid && depotCode != null)
{
mesDepost = Db.Queryable<MesDepots>()
- .Where(s => s.DepotId.ToString() == depotCode2).First();
+ .Where(s => s.DepotId.ToString() == depotCode).First();
// if (depotCode != mesDepost.Guid)
// throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
@@ -100,6 +103,33 @@
throw new Exception("搴撲綅缂栫爜 " + sectionCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
}
+
+ // ========== 鏂板锛氶獙璇佸綋鍓嶅簱浣嶄笌鐗╂枡榛樿搴撲綅鏄惁涓�鑷� ==========
+ // 鑾峰彇鐗╂枡淇℃伅
+ var mesItems = Db.Queryable<MesItems>()
+ .Where(s => s.Id == itemBarcodeDetails.ItemId)
+ .First();
+
+ if (mesItems == null)
+ throw new Exception("鎵句笉鍒板搴旂殑鐗╂枡淇℃伅锛�");
+
+ // 妫�鏌ョ墿鏂欐槸鍚︽湁榛樿搴撲綅璁剧疆
+ if (!string.IsNullOrEmpty(mesItems.DepotCode))
+ {
+ // 鑾峰彇鐗╂枡榛樿搴撲綅瀵瑰簲鐨勪粨搴撲俊鎭�
+ var defaultDepot = Db.Queryable<MesDepots>()
+ .Where(d => d.DepotCode == mesItems.DepotCode)
+ .First();
+
+ if (mesItems.DepotCode != null && mesItems.DepotCode != "0")
+ {
+ // 姣旇緝褰撳墠鎵弿鐨勫簱浣嶆墍灞炰粨搴撶紪鐮佷笌鐗╂枡榛樿浠撳簱缂栫爜鏄惁涓�鑷�
+ if (mesDepost.DepotId?.ToString() != mesItems.DepotCode)
+ {
+ throw new Exception($"褰撳墠搴撲綅鎵�灞炰粨搴揫{mesDepost.DepotId}]涓庣墿鏂欓粯璁や粨搴揫{mesItems.DepotCode}]涓嶄竴鑷达紝璇锋壂鎻忔纭殑搴撲綅锛�");
+ }
+ }
+ }
//num = Db.Queryable<MesInvItemInCDetails>()
// .Where(it => it.ItemBarcode == itemBarcode)
@@ -245,9 +275,7 @@
CreateDate = DateTime.Now,
LastupdateBy = user,
LastupdateDate = DateTime.Now,
- UrgentFlag = itemBarcodeDetails.UrgentFlag.Value
- ? "1"
- : "0",
+ UrgentFlag = itemBarcodeDetails.UrgentFlag.GetValueOrDefault() ? "1" : "0",
CbillNo = itemBarcodeDetails.BillNo,
Fstatus = 0,
Status = 0,
@@ -298,7 +326,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.DepotId == depotCode2 &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.EbelnK3id == detail.EbelnK3id &&
it.LineK3id == detail.LineK3id)
.Count();
@@ -327,7 +355,7 @@
Remark = itemBarcodeDetails.Memo,
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
- DepotId = depotCode2,
+ DepotId = mesDepost.DepotId.ToString(),
itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
@@ -337,7 +365,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.DepotId == depotCode2 &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.EbelnK3id == detail.EbelnK3id &&
it.LineK3id == detail.LineK3id)
.IgnoreColumns(true)
@@ -395,7 +423,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.DepotId == depotCode2 &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.EbelnK3id == detail.EbelnK3id &&
it.LineK3id == detail.LineK3id)
.Count();
@@ -423,7 +451,7 @@
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
ItemId = detail.ItemId,
- DepotId = depotCode2
+ DepotId = mesDepost.DepotId.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
db.Updateable<MesInvItemInCItems>()
@@ -432,7 +460,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.DepotId == depotCode2 &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.EbelnK3id == detail.EbelnK3id &&
it.LineK3id == detail.LineK3id)
.IgnoreColumns(true)
@@ -521,7 +549,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detailone.ItemId &&
- it.DepotId == depotCode2 &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
.Count();
@@ -549,7 +577,7 @@
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
ItemId = itemBarcodeDetails.ItemId,
- DepotId = depotCode2,
+ DepotId = mesDepost.DepotId.ToString(),
itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
@@ -562,7 +590,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detailone.ItemId &&
- it.DepotId == depotCode2 &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
//.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
.ExecuteCommand();
@@ -606,7 +634,7 @@
CheckRes = inventoryDetails.CheckRes,
CheckStates = inventoryDetails.CheckStates,
ReceiveOrgId = inventory.ReceiveOrgId,
- DepotId = Convert.ToInt64(depotCode2)
+ DepotId = Convert.ToInt64(mesDepost.DepotId.ToString())
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆 mes_inv_business2 琛�
@@ -667,7 +695,7 @@
LineK3id = itemBarcodeDetails.LineK3id,
ItemId = itemBarcodeDetails.ItemId,
BillNo = itemBarcodeDetails.BillNo,
- DepotId = Convert.ToInt32(depotCode2),
+ DepotId = Convert.ToInt32(mesDepost.DepotId),
OwnerId = cgddDetails.DemandOrg,
OwnerType = owner_type,
StockOrgId = mesDepost.FSubsidiary,
@@ -789,7 +817,8 @@
FQty = a.Quantity, // 鐢宠鏁伴噺
FMaterialId = b.ItemId,
Id = a.Guid.ToString(),
- kw = a.DepotSectionCode
+ kw = a.DepotSectionCode,
+ barcode = a.ItemBarcode
})
.ToList();
--
Gitblit v1.9.3