From 255d690c54c0692db9f8ee5484426813a9561db5 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 19 十一月 2024 13:13:42 +0800
Subject: [PATCH] 11
---
entity/MesInvItemIns.cs | 57 ++++----
entity/MesInvItemStocks.cs | 203 +++++++++++++++++----------------
entity/MesInvItemInCDetails.cs | 3
entity/MesInvItemInCItems.cs | 3
service/Warehouse/MesInvItemInCDetailsManager.cs | 52 +++++---
entity/MesInvBusiness2.cs | 3
6 files changed, 173 insertions(+), 148 deletions(-)
diff --git a/entity/MesInvBusiness2.cs b/entity/MesInvBusiness2.cs
index e10ba5d..5a68af3 100644
--- a/entity/MesInvBusiness2.cs
+++ b/entity/MesInvBusiness2.cs
@@ -231,5 +231,8 @@
///</summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public long? ItemId { get; set; }
+
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public string? SuppId { get; set; }
}
}
\ No newline at end of file
diff --git a/entity/MesInvItemInCDetails.cs b/entity/MesInvItemInCDetails.cs
index 801475e..2a90c16 100644
--- a/entity/MesInvItemInCDetails.cs
+++ b/entity/MesInvItemInCDetails.cs
@@ -375,6 +375,9 @@
[SugarColumn(ColumnName = "ITEM_ID")]
public long? ItemId { get; set; }
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public string? SuppId { get; set; }
+
// 娣诲姞鐨勫瓧娈碉紝骞朵笖瀹冧滑涓嶅睘浜庢暟鎹簱琛�
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
diff --git a/entity/MesInvItemInCItems.cs b/entity/MesInvItemInCItems.cs
index c41ca35..a159130 100644
--- a/entity/MesInvItemInCItems.cs
+++ b/entity/MesInvItemInCItems.cs
@@ -164,5 +164,8 @@
///</summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public long? ItemId { get; set; }
+
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public string? SuppId { get; set; }
}
}
\ No newline at end of file
diff --git a/entity/MesInvItemIns.cs b/entity/MesInvItemIns.cs
index 12b5ef9..5872bc0 100644
--- a/entity/MesInvItemIns.cs
+++ b/entity/MesInvItemIns.cs
@@ -101,19 +101,19 @@
public string? CheckUser { get; set; }
/// <summary>
- /// 瀹℃牳鏃ユ湡
+ ///
///</summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
/// <summary>
- /// 鐢熶骇璁㈠崟鍙�
+ ///
///</summary>
[SugarColumn(ColumnName = "TASK_NO")]
public string? TaskNo { get; set; }
/// <summary>
- /// 鍏ュ簱鏃ユ湡
+ ///
///</summary>
[SugarColumn(ColumnName = "INS_DATE")]
public DateTime? InsDate { get; set; }
@@ -125,119 +125,113 @@
public string? CheckRes { get; set; }
/// <summary>
- /// 宸叉崱鏁伴噺
+ ///
///</summary>
[SugarColumn(ColumnName = "CHECK_QTY")]
public long? CheckQty { get; set; }
/// <summary>
- /// 棰嗘枡宸ユ
+ ///
///</summary>
[SugarColumn(ColumnName = "MMLIST")]
public string? Mmlist { get; set; }
/// <summary>
- /// SAP閲囪喘璁㈠崟鍙�
+ ///
///</summary>
[SugarColumn(ColumnName = "EBELN")]
public string? Ebeln { get; set; }
/// <summary>
- /// 浠撳簱缂栫爜
+ ///
///</summary>
[SugarColumn(ColumnName = "DEPOTS_CODE")]
public string? DepotsCode { get; set; }
/// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
+ ///
///</summary>
[SugarColumn(ColumnName = "TRANSCTION_NO")]
public string? TransctionNo { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙紪鐮�
+ ///
///</summary>
[SugarColumn(ColumnName = "SUPP_NO")]
public string? SuppNo { get; set; }
/// <summary>
- /// 鍏ュ簱鐘舵��
+ /// 鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴
/// 榛樿鍊�: ((0))
///</summary>
[SugarColumn(ColumnName = "FSTATUS")]
public byte? Fstatus { get; set; }
/// <summary>
- /// 宸ュ巶缂栫爜
+ ///
///</summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// 鏄惁宸插洖鍐橲AP
+ ///
/// 榛樿鍊�: ((0))
///</summary>
[SugarColumn(ColumnName = "SAPSTATUS")]
public byte? Sapstatus { get; set; }
/// <summary>
- /// SAP杩斿洖鍗曟嵁
+ ///
///</summary>
[SugarColumn(ColumnName = "SAPNO")]
public string? Sapno { get; set; }
/// <summary>
- /// SAP杩斿洖骞翠唤
+ ///
///</summary>
[SugarColumn(ColumnName = "SAPYEAR")]
public short? Sapyear { get; set; }
/// <summary>
- /// SAP杩斿洖淇℃伅
+ ///
///</summary>
[SugarColumn(ColumnName = "SAPTEXT")]
public string? Saptext { get; set; }
- // /// <summary>
- // /// 纭鍏ュ簱鏃ユ湡
- // ///</summary>
- // [SugarColumn(ColumnName = "INSDATE")]
- // public DateTime? Insdate { get; set; }
-
/// <summary>
- /// 鏄惁妫�楠�
+ ///
///</summary>
[SugarColumn(ColumnName = "ISCHECK")]
public byte? Ischeck { get; set; }
/// <summary>
- /// 瀹℃牳鍏ュ簱浜�
+ ///
///</summary>
[SugarColumn(ColumnName = "INSBY")]
public string? Insby { get; set; }
/// <summary>
- /// 鏄惁鏄剧ず
+ ///
/// 榛樿鍊�: ((0))
///</summary>
[SugarColumn(ColumnName = "IS_VISUAL")]
public byte? IsVisual { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
+ ///
///</summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// 鎬ユ枡鏍囪瘑
+ ///
/// 榛樿鍊�: ((0))
///</summary>
[SugarColumn(ColumnName = "URGENT_FLAG")]
- public int? UrgentFlag { get; set; }
+ public byte? UrgentFlag { get; set; }
/// <summary>
- /// 閲囪喘鍗曡鍙�
+ ///
///</summary>
[SugarColumn(ColumnName = "LINE_NO")]
public string? LineNo { get; set; }
@@ -321,6 +315,13 @@
[SugarColumn(ColumnName = "BGR")]
public string? Bgr { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public string? SuppId { get; set; }
+
+
//鍦ㄦ暟鎹簱鏌ヨ鏃跺拷鐣ヨ繖涓瓧娈�
[SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
diff --git a/entity/MesInvItemStocks.cs b/entity/MesInvItemStocks.cs
index a48c68c..27020f4 100644
--- a/entity/MesInvItemStocks.cs
+++ b/entity/MesInvItemStocks.cs
@@ -8,207 +8,210 @@
[SugarTable("MES_INV_ITEM_STOCKS")]
public class MesInvItemStocks
{
- /// <summary>
+ /// <summary>
///
/// 榛樿鍊�: (newid())
///</summary>
- [SugarColumn(ColumnName="guid" ,IsPrimaryKey = true )]
- public Guid Guid { get; set; }
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
- /// <summary>
+ /// <summary>
/// 鐢熶骇璁㈠崟
///</summary>
- [SugarColumn(ColumnName="TASK_NO" )]
- public string? TaskNo { get; set; }
+ [SugarColumn(ColumnName = "TASK_NO")]
+ public string? TaskNo { get; set; }
- /// <summary>
+ /// <summary>
/// 鐗╂枡鏉＄爜
///</summary>
- [SugarColumn(ColumnName="ITEM_BARCODE" )]
- public string? ItemBarcode { get; set; }
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
+ public string? ItemBarcode { get; set; }
- /// <summary>
+ /// <summary>
/// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
///</summary>
- [SugarColumn(ColumnName="C_ITEM_CODE" )]
- public string? CItemCode { get; set; }
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
+ public string? CItemCode { get; set; }
- /// <summary>
+ /// <summary>
/// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
///</summary>
- [SugarColumn(ColumnName="ITEM_NO" )]
- public string? ItemNo { get; set; }
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ItemNo { get; set; }
- /// <summary>
+ /// <summary>
/// 瀛愬簱id
///</summary>
- [SugarColumn(ColumnName="DEPOTS_ID" )]
- public long? DepotsId { get; set; }
+ [SugarColumn(ColumnName = "DEPOTS_ID")]
+ public long? DepotsId { get; set; }
- /// <summary>
+ /// <summary>
/// 璐т綅id
///</summary>
- [SugarColumn(ColumnName="DEPOT_SECTIONS_ID" )]
- public long? DepotSectionsId { get; set; }
+ [SugarColumn(ColumnName = "DEPOT_SECTIONS_ID")]
+ public long? DepotSectionsId { get; set; }
- /// <summary>
+ /// <summary>
/// 鍘傚鎵规
///</summary>
- [SugarColumn(ColumnName="LOT_NO" )]
- public string? LotNo { get; set; }
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string? LotNo { get; set; }
- /// <summary>
+ /// <summary>
/// 鏁伴噺
/// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName="QUANTITY" )]
- public decimal? Quantity { get; set; }
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public decimal? Quantity { get; set; }
- /// <summary>
+ /// <summary>
/// 鐜繚鏍囧織锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級(0-鍚︼紝1-鏄�)
///</summary>
- [SugarColumn(ColumnName="EP_FLAG" )]
- public byte? EpFlag { get; set; }
+ [SugarColumn(ColumnName = "EP_FLAG")]
+ public byte? EpFlag { get; set; }
- /// <summary>
+ /// <summary>
/// 瀹㈡埛缂栫爜
///</summary>
- [SugarColumn(ColumnName="CUSTOMER_NO" )]
- public string? CustomerNo { get; set; }
+ [SugarColumn(ColumnName = "CUSTOMER_NO")]
+ public string? CustomerNo { get; set; }
- /// <summary>
+ /// <summary>
/// 閲嶉噺
///</summary>
- [SugarColumn(ColumnName="ITEM_WT" )]
- public decimal? ItemWt { get; set; }
+ [SugarColumn(ColumnName = "ITEM_WT")]
+ public decimal? ItemWt { get; set; }
- /// <summary>
+ /// <summary>
/// 瀛愬簱CODE
///</summary>
- [SugarColumn(ColumnName="DEPOTS_CODE" )]
- public string? DepotsCode { get; set; }
+ [SugarColumn(ColumnName = "DEPOTS_CODE")]
+ public string? DepotsCode { get; set; }
- /// <summary>
+ /// <summary>
/// 璐т綅CODE
///</summary>
- [SugarColumn(ColumnName="DEPOT_SECTIONS_CODE" )]
- public string? DepotSectionsCode { get; set; }
+ [SugarColumn(ColumnName = "DEPOT_SECTIONS_CODE")]
+ public string? DepotSectionsCode { get; set; }
- /// <summary>
+ /// <summary>
/// 妫�楠屾棩鏈�
///</summary>
- [SugarColumn(ColumnName="CHECK_DATE" )]
- public DateTime? CheckDate { get; set; }
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
- /// <summary>
+ /// <summary>
/// 0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧
/// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName="ITEM_TYPE" )]
- public byte? ItemType { get; set; }
+ [SugarColumn(ColumnName = "ITEM_TYPE")]
+ public byte? ItemType { get; set; }
- /// <summary>
+ /// <summary>
/// 鍏ュ簱鏃ユ湡
/// 榛樿鍊�: (getdate())
///</summary>
- [SugarColumn(ColumnName="INDEP_DATE" )]
- public DateTime? IndepDate { get; set; }
+ [SugarColumn(ColumnName = "INDEP_DATE")]
+ public DateTime? IndepDate { get; set; }
- /// <summary>
+ /// <summary>
/// 宸ュ巶缂栧彿
///</summary>
- [SugarColumn(ColumnName="FACTORY" )]
- public string? Factory { get; set; }
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string? Factory { get; set; }
- /// <summary>
+ /// <summary>
/// 鍏徃缂栧彿
///</summary>
- [SugarColumn(ColumnName="COMPANY" )]
- public string? Company { get; set; }
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string? Company { get; set; }
- /// <summary>
+ /// <summary>
/// 璐ㄩ噺鐘舵��
///</summary>
- [SugarColumn(ColumnName="IQC_STATUS" )]
- public string? IqcStatus { get; set; }
+ [SugarColumn(ColumnName = "IQC_STATUS")]
+ public string? IqcStatus { get; set; }
- /// <summary>
+ /// <summary>
/// F鍗�
///</summary>
- [SugarColumn(ColumnName="FCAR" )]
- public string? Fcar { get; set; }
+ [SugarColumn(ColumnName = "FCAR")]
+ public string? Fcar { get; set; }
- /// <summary>
+ /// <summary>
/// 鍙鎻愪氦鏍囧織锛�0-鍚︼紝1-鏄級
/// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName="VISABLE_SUBMIT" )]
- public byte? VisableSubmit { get; set; }
+ [SugarColumn(ColumnName = "VISABLE_SUBMIT")]
+ public byte? VisableSubmit { get; set; }
- /// <summary>
+ /// <summary>
/// 鍙鎻愪氦浜�
///</summary>
- [SugarColumn(ColumnName="VISABLE_SUBMIT_BY" )]
- public string? VisableSubmitBy { get; set; }
+ [SugarColumn(ColumnName = "VISABLE_SUBMIT_BY")]
+ public string? VisableSubmitBy { get; set; }
- /// <summary>
+ /// <summary>
/// 鍙鎻愪氦鏃堕棿
///</summary>
- [SugarColumn(ColumnName="VISABLE_SUBMIT_DATE" )]
- public DateTime? VisableSubmitDate { get; set; }
+ [SugarColumn(ColumnName = "VISABLE_SUBMIT_DATE")]
+ public DateTime? VisableSubmitDate { get; set; }
- /// <summary>
+ /// <summary>
/// 鏉垮瀷
///</summary>
- [SugarColumn(ColumnName="BOARD_STYLE" )]
- public string? BoardStyle { get; set; }
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
+ public string? BoardStyle { get; set; }
- /// <summary>
+ /// <summary>
/// 宸ュ崟鍙�
///</summary>
- [SugarColumn(ColumnName="WORK_NO" )]
- public string? WorkNo { get; set; }
+ [SugarColumn(ColumnName = "WORK_NO")]
+ public string? WorkNo { get; set; }
- /// <summary>
+ /// <summary>
/// 宸ュ崟琛屽彿
///</summary>
- [SugarColumn(ColumnName="WORK_LINE" )]
- public int? WorkLine { get; set; }
+ [SugarColumn(ColumnName = "WORK_LINE")]
+ public int? WorkLine { get; set; }
- /// <summary>
+ /// <summary>
/// 渚涘簲鍟嗙紪鐮�
///</summary>
- [SugarColumn(ColumnName="SUPP_NO" )]
- public string? SuppNo { get; set; }
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string? SuppNo { get; set; }
- /// <summary>
+ /// <summary>
/// 琛屽彿
///</summary>
- [SugarColumn(ColumnName="LINE_NO" )]
- public string? LineNo { get; set; }
+ [SugarColumn(ColumnName = "LINE_NO")]
+ public string? LineNo { get; set; }
- /// <summary>
+ /// <summary>
/// 鍗曟嵁缂栧彿
///</summary>
- [SugarColumn(ColumnName="BILL_NO" )]
- public string? BillNo { get; set; }
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
- /// <summary>
+ /// <summary>
/// K3ID
///</summary>
- [SugarColumn(ColumnName="EBELN_K3ID" )]
- public long? EbelnK3id { get; set; }
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
+ public long? EbelnK3id { get; set; }
- /// <summary>
+ /// <summary>
/// 琛孠3ID
///</summary>
- [SugarColumn(ColumnName="LINE_K3ID" )]
- public long? LineK3id { get; set; }
+ [SugarColumn(ColumnName = "LINE_K3ID")]
+ public long? LineK3id { get; set; }
- /// <summary>
+ /// <summary>
/// 鐗╂枡ID
///</summary>
- [SugarColumn(ColumnName="ITEM_ID" )]
- public long? ItemId { get; set; }
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public long? ItemId { get; set; }
+
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public string? SuppId { get; set; }
}
-}
+}
\ No newline at end of file
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