| MES.Service/Modes/MesRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohInData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Modes/MesRohIn.cs
@@ -9,303 +9,291 @@ public class MesRohIn { /// <summary> /// 主键 /// 默认值: (newid()) ///</summary> /// 主键 /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// SEQ_BASEINFO_ID ///</summary> [SugarColumn(ColumnName = "ID")] public long? Id { get; set; } /// <summary> /// 采购单号 ///</summary> /// 采购单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// 单据状态 ///</summary> /// 单据状态 /// </summary> [SugarColumn(ColumnName = "DOCUMENT_STATUS")] public string? DocumentStatus { get; set; } /// <summary> /// 单据类型 ///</summary> /// 单据类型 /// </summary> [SugarColumn(ColumnName = "DOCUMENT_TYPE")] public string? DocumentType { get; set; } /// <summary> /// 业务类型 ///</summary> /// 业务类型 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TYPE")] public string? BusinessType { get; set; } /// <summary> /// 采购日期 ///</summary> /// 采购日期 /// </summary> [SugarColumn(ColumnName = "PURCHASE_DATE")] public DateTime? PurchaseDate { get; set; } /// <summary> /// 供应商 ///</summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "SUPPLIER")] public string? Supplier { get; set; } /// <summary> /// 关闭状态 ///</summary> /// 关闭状态 /// </summary> [SugarColumn(ColumnName = "CLOSE_STATUS")] public string? CloseStatus { get; set; } /// <summary> /// 采购组织 ///</summary> /// 采购组织 /// </summary> [SugarColumn(ColumnName = "PURCHASE_ORG")] public string? PurchaseOrg { get; set; } /// <summary> /// 采购部门 ///</summary> /// 采购部门 /// </summary> [SugarColumn(ColumnName = "PURCHASE_DEPT")] public string? PurchaseDept { get; set; } /// <summary> /// 采购组 ///</summary> /// 采购组 /// </summary> [SugarColumn(ColumnName = "PURCHASE_GROUP")] public string? PurchaseGroup { get; set; } /// <summary> /// 数量验收 ///</summary> /// 数量验收 /// </summary> [SugarColumn(ColumnName = "QTY_ACCEPTANCE")] public string? QtyAcceptance { get; set; } /// <summary> /// 采购员 ///</summary> /// 采购员 /// </summary> [SugarColumn(ColumnName = "PURCHASER")] public string? Purchaser { get; set; } /// <summary> /// 质量要求 ///</summary> /// 质量要求 /// </summary> [SugarColumn(ColumnName = "QUALITY_REQ")] public string? QualityReq { get; set; } /// <summary> /// 结算方 ///</summary> /// 结算方 /// </summary> [SugarColumn(ColumnName = "SETTLEMENT_PARTY")] public string? SettlementParty { get; set; } /// <summary> /// 收款方 ///</summary> /// 收款方 /// </summary> [SugarColumn(ColumnName = "PAYMENT_PARTY")] public string? PaymentParty { get; set; } /// <summary> /// 邮箱 ///</summary> /// 邮箱 /// </summary> [SugarColumn(ColumnName = "EMAIL")] public string? Email { get; set; } /// <summary> /// 运输方式 ///</summary> /// 运输方式 /// </summary> [SugarColumn(ColumnName = "TRANSPORT_METHOD")] public string? TransportMethod { get; set; } /// <summary> /// 备注 ///</summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string? Remarks { get; set; } /// <summary> /// 治具丶模具加工及采购 ///</summary> /// 治具丶模具加工及采购 /// </summary> [SugarColumn(ColumnName = "FIXTURE_MOLD_PROCUREMENT")] public string? FixtureMoldProcurement { get; set; } /// <summary> /// 作废状态 ///</summary> /// 作废状态 /// </summary> [SugarColumn(ColumnName = "CANCELLATION_STATUS")] public string? CancellationStatus { get; set; } /// <summary> /// 作废人 ///</summary> /// 作废人 /// </summary> [SugarColumn(ColumnName = "CANCELLATION_PERSON")] public string? CancellationPerson { get; set; } /// <summary> /// 作废日期 ///</summary> /// 作废日期 /// </summary> [SugarColumn(ColumnName = "CANCELLATION_DATE")] public DateTime? CancellationDate { get; set; } /// <summary> /// 创建人 ///</summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string? CreateBy { get; set; } /// <summary> /// 创建日期 ///</summary> /// 创建日期 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后修改时间 ///</summary> /// 最后修改时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 最后修改人 ///</summary> /// 最后修改人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string? LastupdateBy { get; set; } /// <summary> /// 审核人 ///</summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "ERP_CHECK_BY")] public string? ErpCheckBy { get; set; } /// <summary> /// 审核时间 ///</summary> /// 审核时间 /// </summary> [SugarColumn(ColumnName = "ERP_CHECK_DATE")] public string? ErpCheckDate { get; set; } /// <summary> /// ERP的ID号 ///</summary> /// ERP的ID号 /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public long? EbelnK3id { get; set; } /// <summary> /// 审核日期 ///</summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// 审核人 ///</summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECK_BY")] public string? CheckBy { get; set; } /// <summary> /// 审核标识 ///</summary> /// 审核标识 /// </summary> [SugarColumn(ColumnName = "CHECK_FALG")] public int? CheckFalg { get; set; } /// <summary> /// 打印次数 ///</summary> /// 打印次数 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string? Remark1 { get; set; } /// <summary> /// 自定义字段2 ///</summary> /// 自定义字段2 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string? Remark2 { get; set; } /// <summary> /// 自定义字段3 ///</summary> /// 自定义字段3 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string? Remark3 { get; set; } /// <summary> /// 自定义字段4 ///</summary> /// 自定义字段4 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string? Remark4 { get; set; } /// <summary> /// 自定义字段5 ///</summary> /// 自定义字段5 /// </summary> [SugarColumn(ColumnName = "REMARK5")] public string? Remark5 { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "CHANGEREASON")] public string? Changereason { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "Prearrivaldate")] public DateTime? Prearrivaldate { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "Provider_Id")] public string? ProviderId { get; set; } /// <summary> /// 联系人 ///</summary> /// 联系人 /// </summary> [SugarColumn(ColumnName = "anred")] public string? Anred { get; set; } /// <summary> /// 电话 ///</summary> /// 电话 /// </summary> [SugarColumn(ColumnName = "telf1")] public string? Telf1 { get; set; } /// <summary> /// 固定电话 ///</summary> /// 固定电话 /// </summary> [SugarColumn(ColumnName = "Fixed_Telephone")] public string? FixedTelephone { get; set; } /// <summary> /// 通讯地址 ///</summary> /// 通讯地址 /// </summary> [SugarColumn(ColumnName = "Address")] public string? Address { get; set; } /// <summary> /// 验收方式 ///</summary> /// 验收方式 /// </summary> [SugarColumn(ColumnName = "Acctype")] public string? Acctype { get; set; } } MES.Service/Modes/MesRohInData.cs
@@ -9,346 +9,332 @@ public class MesRohInData { /// <summary> /// /// 默认值: (newid()) ///</summary> /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// 采购单号 ///</summary> /// 采购单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// 销售订单号 ///</summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "SALES_ORDER_ID")] public string? SalesOrderId { get; set; } /// <summary> /// 采购订单行号 ///</summary> /// 采购订单行号 /// </summary> [SugarColumn(ColumnName = "ORDER_LINE_ID")] public string? OrderLineId { get; set; } /// <summary> /// 物料编码 ///</summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public string? ItemId { get; set; } /// <summary> /// 采购单位 ///</summary> /// 采购单位 /// </summary> [SugarColumn(ColumnName = "PURCHASE_UNIT")] public string? PurchaseUnit { get; set; } /// <summary> /// 采购数量 ///</summary> /// 采购数量 /// </summary> [SugarColumn(ColumnName = "PURCHASE_QTY")] public decimal? PurchaseQty { get; set; } /// <summary> /// 库存单位 ///</summary> /// 库存单位 /// </summary> [SugarColumn(ColumnName = "INVENTORY_UNIT")] public string? InventoryUnit { get; set; } /// <summary> /// 计价单位 ///</summary> /// 计价单位 /// </summary> [SugarColumn(ColumnName = "PRICING_UNIT")] public string? PricingUnit { get; set; } /// <summary> /// 计价数量 ///</summary> /// 计价数量 /// </summary> [SugarColumn(ColumnName = "PRICING_QTY")] public decimal? PricingQty { get; set; } /// <summary> /// 交货日期 ///</summary> /// 交货日期 /// </summary> [SugarColumn(ColumnName = "DELIVERY_DATE")] public DateTime? DeliveryDate { get; set; } /// <summary> /// 最早交货日期 ///</summary> /// 最早交货日期 /// </summary> [SugarColumn(ColumnName = "EARLIEST_DELIVERY_DATE")] public DateTime? EarliestDeliveryDate { get; set; } /// <summary> /// 最晚交货日期 ///</summary> /// 最晚交货日期 /// </summary> [SugarColumn(ColumnName = "LATEST_DELIVERY_DATE")] public DateTime? LatestDeliveryDate { get; set; } /// <summary> /// 需求组织 ///</summary> /// 需求组织 /// </summary> [SugarColumn(ColumnName = "DEMAND_ORG")] public string? DemandOrg { get; set; } /// <summary> /// 收料组织 ///</summary> /// 收料组织 /// </summary> [SugarColumn(ColumnName = "RECEIVING_ORG")] public string? ReceivingOrg { get; set; } /// <summary> /// 结算组织 ///</summary> /// 结算组织 /// </summary> [SugarColumn(ColumnName = "SETTLEMENT_ORG")] public string? SettlementOrg { get; set; } /// <summary> /// 是否赠品 ///</summary> /// 是否赠品 /// </summary> [SugarColumn(ColumnName = "IS_GIFT")] public string? IsGift { get; set; } /// <summary> /// 备注 ///</summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string? Remarks { get; set; } /// <summary> /// 供应商物料编码 ///</summary> /// 供应商物料编码 /// </summary> [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")] public string? SupplierItemCode { get; set; } /// <summary> /// 供应商物料名称 ///</summary> /// 供应商物料名称 /// </summary> [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")] public string? SupplierItemName { get; set; } /// <summary> /// 委外订单编号 ///</summary> /// 委外订单编号 /// </summary> [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")] public string? OutsourcingOrderId { get; set; } /// <summary> /// 批号 ///</summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "BATCH_NUMBER")] public string? BatchNumber { get; set; } /// <summary> /// 业务关闭 ///</summary> /// 业务关闭 /// </summary> [SugarColumn(ColumnName = "BUSINESS_CLOSE")] public string? BusinessClose { get; set; } /// <summary> /// 业务冻结 ///</summary> /// 业务冻结 /// </summary> [SugarColumn(ColumnName = "BUSINESS_FREEZE")] public string? BusinessFreeze { get; set; } /// <summary> /// 冻结人 ///</summary> /// 冻结人 /// </summary> [SugarColumn(ColumnName = "FREEZER")] public string? Freezer { get; set; } /// <summary> /// 冻结时间 ///</summary> /// 冻结时间 /// </summary> [SugarColumn(ColumnName = "FREEZE_TIME")] public DateTime? FreezeTime { get; set; } /// <summary> /// 业务终止 ///</summary> /// 业务终止 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TERMINATE")] public string? BusinessTerminate { get; set; } /// <summary> /// 终止人 ///</summary> /// 终止人 /// </summary> [SugarColumn(ColumnName = "TERMINATOR")] public string? Terminator { get; set; } /// <summary> /// 终止时间 ///</summary> /// 终止时间 /// </summary> [SugarColumn(ColumnName = "TERMINATE_TIME")] public DateTime? TerminateTime { get; set; } /// <summary> /// 累计收料数量 ///</summary> /// 累计收料数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")] public decimal? TotalReceivedQty { get; set; } /// <summary> /// 剩余收料数量 ///</summary> /// 剩余收料数量 /// </summary> [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")] public decimal? RemainingReceivedQty { get; set; } /// <summary> /// 累计入库数量 ///</summary> /// 累计入库数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_STORED_QTY")] public decimal? TotalStoredQty { get; set; } /// <summary> /// 剩余入库数量 ///</summary> /// 剩余入库数量 /// </summary> [SugarColumn(ColumnName = "REMAINING_STORED_QTY")] public decimal? RemainingStoredQty { get; set; } /// <summary> /// 累计退料数量 ///</summary> /// 累计退料数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")] public decimal? TotalReturnedQty { get; set; } /// <summary> /// 收料可退数量 ///</summary> /// 收料可退数量 /// </summary> [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")] public decimal? ReturnableReceivedQty { get; set; } /// <summary> /// 库存可退数量 ///</summary> /// 库存可退数量 /// </summary> [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")] public decimal? ReturnableStoredQty { get; set; } /// <summary> /// 源单类型 ///</summary> /// 源单类型 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")] public string? SourceDocumentType { get; set; } /// <summary> /// 源单单号 ///</summary> /// 源单单号 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")] public string? SourceDocumentId { get; set; } /// <summary> /// 需求跟踪号 ///</summary> /// 需求跟踪号 /// </summary> [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")] public string? DemandTrackingId { get; set; } /// <summary> /// 计划跟踪号 ///</summary> /// 计划跟踪号 /// </summary> [SugarColumn(ColumnName = "PLAN_TRACKING_ID")] public string? PlanTrackingId { get; set; } /// <summary> /// 变更标志 ///</summary> /// 变更标志 /// </summary> [SugarColumn(ColumnName = "CHANGE_FLAG")] public string? ChangeFlag { get; set; } /// <summary> /// 需求来源 ///</summary> /// 需求来源 /// </summary> [SugarColumn(ColumnName = "DEMAND_SOURCE")] public string? DemandSource { get; set; } /// <summary> /// 需求单据编号 ///</summary> /// 需求单据编号 /// </summary> [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")] public string? DemandDocumentId { get; set; } /// <summary> /// 需求单据行号 ///</summary> /// 需求单据行号 /// </summary> [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")] public string? DemandDocumentLineId { get; set; } /// <summary> /// ERP的ID号 ///</summary> /// ERP的ID号 /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } /// <summary> /// 客户货号 ///</summary> /// 客户货号 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string? Remark1 { get; set; } /// <summary> /// 包装单号 ///</summary> /// 包装单号 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string? Remark2 { get; set; } /// <summary> /// 主产品 ///</summary> /// 主产品 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string? Remark3 { get; set; } /// <summary> /// SMT备注 ///</summary> /// SMT备注 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string? Remark4 { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")] public string? PurchaseOrderLineNumber { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "DEMAND")] public string? Demand { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "RECEIVING")] public string? Receiving { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "SETTLEMENT")] public string? Settlement { get; set; } /// <summary> /// /// 默认值: ((0)) ///</summary> /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "CGB014")] public decimal? Cgb014 { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")] public string? DemandDepartment { get; set; } @@ -359,14 +345,12 @@ public string? ReceivingDepartment { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "FPREARRIVALDATE")] public DateTime? Fprearrivaldate { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")] public string? FdemandbillnoLine { get; set; } } MES.Service/service/BasicData/MesRohInManager.cs
@@ -37,15 +37,15 @@ private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); var decimals = mesRohInDatas.Select(s => s.Guid).ToArray(); var update = db.Deleteable<MesRohIn>() .Where(a => a.Id == mesRohIn.Id) .Where(a => a.Guid == mesRohIn.Guid) .ExecuteCommand() > 0; var insertOrUpdate = db .Deleteable<MesRohInData>() .Where(s => decimals.Contains(s.Id)) .Where(s => decimals.Contains(s.Guid)) .ExecuteCommand() > 0; if (update && insertOrUpdate) return true; @@ -56,16 +56,22 @@ private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { if (mesRohIn.Id != null) db.Deleteable<MesRohIn>().Where(s => s.Id == mesRohIn.Id) if (mesRohIn.Guid != null) db.Deleteable<MesRohIn>().Where(s => s.Guid == mesRohIn.Guid) .ExecuteCommand(); if (mesRohInDatas.Count > 0) db.Deleteable<MesRohInData>() .Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); var orUpdate = base.Insert(mesRohIn); var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); var orUpdate = db.Insertable(mesRohIn) .IgnoreColumns(true).ExecuteCommand() > 0; var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1) .IgnoreColumnsNull() .ExecuteCommand() > 0; if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("插入或更新失败"); } @@ -83,8 +89,9 @@ var eid = long.Parse(rohIn.id); var mesRohIn = new MesRohIn(); var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; if (single != null) mesRohIn.Guid = single.Guid; mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; @@ -155,7 +162,7 @@ { var entity = new MesRohInData { EbelnK3id = Convert.ToDecimal(s.id), EbelnK3id = Convert.ToDecimal(s.id), ErpId = Convert.ToDecimal(s.Eid), BillNo = s.FBillNo, ItemId = s.FMaterialId, @@ -201,7 +208,8 @@ TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //累计入库数 RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty), TotalReturnedQty = Convert.ToDecimal(s.FMrbQty), ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数 SourceDocumentType = s.FSrcBillTypeId, SourceDocumentId = s.FSrcBillNo, @@ -224,7 +232,7 @@ var single = rohInDataManager.GetSingle(it => it.EbelnK3id == entity.EbelnK3id); if (single != null) entity.Id = single.Id; if (single != null) entity.Guid = single.Guid; return entity; }).ToList();
