From 7b84eb64d11b12b6fb41ae7f7085452512ad5d3f Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 20 六月 2025 08:18:08 +0800
Subject: [PATCH] 1.采购入库优化
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 279 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 177 insertions(+), 102 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index fb5e185..648e17b 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -2,9 +2,12 @@
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.util;
using Newtonsoft.Json;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -12,7 +15,7 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- public PurchaseInventory SaveBarCodes(WarehouseQuery entity)
+ public ItemInBaseModel SaveBarCodes(WarehouseQuery entity)
{
string functionName = "閲囪喘鍏ュ簱", fieldName = null, inFieldVal = null;
string user = entity.userName,
@@ -33,15 +36,15 @@
if (itemBarcodeDetails == null)
throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
- if (itemBarcodeDetails.ComeFlg == 0)
+ if (string.IsNullOrEmpty(itemBarcodeDetails.Memo) || itemBarcodeDetails.Memo != "閲囪喘鍏ュ簱")
throw new Exception("姝ゆ潯鐮佷笉灞炰簬鍒拌揣鏉＄爜锛屾棤娉曠敤閲囪喘鍏ュ簱锛�");
var inventory = Db.Queryable<MesInvItemArn>()
- .Where(it => it.BillNo == itemBarcodeDetails.BillNo)
+ .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Fstatus == true )
.First();
if (inventory == null)
- throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曪紒");
+ throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟垨鏈鏍革紒");
// var inventoryDetails = Db.Queryable<MesInvItemArnDetail>()
// .Where(it => it.ParentGuid == inventory.Guid
@@ -61,6 +64,16 @@
if (inventoryDetails == null)
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
+ //鑾峰彇鍒拌揣妫�楠屾槑缁�
+ var sqlParams = new List<SugarParameter> { new("@dhmxGuid", itemBarcodeDetails.AboutGuid) };
+ var sql1 = @"SELECT *FROM v_dhmx WHERE dhmxGuid = @dhmxGuid ";
+ var dhjymx = Db.Ado.SqlQuery<vDhmx>(sql1, sqlParams).First();
+ //鍒ゅ畾妫�楠岃兘鍚﹀叆搴�
+ if (dhjymx.CanStore!= 1)
+ {
+ throw new Exception($"璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠岀粨鏋�:銆恵dhjymx.InspectionResult}銆�,鍒ゅ畾缁撴灉锛氥�恵dhjymx.JudgmentResult}銆戯紝澶勭悊鎰忚锛氥�恵dhjymx.HandlingSuggestion}銆�,鏃犳硶鍏ュ簱");
+ }
+
var depotCode = Db.Queryable<MesDepotSections>()
.Where(it => it.DepotSectionCode == sectionCode)
.Select(it => it.DepotGuid)
@@ -74,10 +87,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("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
@@ -88,90 +101,111 @@
}
- num = Db.Queryable<MesInvItemInCDetails>()
- .Where(it => it.ItemBarcode == itemBarcode)
- .Count();
+ //num = Db.Queryable<MesInvItemInCDetails>()
+ // .Where(it => it.ItemBarcode == itemBarcode)
+ // .Count();
- if (num > 0)
- throw new Exception("姝ゆ潯鐮佸凡鎵爜鍏ュ簱瀹屾垚锛岃鏍稿锛�");
+ //if (num > 0)
+ // throw new Exception("姝ゆ潯鐮佸凡鎵爜鍏ュ簱瀹屾垚锛岃鏍稿锛�");
- num = Db.Queryable<MesInvItemStocks>()
- .Where(it => it.ItemBarcode == itemBarcode)
- .Count();
+ //num = Db.Queryable<MesInvItemStocks>()
+ // .Where(it => it.ItemBarcode == itemBarcode)
+ // .Count();
- if (num > 0)
- throw new Exception("姝ゆ潯鐮佸凡鎵爜鍏ュ簱锛岃鏍稿锛�");
+ //if (num > 0)
+ // throw new Exception("姝ゆ潯鐮佸凡鎵爜鍏ュ簱锛岃鏍稿锛�");
- num = Db.Queryable<MesInvItemArn>()
- .Where(a => a.BillNo == itemBarcodeDetails.BillNo)
- .InnerJoin<MesInvItemArnDetail>((a, b) =>
- b.ParentGuid == a.Guid &&
- b.ItemId == itemBarcodeDetails.ItemId && b.Ischeck == 1)
- .Count();
+ var wmsManager = new WmsBaseMangeer();
+ // 鏂板鍏ュ簱鏍￠獙锛堣皟鐢ㄥ瓨鍌ㄨ繃绋嬶級
+ var checkResult = wmsManager.pdaInvJY(
+ db: Db,
+ edtUserNo: entity.userName,
+ barcode: entity.barcode,
+ sectionCode: sectionCode,
+ stockId: mesDepost.DepotId.ToString(),
+ stockOrgId: mesDepost.FSubsidiary,
+ billNo: "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
+ transactionNo: "101" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
+ );
- num2 = Db.Queryable<MesInvItemArn>()
- .Where(a => a.BillNo == itemBarcodeDetails.BillNo)
- .InnerJoin<MesInvItemArnDetail>((a, b) => b.ParentGuid == a.Guid
- && b.ItemId == itemBarcodeDetails.ItemId
- && (b.CheckRes == "鍚堟牸" || b.CheckStates == "鐗归噰鐩存帴浣跨敤"))
- .Count();
+ if (Convert.ToInt32(checkResult.result) < 1)
+ throw new Exception($"鍏ュ簱鏍￠獙澶辫触锛歿checkResult.strMsg}");
- switch (num)
- {
- case 0 when num2 == 0:
- case > 0 when num2 == 0:
- freeze = 1;
- break;
- case 0 when num2 > 0:
- throw new Exception("鍏ュ簱澶辫触,鍒拌揣鍗曟嵁鏈夐棶棰橈紒");
- }
- var owner_type = "";
- if (Db.Queryable<SysOrganization>().Any(x => x.Fid == cgddDetails.DemandOrg))
- {
- owner_type = "BD_OwnerOrg";
- }
- else
- {
- // 绗簩灞傚垽鏂細妫�鏌� MES_CUSTOMER
- if (Db.Queryable<MesCustomer>().Any(x => x.Id == Convert.ToInt32(cgddDetails.DemandOrg)))
- {
- owner_type = "BD_Customer";
- }
- else
- {
- // 绗笁灞傚垽鏂細妫�鏌� MES_SUPPLIER
- if (Db.Queryable<MesSupplier>().Any(x => x.Id == Convert.ToInt32(cgddDetails.DemandOrg)))
- {
- owner_type = "BD_Supplier";
- }
- else
- {
- // 绗洓灞傚垽鏂細鍐嶆妫�鏌� SYS_ORGANIZATION
- if (Db.Queryable<SysOrganization>().Any(x => x.Fid == cgddDetails.ReceivingOrg))
- {
- owner_type = "BD_OwnerOrg";
- }
- else
- {
- throw new Exception("鍏ュ簱澶辫触,鍒拌揣鍗曟嵁瀵瑰簲鐨勯渶姹傜粍缁囨湁闂锛�");
- }
- }
- }
- }
+ //num = Db.Queryable<MesInvItemArn>()
+ // .Where(a => a.BillNo == itemBarcodeDetails.BillNo)
+ // .InnerJoin<MesInvItemArnDetail>((a, b) =>
+ // b.ParentGuid == a.Guid &&
+ // b.ItemId == itemBarcodeDetails.ItemId && b.Ischeck == 1)
+ // .Count();
- var result = new PurchaseInventory();
+ //num2 = Db.Queryable<MesInvItemArn>()
+ // .Where(a => a.BillNo == itemBarcodeDetails.BillNo)
+ // .InnerJoin<MesInvItemArnDetail>((a, b) => b.ParentGuid == a.Guid
+ // && b.ItemId == itemBarcodeDetails.ItemId
+ // && (b.CheckRes == "鍚堟牸" || b.CheckStates == "鐗归噰鐩存帴浣跨敤"))
+ // .Count();
+
+ //switch (num)
+ //{
+ // case 0 when num2 == 0:
+ // case > 0 when num2 == 0:
+ // freeze = 1;
+ // break;
+ // case 0 when num2 > 0:
+ // throw new Exception("鍏ュ簱澶辫触,鍒拌揣鍗曟嵁鏈夐棶棰橈紒");
+ //}
+
+
+ // 鍒ゆ柇璐т富绫诲瀷
+ var owner_type = wmsManager.GetOwnerType(cgddDetails.DemandOrg);
+ // if (Db.Queryable<SysOrganization>().Any(x => x.Fid == cgddDetails.DemandOrg))
+ // {
+ // owner_type = "BD_OwnerOrg";
+ // }
+ // else
+ // {
+ // // 绗簩灞傚垽鏂細妫�鏌� MES_CUSTOMER
+ // if (Db.Queryable<MesCustomer>().Any(x => x.Id == Convert.ToInt32(cgddDetails.DemandOrg)))
+ // {
+ // owner_type = "BD_Customer";
+ // }
+ // else
+ // {
+ // // 绗笁灞傚垽鏂細妫�鏌� MES_SUPPLIER
+ // if (Db.Queryable<MesSupplier>().Any(x => x.Id == Convert.ToInt32(cgddDetails.DemandOrg)))
+ // {
+ // owner_type = "BD_Supplier";
+ // }
+ // else
+ // {
+
+ // // 绗洓灞傚垽鏂細鍐嶆妫�鏌� SYS_ORGANIZATION
+ // if (Db.Queryable<SysOrganization>().Any(x => x.Fid == cgddDetails.ReceivingOrg))
+ // {
+ // owner_type = "BD_OwnerOrg";
+ // }
+ // else
+ // {
+ // throw new Exception("鍏ュ簱澶辫触,鍒拌揣鍗曟嵁瀵瑰簲鐨勯渶姹傜粍缁囨湁闂锛�");
+ // }
+ // }
+ // }
+ //}
+
+ var result = new ItemInBaseModel();
UseTransaction(db =>
{
var existingRecord = db.Queryable<MesInvItemIns>()
.Where(it => it.InsDate.Value.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")
+ && it.TaskNo == itemBarcodeDetails.BillNo
&& it.Status == 0
&& it.TransctionNo == transactionNo
+ && it.CreateBy == entity.userName
&& it.BillTypeId == billTypeId
- && it.TaskNo == itemBarcodeDetails.BillNo
- && it.DepotsCode == mesDepost.DepotCode)
+ && it.DepotsId == mesDepost.DepotId)
.Select(it => new
{
it.Guid,
@@ -488,8 +522,7 @@
it.ItemInId == cId &&
it.ItemId == detailone.ItemId &&
it.DepotId == depotCode2 &&
- it.EbelnK3id == detailone.EbelnK3id &&
- it.LineK3id == detailone.LineK3id)
+ it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
.Count();
if (existingCount == 0)
@@ -527,11 +560,10 @@
Quantity = SqlFunc.IsNull(it.Quantity, 0) + itemBarcodeDetails.Quantity // 纭繚 Quantity 涓嶄负 null
})
.Where(it =>
- it.ItemInId == cId &&
- it.ItemId == detailone.ItemId &&
- it.DepotId == depotCode2 &&
- it.EbelnK3id == detailone.EbelnK3id &&
- it.LineK3id == detailone.LineK3id)
+ it.ItemInId == cId &&
+ it.ItemId == detailone.ItemId &&
+ it.DepotId == depotCode2 &&
+ it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
//.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
.ExecuteCommand();
@@ -646,18 +678,19 @@
if (itemBarcodeDetails.Hbdy != 1)
{
+ //鏇存柊鏀舵枡鍗曟槑缁�
db.Updateable<MesInvItemArnDetail>()
.SetColumns(d => new MesInvItemArnDetail
{
OkRkqty = (int)((d.OkRkqty ?? 0) + cSyQty)
})
- .Where(d => d.Guid == inventoryDetails.Guid)
+ .Where(d => d.Guid == itemBarcodeDetails.AboutGuid)
.ExecuteCommand();
var first = db
.Queryable<MesInvItemArnDetail>()
.Where(b =>
- b.Guid == inventoryDetails.Guid)
+ b.Guid == itemBarcodeDetails.AboutGuid)
.Select(b => new
{
TotalQuantity =
@@ -672,7 +705,7 @@
if (TotalQuantity == TotalOkRkQty)
db.Updateable<MesInvItemArnDetail>()
.SetColumns(s => s.IsdepsIn == true)
- .Where(s => s.Guid == inventoryDetails.Guid)
+ .Where(s => s.Guid == itemBarcodeDetails.AboutGuid)
.ExecuteCommand();
@@ -695,9 +728,9 @@
.ExecuteCommand();
var totalCDetailsQuantity = db.Queryable<MesInvItemInCDetails>()
- .Where(it => it.WorkLine == itemBarcodeDetails.WorkLine &&
+ .Where(it => it.ItemId == itemBarcodeDetails.ItemId &&
it.WorkNo == itemBarcodeDetails.WorkNo &&
- it.CbillNo == itemBarcodeDetails.BillNo)
+ it.ItemInId == cId)
.Sum(it => it.Quantity);
var detailSummary = db.Queryable<MesInvItemArnDetail>()
@@ -719,12 +752,51 @@
var mesItems = db.Queryable<MesItems>()
.Where(s => s.Id == itemBarcodeDetails.ItemId).First();
- result.Message =
- $"鏉＄爜鏁伴噺 {itemBarcodeDetails.Quantity},閲囪喘璁㈠崟 {itemBarcodeDetails.WorkNo} 椤规 {itemBarcodeDetails.WorkLine} 鐗╂枡 {mesItems.ItemNo} 鏈鍏ュ簱鎬绘暟锛歿totalCDetailsQuantity} 鎬诲埌 {comeQty} 宸插叆 {invQty} 娆� {diffQty}";
+ //result.Message =
+ // $"鏉＄爜鏁伴噺 {itemBarcodeDetails.Quantity},閲囪喘璁㈠崟 {itemBarcodeDetails.WorkNo} 椤规 {itemBarcodeDetails.WorkLine} 鐗╂枡 {mesItems.ItemNo} 鏈鍏ュ簱鎬绘暟锛歿totalCDetailsQuantity} 鎬诲埌 {comeQty} 宸插叆 {invQty} 娆� {diffQty}";
+ result.Message = $"鐗╂枡{mesItems.ItemNo}鍏ュ簱鎴愬姛鏁伴噺{itemBarcodeDetails.Quantity.ToString()}";
+
+ result.itemDetail = mesItems;
+
+ result.ItemInDetails = db.Queryable<MesInvItemInCItems,MesItems>(
+ (a, b) => new JoinQueryInfos(
+ JoinType.Left,
+ a.ItemId == b.ItemId)
+ )
+ .Where(a => a.ItemInId == cId && a.ItemId == itemBarcodeDetails.ItemId)
+ .Select<dynamic>((a, b) => new
+ {
+ ItemNo = b.ItemNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
+ FQty = a.Quantity, // 鐢宠鏁伴噺
+ FMaterialId = b.ItemId,
+ Id = b.Guid.ToString()
+ })
+ .ToList();
+
+ result.ItemBarCDetails = db.Queryable<MesInvItemInCDetails, MesItems>(
+ (a, b) => new JoinQueryInfos(
+ JoinType.Left,
+ a.ItemId == b.ItemId)
+ )
+ .Where(a => a.ItemInId == cId && a.ItemId == itemBarcodeDetails.ItemId)
+ .Select<dynamic>((a, b) => new
+ {
+ ItemNo = b.ItemNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
+ FQty = a.Quantity, // 鐢宠鏁伴噺
+ FMaterialId = b.ItemId,
+ Id = a.Guid.ToString(),
+ kw = a.DepotSectionCode,
+ barcode = a.ItemBarcode
+ })
+ .ToList();
- result.ItemNo = mesItems.ItemNo;
- result.SumQuantity = Convert.ToDecimal(totalCDetailsQuantity);
+ //result.ItemNo = mesItems.ItemNo;
+ result.SumQuantity = Convert.ToDecimal(invQty);
return 1;
}
@@ -751,14 +823,12 @@
// Step 2: Calculate total sum from `mes_inv_item_in_c_details`
var totalCDetailsQuantity = db.Queryable<MesInvItemInCDetails>()
- .Where(it => it.CbillNo == itemBarcodeDetails.BillNo &&
- it.ItemId == itemBarcodeDetails.ItemId)
+ .Where(it => it.Guid == itemBarcodeDetails.AboutGuid)
.Sum(it => it.Quantity);
// Step 3: Calculate comeQty and invQty from `mes_inv_item_arn_detail`
var detailSummary = db.Queryable<MesInvItemArnDetail>()
- .Where(it => it.CbillNo == itemBarcodeDetails.BillNo &&
- it.ItemId == itemBarcodeDetails.ItemId)
+ .Where(it => it.Guid == itemBarcodeDetails.AboutGuid)
.Select(it => new
{
TotalComeQty = SqlFunc.AggregateSum(it.Quantity),
@@ -781,7 +851,7 @@
$" 鏉＄爜鏁伴噺:{itemBarcodeDetails.Quantity},鐗╂枡 {mesItems.ItemNo} 鏈鍏ュ簱鎬绘暟锛歿totalCDetailsQuantity} 鎬诲埌 {comeQty} 宸插叆 {invQty} 娆� {diffQty}";
- result.ItemNo = mesItems.ItemNo;
+ //result.ItemNo = mesItems.ItemNo;
result.SumQuantity = Convert.ToDecimal(totalCDetailsQuantity);
}
@@ -791,25 +861,30 @@
if (mesInvItemInCDetails == null)
throw new Exception("鐗╂枡鍏ュ簱鏉＄爜鏄庣粏涓嶅瓨鍦�"); // 鎶涘嚭寮傚父浠ヤ緵鍓嶅彴澶勭悊
+ // 鍒涘缓 鎻掑叆鏃ュ織
+ var logService = new LogService();
+ var LogMsg = "銆怭DA銆戦噰璐叆搴撱�傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" + cBillNo + "銆�";
+ logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "MES_INV_ITEM_ARN", LogMsg, inventory.BillNo);
+
return 1;
});
var purchaseInventory = getPurchaseInventory(entity);
- result.ItemIns = purchaseInventory.ItemIns;
- result.ItemInDetails = purchaseInventory.ItemInDetails;
- result.InvItemInCDetails = purchaseInventory.InvItemInCDetails;
+
+ //result.ItemInDetails = purchaseInventory.ItemInDetails;
+ //result.InvItemInCDetails = purchaseInventory.InvItemInCDetails;
return result;
}
- public PurchaseInventory getPurchaseInventory(WarehouseQuery query)
+ public ItemInBaseModel getPurchaseInventory(WarehouseQuery query)
{
- return new PurchaseInventory
+ return new ItemInBaseModel
{
- ItemIns = GetInvItemInsList(query).Items[0],
- ItemInDetails = GetItemInDetails(query.id),
- InvItemInCDetails = GetInvItemInCDetails(query.id)
+ //ItemIns = GetInvItemInsList(query).Items[0],
+ //ItemInDetails = GetItemInDetails(query.id),
+ //InvItemInCDetails = GetInvItemInCDetails(query.id)
};
}
--
Gitblit v1.9.3