From 255d690c54c0692db9f8ee5484426813a9561db5 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 19 十一月 2024 13:13:42 +0800
Subject: [PATCH] 11
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 6f65aea..108ba74 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -149,8 +149,7 @@
cBillNo = BillNo.GetBillNo("IN(鍏ュ簱鍗�)");
var suppNo = db.Queryable<MesSupplier>()
- .Where(s => s.Id.ToString() == inventory.SuppId)
- .Select(s => s.SuppNo).First();
+ .Where(s => s.Id.ToString() == inventory.SuppId).First();
db.Insertable(new MesInvItemIns
{
@@ -158,14 +157,18 @@
BillNo = cBillNo,
BillTypeId = billTypeId,
InsDate = DateTime.Now,
+ DepotsId = mesDepost.DepotId,
DepotsCode = mesDepost.DepotCode,
TransctionNo = transactionNo,
- SuppNo = suppNo,
+ SuppId = suppNo.Id.ToString(),
+ SuppNo = suppNo.SuppNo,
CreateBy = user,
CreateDate = DateTime.Now,
LastupdateBy = user,
LastupdateDate = DateTime.Now,
- UrgentFlag = itemBarcodeDetails.UrgentFlag.Value ? 1 : 0,
+ UrgentFlag = itemBarcodeDetails.UrgentFlag.Value
+ ? (byte)1
+ : (byte)0,
CbillNo = itemBarcodeDetails.BillNo,
Fstatus = 0,
Status = 0
@@ -236,6 +239,7 @@
WorkNo = detail.WorkNo,
CbillNo = detail.CbillNo,
WorkLine = detail.WorkLine,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
Remark = itemBarcodeDetails.Memo,
EbelnK3id = detail.EbelnK3id,
@@ -267,6 +271,7 @@
EpFlag = true,
WorkType = 1,
ItemNo = detail.ItemNo,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
DepotCode = mesDepost.DepotCode,
DepotSectionCode = sectionCode,
@@ -327,6 +332,7 @@
EbelnLineNo = detail.EbelnLine,
CbillNo = detail.CbillNo,
WorkLine = detail.WorkLine,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
Remark = itemBarcodeDetails.Memo,
EbelnK3id = detail.EbelnK3id,
@@ -358,6 +364,7 @@
EpFlag = true,
WorkType = 1,
ItemNo = detail.ItemNo,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
DepotCode = mesDepost.DepotCode,
DepotSectionCode = sectionCode,
@@ -407,6 +414,7 @@
BillNo = cBillNo,
WorkNo = itemBarcodeDetails.WorkNo,
WorkLine = itemBarcodeDetails.WorkLine,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
@@ -444,6 +452,7 @@
EbelnLineNo = itemBarcodeDetails.WorkLine,
CbillNo = itemBarcodeDetails.BillNo,
WorkLine = itemBarcodeDetails.WorkLine,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
Remark = itemBarcodeDetails.Memo,
EbelnK3id = itemBarcodeDetails.EbelnK3id,
@@ -478,6 +487,7 @@
WorkType = 1,
ItemNo = itemBarcodeDetails.ItemNo,
LotNo = itemBarcodeDetails.LotNo,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
DepotCode = mesDepost.DepotCode,
DepotSectionCode = sectionCode,
@@ -530,6 +540,7 @@
BillNo = cBillNo,
WorkNo = itemBarcodeDetails.WorkNo,
WorkLine = itemBarcodeDetails.WorkLine,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
@@ -554,6 +565,7 @@
BoardStyle = itemBarcodeDetails.BoardStyle,
WorkNo = itemBarcodeDetails.WorkNo,
WorkLine = itemBarcodeDetails.WorkLine,
+ SuppId = itemBarcodeDetails.SuppId,
SuppNo = itemBarcodeDetails.SuppNo,
EbelnK3id = itemBarcodeDetails.EbelnK3id,
LineK3id = itemBarcodeDetails.LineK3id,
@@ -796,21 +808,21 @@
throw new ApplicationException("GUID杞崲閿欒");
var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>(
- (g, c,d) => new JoinQueryInfos(
- JoinType.Left,g.ItemId == c.Id,
- JoinType.Inner,d.Id == Convert.ToDecimal(g.Unit)
- )
- ).WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- (g, c,d) => g.ItemInId == parsedGuid)
- .Select((g, c,d)=> new MesInvItemInCItems
- {
- Guid = g.Guid,
- WorkNo = g.WorkNo,
- ItemNo = c.ItemNo,
- ItemSname = g.ItemSname,
- Quantity = g.Quantity,
- Unit = d.Fname,
- })
+ (g, c, d) => new JoinQueryInfos(
+ JoinType.Left, g.ItemId == c.Id,
+ JoinType.Inner, d.Id == Convert.ToDecimal(g.Unit)
+ )
+ ).WhereIF(UtilityHelper.CheckGuid(parsedGuid),
+ (g, c, d) => g.ItemInId == parsedGuid)
+ .Select((g, c, d) => new MesInvItemInCItems
+ {
+ Guid = g.Guid,
+ WorkNo = g.WorkNo,
+ ItemNo = c.ItemNo,
+ ItemSname = g.ItemSname,
+ Quantity = g.Quantity,
+ Unit = d.Fname,
+ })
.ToList();
return result;
@@ -902,7 +914,7 @@
Db.Insertable(message).ExecuteReturnIdentity();
if (executeReturnIdentity > 0)
{
- //message.Guid = executeReturnIdentity;
+ // message.Guid = executeReturnIdentity;
message.Pid = executeReturnIdentity;
return message;
}
--
Gitblit v1.9.3