| entity/MesInvBusiness2.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemInCDetails.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemInCItems.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemIns.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemStocks.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| service/Warehouse/MesInvItemInCDetailsManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; } } } 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; } 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; } } } 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> /// 是否已回写SAP /// /// 默认值: ((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; }
@@ -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> /// 行K3ID ///</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; } } } } 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; }
