From 17a83d6932d17686e65b563e339716cbcf7a5b4c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 26 三月 2025 16:23:26 +0800
Subject: [PATCH] 1.ipqc后台 2.新增样本已录入数 3.来料检优化
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 273 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 162 insertions(+), 111 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 38c9d9a..fb5e185 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -1,4 +1,5 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰sing Masuit.Tools.Models;
+using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
@@ -17,9 +18,9 @@
string user = entity.userName,
sectionCode = entity.sectionCode,
itemBarcode = entity.barcode;
- string transactionNo = "101";
+ var transactionNo = "101";
int? billTypeId = 100, num = 0, num2 = 0;
- int freeze = 0;
+ var freeze = 0;
decimal cSyQty = 0;
if (string.IsNullOrEmpty(sectionCode))
@@ -32,7 +33,7 @@
if (itemBarcodeDetails == null)
throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
- if (!itemBarcodeDetails.ComeFlg.Value)
+ if (itemBarcodeDetails.ComeFlg == 0)
throw new Exception("姝ゆ潯鐮佷笉灞炰簬鍒拌揣鏉＄爜锛屾棤娉曠敤閲囪喘鍏ュ簱锛�");
var inventory = Db.Queryable<MesInvItemArn>()
@@ -42,11 +43,19 @@
if (inventory == null)
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曪紒");
+ // var inventoryDetails = Db.Queryable<MesInvItemArnDetail>()
+ // .Where(it => it.ParentGuid == inventory.Guid
+ // && it.ItemId == itemBarcodeDetails.ItemId
+ // && it.EbelnLine == itemBarcodeDetails.WorkLine
+ // && it.Ebeln == itemBarcodeDetails.WorkNo)
+ // .First();
+
var inventoryDetails = Db.Queryable<MesInvItemArnDetail>()
- .Where(it => it.ParentGuid == inventory.Guid
- && it.ItemId == itemBarcodeDetails.ItemId
- && it.EbelnLine == itemBarcodeDetails.WorkLine
- && it.Ebeln == itemBarcodeDetails.WorkNo)
+ .Where(it => it.Guid == itemBarcodeDetails.AboutGuid)
+ .First();
+
+ var cgddDetails = Db.Queryable<MesRohInData>()
+ .Where(it => it.EbelnK3id == inventoryDetails.LineK3id)
.First();
if (inventoryDetails == null)
@@ -70,8 +79,8 @@
mesDepost = Db.Queryable<MesDepots>()
.Where(s => s.DepotId.ToString() == depotCode2).First();
- if (depotCode != mesDepost.Guid)
- throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
+ // if (depotCode != mesDepost.Guid)
+ // throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
}
else
{
@@ -117,15 +126,51 @@
throw new Exception("鍏ュ簱澶辫触,鍒拌揣鍗曟嵁鏈夐棶棰橈紒");
}
- PurchaseInventory result = new PurchaseInventory();
+ 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("鍏ュ簱澶辫触,鍒拌揣鍗曟嵁瀵瑰簲鐨勯渶姹傜粍缁囨湁闂锛�");
+ }
+ }
+ }
+ }
+
+ var result = new PurchaseInventory();
UseTransaction(db =>
{
var existingRecord = db.Queryable<MesInvItemIns>()
- .Where(it => it.InsDate.Value.Date == DateTime.Now.Date
+ .Where(it => it.InsDate.Value.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")
&& it.Status == 0
&& it.TransctionNo == transactionNo
- && it.BillNo == itemBarcodeDetails.BillNo
+ && it.BillTypeId == billTypeId
+ && it.TaskNo == itemBarcodeDetails.BillNo
&& it.DepotsCode == mesDepost.DepotCode)
.Select(it => new
{
@@ -134,7 +179,7 @@
})
.First();
- Guid cId = Guid.Empty;
+ var cId = Guid.Empty;
string cBillNo = null;
if (existingRecord != null)
@@ -146,7 +191,7 @@
else
{
cId = Guid.NewGuid();
- cBillNo = BillNo.GetBillNo("IN(鍏ュ簱鍗�)");
+ cBillNo = BillNo.GetBillNo("CGRK(閲囪喘鍏ュ簱)");
var suppNo = db.Queryable<MesSupplier>()
.Where(s => s.Id.ToString() == inventory.SuppId).First();
@@ -167,11 +212,15 @@
LastupdateBy = user,
LastupdateDate = DateTime.Now,
UrgentFlag = itemBarcodeDetails.UrgentFlag.Value
- ? (byte)1
- : (byte)0,
+ ? "1"
+ : "0",
CbillNo = itemBarcodeDetails.BillNo,
Fstatus = 0,
- Status = 0
+ Status = 0,
+ ReceiveOrgId = inventory.ReceiveOrgId,
+ InType = "閲囪喘鍏ュ簱",
+ TaskNo = itemBarcodeDetails.BillNo
+ //WorkNo = itemBarcodeDetails.WorkNo
}).IgnoreColumns(true).ExecuteCommand();
}
@@ -207,22 +256,22 @@
IsdepsIn = true
})
.Where(d => d.Guid == detail.Guid)
- .IgnoreColumns(ignoreAllNullColumns: true)
+ .IgnoreColumns(true)
.ExecuteCommand();
// Check if already inserted
var count = db.Queryable<MesInvItemInCItems>()
- .Where(t =>
- t.ItemInId == cId &&
- t.ItemId == detail.ItemId &&
- t.WorkNo == detail.WorkNo &&
- t.WorkLine == detail.WorkLine)
+ .Where(it =>
+ it.ItemInId == cId &&
+ it.ItemId == detail.ItemId &&
+ it.DepotId == depotCode2 &&
+ it.EbelnK3id == detail.EbelnK3id &&
+ it.LineK3id == detail.LineK3id)
.Count();
cSyQty -= remainingQty.Value;
if (count == 0)
- {
// Insert new item into MES_INV_ITEM_IN_C_ITEMS
db.Insertable(new MesInvItemInCItems
{
@@ -234,7 +283,7 @@
DepotCode = mesDepost.DepotCode,
ItemSname = itemBarcodeDetails.ItemSname,
Unit = itemBarcodeDetails.Unit,
- Ebeln = detail.WorkNo,
+ Ebeln = detail.Ebeln,
BillNo = cBillNo,
WorkNo = detail.WorkNo,
CbillNo = detail.CbillNo,
@@ -243,22 +292,22 @@
SuppNo = itemBarcodeDetails.SuppNo,
Remark = itemBarcodeDetails.Memo,
EbelnK3id = detail.EbelnK3id,
- LineK3id = detail.LineK3id
+ LineK3id = detail.LineK3id,
+ DepotId = depotCode2,
+ itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
db.Updateable<MesInvItemInCItems>()
.SetColumns(it =>
it.Quantity == it.Quantity + remainingQty)
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.WorkNo == detail.WorkNo &&
- it.WorkLine == detail.WorkLine)
- .IgnoreColumns(ignoreAllNullColumns: true)
+ it.DepotId == depotCode2 &&
+ it.EbelnK3id == detail.EbelnK3id &&
+ it.LineK3id == detail.LineK3id)
+ .IgnoreColumns(true)
.ExecuteCommand();
- }
// Insert new detail into MES_INV_ITEM_IN_C_DETAILS
db.Insertable(new MesInvItemInCDetails
@@ -291,7 +340,9 @@
TaskNo = detail.WorkNo,
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
- ItemId = detail.ItemId
+ ItemId = detail.ItemId,
+ ReceiveOrgId = inventory.ReceiveOrgId,
+ LotNo = cgddDetails.BatchNumber
}).IgnoreColumns(true).ExecuteCommand();
}
else
@@ -303,19 +354,19 @@
OkRkqty = (int)((d.OkRkqty ?? 0) + cSyQty)
})
.Where(d => d.Guid == detail.Guid)
- .IgnoreColumns(ignoreAllNullColumns: true)
+ .IgnoreColumns(true)
.ExecuteCommand();
var count = db.Queryable<MesInvItemInCItems>()
- .Where(t =>
- t.ItemInId == cId &&
- t.ItemId == detail.ItemId &&
- t.WorkNo == detail.WorkNo &&
- t.WorkLine == detail.WorkLine)
+ .Where(it =>
+ it.ItemInId == cId &&
+ it.ItemId == detail.ItemId &&
+ it.DepotId == depotCode2 &&
+ it.EbelnK3id == detail.EbelnK3id &&
+ it.LineK3id == detail.LineK3id)
.Count();
if (count == 0)
- {
db.Insertable(new MesInvItemInCItems
{
ItemInId = cId,
@@ -337,22 +388,21 @@
Remark = itemBarcodeDetails.Memo,
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
- ItemId = detail.ItemId
+ ItemId = detail.ItemId,
+ DepotId = depotCode2
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
db.Updateable<MesInvItemInCItems>()
.SetColumns(it =>
it.Quantity == it.Quantity + cSyQty)
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.WorkNo == detail.WorkNo &&
- it.WorkLine == detail.WorkLine)
- .IgnoreColumns(ignoreAllNullColumns: true)
+ it.DepotId == depotCode2 &&
+ it.EbelnK3id == detail.EbelnK3id &&
+ it.LineK3id == detail.LineK3id)
+ .IgnoreColumns(true)
.ExecuteCommand();
- }
db.Insertable(new MesInvItemInCDetails
{
@@ -385,7 +435,9 @@
TaskNo = detail.WorkNo,
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
- ItemId = detail.ItemId
+ ItemId = detail.ItemId,
+ ReceiveOrgId = inventory.ReceiveOrgId,
+ LotNo = cgddDetails.BatchNumber
}).IgnoreColumns(true).ExecuteCommand();
cSyQty = 0; // Remaining quantity fulfilled
@@ -400,7 +452,7 @@
BusinessType = 1,
ItemBarcode = itemBarcode,
ItemNo = itemBarcodeDetails.ItemNo,
- LotNo = itemBarcodeDetails.LotNo,
+ LotNo = cgddDetails.BatchNumber,
EpFlag = true,
Quantity = itemBarcodeDetails.Quantity,
ToInvDepotsCode = mesDepost.DepotCode,
@@ -425,16 +477,22 @@
}
else
{
+ var detailone = db.Queryable<MesInvItemArnDetail>()
+ .Where(d =>
+ d.Guid == itemBarcodeDetails.AboutGuid)
+ .First();
+
// 妫�鏌ユ槸鍚﹀瓨鍦ㄤ簬 MES_INV_ITEM_IN_C_ITEMS 琛�
var existingCount = db.Queryable<MesInvItemInCItems>()
- .Where(t => t.ItemInId == cId &&
- t.ItemId == itemBarcodeDetails.ItemId &&
- t.WorkNo == itemBarcodeDetails.WorkNo &&
- t.WorkLine == itemBarcodeDetails.WorkLine)
+ .Where(it =>
+ it.ItemInId == cId &&
+ it.ItemId == detailone.ItemId &&
+ it.DepotId == depotCode2 &&
+ it.EbelnK3id == detailone.EbelnK3id &&
+ it.LineK3id == detailone.LineK3id)
.Count();
if (existingCount == 0)
- {
// 涓嶅瓨鍦ㄦ椂鎻掑叆鏂拌褰�
db.Insertable(new MesInvItemInCItems
{
@@ -457,23 +515,25 @@
Remark = itemBarcodeDetails.Memo,
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
- ItemId = itemBarcodeDetails.ItemId
+ ItemId = itemBarcodeDetails.ItemId,
+ DepotId = depotCode2,
+ itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 瀛樺湪鏃舵洿鏂版暟閲�
db.Updateable<MesInvItemInCItems>()
- .SetColumns(it =>
- it.Quantity ==
- it.Quantity + itemBarcodeDetails.Quantity)
- .Where(it => it.ItemInId == cId &&
- it.ItemId == itemBarcodeDetails.ItemId &&
- it.WorkNo == itemBarcodeDetails.WorkNo &&
- it.WorkLine == itemBarcodeDetails.WorkLine)
- .IgnoreColumns(ignoreAllNullColumns: true)
+ .SetColumns(it => new MesInvItemInCItems
+ {
+ 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)
+ //.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
.ExecuteCommand();
- }
// 鎻掑叆 mes_inv_item_in_c_details 琛�
db.Insertable(new MesInvItemInCDetails
@@ -486,7 +546,7 @@
EpFlag = true,
WorkType = 1,
ItemNo = itemBarcodeDetails.ItemNo,
- LotNo = itemBarcodeDetails.LotNo,
+ LotNo = cgddDetails.BatchNumber,
SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
DepotCode = mesDepost.DepotCode,
@@ -512,7 +572,9 @@
Ischeck = true,
CheckDate = inventoryDetails.CheckDate,
CheckRes = inventoryDetails.CheckRes,
- CheckStates = inventoryDetails.CheckStates
+ CheckStates = inventoryDetails.CheckStates,
+ ReceiveOrgId = inventory.ReceiveOrgId,
+ DepotId = Convert.ToInt64(depotCode2)
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆 mes_inv_business2 琛�
@@ -550,11 +612,13 @@
// 鎻掑叆 mes_inv_item_stocks 琛�
}
+
+
db.Insertable(new MesInvItemStocks
{
TaskNo = itemBarcodeDetails.TaskNo,
ItemBarcode = itemBarcode,
- ItemNo = itemBarcodeDetails.ItemNo,
+ ItemNo = cgddDetails.BatchNumber,
LotNo = itemBarcodeDetails.LotNo,
Quantity = itemBarcodeDetails.Quantity,
DepotsCode = mesDepost.DepotCode,
@@ -570,7 +634,12 @@
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
ItemId = itemBarcodeDetails.ItemId,
- BillNo = itemBarcodeDetails.BillNo
+ BillNo = itemBarcodeDetails.BillNo,
+ DepotId = Convert.ToInt32(depotCode2),
+ OwnerId = cgddDetails.DemandOrg,
+ OwnerType = owner_type,
+ StockOrgId = mesDepost.FSubsidiary,
+ IndepUserCode = user
}).IgnoreColumns(true).ExecuteCommand();
itemBarcodeDetails.Hbdy ??= 0;
@@ -601,12 +670,10 @@
var TotalOkRkQty = first.TotalOkRkQty ?? 0;
if (TotalQuantity == TotalOkRkQty)
- {
db.Updateable<MesInvItemArnDetail>()
.SetColumns(s => s.IsdepsIn == true)
.Where(s => s.Guid == inventoryDetails.Guid)
.ExecuteCommand();
- }
var totalSummary = db.Queryable<MesInvItemArnDetail>()
@@ -622,12 +689,10 @@
if ((totalSummary.TotalQuantity ?? 0) ==
(totalSummary.TotalOkRkQty ?? 0))
- {
db.Updateable<MesInvItemArn>()
.SetColumns(it => it.Status == 1)
.Where(it => it.BillNo == itemBarcodeDetails.BillNo)
.ExecuteCommand();
- }
var totalCDetailsQuantity = db.Queryable<MesInvItemInCDetails>()
.Where(it => it.WorkLine == itemBarcodeDetails.WorkLine &&
@@ -649,9 +714,7 @@
var diffQty = comeQty - invQty;
if (detailSummary == null)
- {
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
- }
var mesItems = db.Queryable<MesItems>()
.Where(s => s.Id == itemBarcodeDetails.ItemId).First();
@@ -681,12 +744,10 @@
if ((totalSummary.TotalQuantity ?? 0) ==
(totalSummary.TotalOkRkQty ?? 0))
- {
db.Updateable<MesInvItemArn>()
.SetColumns(it => it.Status == 1)
.Where(it => it.BillNo == itemBarcodeDetails.BillNo)
.ExecuteCommand();
- }
// Step 2: Calculate total sum from `mes_inv_item_in_c_details`
var totalCDetailsQuantity = db.Queryable<MesInvItemInCDetails>()
@@ -706,9 +767,7 @@
.First();
if (detailSummary == null)
- {
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
- }
var comeQty = detailSummary.TotalComeQty ?? 0;
var invQty = detailSummary.TotalInvQty ?? 0;
@@ -758,21 +817,19 @@
WarehouseQuery query)
{
var parsedGuid = Guid.Empty;
- if (string.IsNullOrEmpty(query.id))
+ if (!string.IsNullOrEmpty(query.id))
{
- return ([], 0);
+ var isValid = Guid.TryParse(query.id, out parsedGuid);
+ if (!isValid)
+ throw new ApplicationException("GUID杞崲閿欒");
}
-
- bool isValid = Guid.TryParse(query.id, out parsedGuid);
- if (!isValid)
- throw new ApplicationException("GUID杞崲閿欒");
var totalCount = 0;
var result = Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>(
(a, b, c) =>
new JoinQueryInfos(JoinType.Left,
- a.DepotsCode == b.DepotCode,
- JoinType.Left, a.SuppNo == c.SuppNo))
+ a.DepotsId == b.DepotId,
+ JoinType.Left, a.SuppId == c.Id.ToString()))
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
(a, b, c) => a.Guid == parsedGuid)
.Select((a, b, c) => new MesInvItemIns
@@ -798,12 +855,9 @@
{
//string杞琯uid
var parsedGuid = Guid.Empty;
- if (string.IsNullOrEmpty(pid))
- {
- return ( []);
- }
+ if (string.IsNullOrEmpty(pid)) return [];
- bool isValid = Guid.TryParse(pid, out parsedGuid);
+ var isValid = Guid.TryParse(pid, out parsedGuid);
if (!isValid)
throw new ApplicationException("GUID杞崲閿欒");
@@ -821,7 +875,7 @@
ItemNo = c.ItemNo,
ItemSname = g.ItemSname,
Quantity = g.Quantity,
- Unit = d.Fname,
+ Unit = d.Fname
})
.ToList();
@@ -832,12 +886,9 @@
{
//string杞琯uid
var parsedGuid = Guid.Empty;
- if (string.IsNullOrEmpty(pid))
- {
- return ( []);
- }
+ if (string.IsNullOrEmpty(pid)) return [];
- bool isValid = Guid.TryParse(pid, out parsedGuid);
+ var isValid = Guid.TryParse(pid, out parsedGuid);
if (!isValid)
throw new ApplicationException("GUID杞崲閿欒");
@@ -845,7 +896,7 @@
(g, c, d) => new JoinQueryInfos(
JoinType.Left,
g.ItemId == c.Id, JoinType.Inner,
- d.Id == Convert.ToDecimal(c.ItemUnit)
+ d.Id.ToString() == c.Fpurchaseunitid
)
).WhereIF(UtilityHelper.CheckGuid(parsedGuid),
(g, c, d) => g.ItemInId == parsedGuid)
@@ -946,7 +997,7 @@
.SetColumns(x => x.Status == entity.status)
.SetColumns(x => x.InsDate == entity.date)
.Where(x => x.BillNo == entity.billNo)
- .IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand() > 0;
+ .IgnoreColumns(true).ExecuteCommand() > 0;
}
private string GetErpParameters(string? billNo)
@@ -962,8 +1013,8 @@
MesInvItemArnDetail>(
(g, c, d, a) => new JoinQueryInfos(
JoinType.Left,
- g.ItemId == c.Id , JoinType.Inner,
- d.Id == Convert.ToDecimal(c.ItemUnit),
+ g.ItemId == c.Id, JoinType.Inner,
+ d.Id.ToString() == c.Fpurchaseunitid,
JoinType.Inner, a.Ebeln == g.WorkNo && g.CbillNo == a.CbillNo
)
).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>(
@@ -985,13 +1036,13 @@
var jsonEntries = materials.Select(d => new
{
- FMaterialId = d.FMaterialId,
- FRealQty = d.FRealQty,
- FStockId = d.FStockId,
- FLot = d.FLot,
- FUnitID = d.FUnitID,
- FsrcEntryId = d.FsrcEntryId,
- FMesEntryid = d.FMesEntryid
+ d.FMaterialId,
+ d.FRealQty,
+ d.FStockId,
+ d.FLot,
+ FUintId = d.FUnitID,
+ FSRCENTRYID = d.FsrcEntryId,
+ F_MES_ENTRYID = d.FMesEntryid
}).ToList();
var fdate = DateTime.Now.ToString("yyyy-MM-dd");
--
Gitblit v1.9.3