| MES.Service/Dto/webApi/ErpRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Dto/webApi/ErpRohinData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Dto/webApi/ErpSupplier.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohInData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesStaffManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesSupplierManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Dto/webApi/ErpRohIn.cs
@@ -18,7 +18,7 @@ public string? FSettleId { get; set; } public string? FChargeId { get; set; } public string? FProviderEMail { get; set; } public string? F_XIFG_Text_qtr1 { get; set; } public string? Remarks { get; set; } public string? FCancelStatus { get; set; } public string? FCancellerId { get; set; } public string? FCancelDate { get; set; } @@ -29,7 +29,16 @@ public string? FApproverId { get; set; } public string? FApproveDate { get; set; } public string? FChangeReason { get; set; } public string? FPREARRIVALDATE { get; set; } public string? Prearrivaldate { get; set; } public string? FReceiveOrgId { get; set; } public string? F_XIFG_PrintTimes_qtr { get; set; } public string? FProviderId { get; set; } public string? FTContact { get; set; } public string? Fmobilephone { get; set; } public string? FixedTelephone { get; set; } public string? Address { get; set; } public string? Acctype { get; set; } } MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,14 +5,13 @@ public string id { get; set; } public string Eid { get; set; } public string? FBillNo { get; set; } public string? F_XIFG_Text_k79 { get; set; } public string? FDEMANDBILLNO { get; set; } public string? FSEQ { get; set; } public string? FMaterialId { get; set; } public string? FUnitId { get; set; } public string? FQty { get; set; } public string? FStockUnitID { get; set; } public string? FPriceUnitId { get; set; } public string? FPriceUnitQty { get; set; } public string? FDeliveryDate { get; set; } public string? FDeliveryEarlyDate { get; set; } @@ -21,8 +20,9 @@ public string? FRequireDeptId { get; set; } public string? FReceiveOrgId { get; set; } public string? FReceiveDeptId { get; set; } public string? FEntrySettleOrgId { get; set; } public string? FSETTLEORGID { get; set; } public string? FGiveAway { get; set; } public string? Fnote { get; set; } public string? FEntryNote { get; set; } public string? FSupMatId { get; set; } public string? FSupMatName { get; set; } @@ -35,24 +35,21 @@ public string? FMRPTerminateStatus { get; set; } public string? FTerminaterId { get; set; } public string? FTerminateDate { get; set; } public string? FBASERECEIVEQTY { get; set; } public string? FEntrySettleOrgId { get; set; } public string? FRemainReceiveQty { get; set; } public string? FBASESTOCKINQTY { get; set; } public string? FReceiveQty { get; set; } //累计收料 public string? FRemainStockINQty { get; set; } public string? FMrbQty { get; set; } public string? FBASECHECKRETQTY { get; set; } public string? FBASESTOCKRETQTY { get; set; } public string? FStockInQty { get; set; } //累计入库数 public string? FCHECKRETQTY { get; set; } //收料可退数 public string? FSTOCKRETQTY { get; set; } //库存可退数 public string? FSrcBillTypeId { get; set; } public string? FSourceBillNo { get; set; } public string? FSrcBillNo { get; set; } public string? FReqTraceNo { get; set; } public string? FMtoNo { get; set; } public string? FChangeFlag { get; set; } public string? FDEMANDTYPE { get; set; } public string? FDEMANDBILLNO { get; set; } public string? FDEMANDBILLENTRYSEQ { get; set; } public string? FPREARRIVALDATE { get; set; } public string? F_XIFG_Text_ne1 { get; set; } public string? F_XIFG_Text_6oq { get; set; } public string? F_XIFG_Base_c1c { get; set; } public string? F_XIFG_Text_qtr4 { get; set; } } MES.Service/Dto/webApi/ErpSupplier.cs
@@ -7,11 +7,10 @@ public string? FNumber { get; set; } public string? FShortName { get; set; } public string? FName { get; set; } public string? FContact { get; set; } public string? FTel { get; set; } public string? FTContact { get; set; } public string? Fmobilephone { get; set; } public string? FStaffId { get; set; } public string? FForbidStatus { get; set; } public string? FUseOrgId { get; set; } public string? FCreateOrgId { get; set; } public string? FDescription { get; set; } } MES.Service/Modes/MesRohIn.cs
@@ -19,7 +19,7 @@ /// SEQ_BASEINFO_ID /// </summary> [SugarColumn(ColumnName = "ID")] public long Id { get; set; } public long? Id { get; set; } /// <summary> /// 采购单号 @@ -209,10 +209,9 @@ /// <summary> /// 审核标识 /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "CHECK_FALG")] public bool? CheckFalg { get; set; } public int? CheckFalg { get; set; } /// <summary> /// 打印次数 @@ -245,38 +244,68 @@ public string? Remark5 { get; set; } /// <summary> /// 变更原因 /// /// </summary> [SugarColumn(ColumnName = "CHANGEREASON")] public string? Changereason { get; set; } /// <summary> /// 工厂 /// /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// 公司编号 /// /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// 邮箱 /// </summary> [SugarColumn(ColumnName = "EMAIL")] public string? Emall { get; set; } /// <summary> /// 到货日期 /// /// </summary> [SugarColumn(ColumnName = "Prearrivaldate")] public DateTime? Prearrivaldate { get; set; } /// <summary> /// 收料组织 /// /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "Provider_Id")] public string? ProviderId { get; set; } /// <summary> /// 联系人 ///</summary> [SugarColumn(ColumnName = "anred")] public string? Anred { get; set; } /// <summary> /// 电话 ///</summary> [SugarColumn(ColumnName = "telf1")] public string? Telf1 { get; set; } /// <summary> /// 固定电话 ///</summary> [SugarColumn(ColumnName = "Fixed_Telephone")] public string? FixedTelephone { get; set; } /// <summary> /// 通讯地址 ///</summary> [SugarColumn(ColumnName = "Address")] public string? Address { get; set; } /// <summary> /// 验收方式 ///</summary> [SugarColumn(ColumnName = "Acctype")] public string? Acctype { get; set; } } MES.Service/Modes/MesRohInData.cs
@@ -9,7 +9,7 @@ public class MesRohInData { /// <summary> /// 主键 /// /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] @@ -130,25 +130,25 @@ public string? SupplierItemName { get; set; } /// <summary> /// 委外订单号 /// 委外订单编号 /// </summary> [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")] public string? OutsourcingOrderId { get; set; } /// <summary> /// 批次号 /// 批号 /// </summary> [SugarColumn(ColumnName = "BATCH_NUMBER")] public string? BatchNumber { get; set; } /// <summary> /// 业务关闭标识 /// 业务关闭 /// </summary> [SugarColumn(ColumnName = "BUSINESS_CLOSE")] public string? BusinessClose { get; set; } /// <summary> /// 业务冻结标识 /// 业务冻结 /// </summary> [SugarColumn(ColumnName = "BUSINESS_FREEZE")] public string? BusinessFreeze { get; set; } @@ -166,7 +166,7 @@ public DateTime? FreezeTime { get; set; } /// <summary> /// 业务终止标识 /// 业务终止 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TERMINATE")] public string? BusinessTerminate { get; set; } @@ -184,19 +184,19 @@ public DateTime? TerminateTime { get; set; } /// <summary> /// 总已收数量 /// 累计收料数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")] public decimal? TotalReceivedQty { get; set; } /// <summary> /// 剩余收货数量 /// 剩余收料数量 /// </summary> [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")] public decimal? RemainingReceivedQty { get; set; } /// <summary> /// 总已入库数量 /// 累计入库数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_STORED_QTY")] public decimal? TotalStoredQty { get; set; } @@ -208,31 +208,31 @@ public decimal? RemainingStoredQty { get; set; } /// <summary> /// 总退货数量 /// 累计退料数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")] public decimal? TotalReturnedQty { get; set; } /// <summary> /// 可退收货数量 /// 收料可退数量 /// </summary> [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")] public decimal? ReturnableReceivedQty { get; set; } /// <summary> /// 可退入库数量 /// 库存可退数量 /// </summary> [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")] public decimal? ReturnableStoredQty { get; set; } /// <summary> /// 来源单据类型 /// 源单类型 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")] public string? SourceDocumentType { get; set; } /// <summary> /// 来源单据号 /// 源单单号 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")] public string? SourceDocumentId { get; set; } @@ -250,7 +250,7 @@ public string? PlanTrackingId { get; set; } /// <summary> /// 变更标识 /// 变更标志 /// </summary> [SugarColumn(ColumnName = "CHANGE_FLAG")] public string? ChangeFlag { get; set; } @@ -262,7 +262,7 @@ public string? DemandSource { get; set; } /// <summary> /// 需求单据号 /// 需求单据编号 /// </summary> [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")] public string? DemandDocumentId { get; set; } @@ -274,98 +274,80 @@ public string? DemandDocumentLineId { get; set; } /// <summary> /// 采购订单行号（K3系统） /// ERP的ID号 /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } /// <summary> /// 备注1 /// 客户货号 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string? Remark1 { get; set; } /// <summary> /// 备注2 /// 包装单号 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string? Remark2 { get; set; } /// <summary> /// 备注3 /// 主产品 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string? Remark3 { get; set; } /// <summary> /// 备注4 /// SMT备注 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string? Remark4 { get; set; } /// <summary> /// 备注5 /// </summary> [SugarColumn(ColumnName = "REMARK5")] public string? Remark5 { get; set; } /// <summary> /// 主键ID /// /// </summary> [SugarColumn(ColumnName = "ID")] public long Id { get; set; } public decimal? Id { get; set; } /// <summary> /// ERP系统中的ID /// /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } /// <summary> /// 采购订单行号 /// /// </summary> [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")] public string? PurchaseOrderLineNumber { get; set; } /// <summary> /// 需求组织（扩展） /// /// </summary> [SugarColumn(ColumnName = "DEMAND")] public string? Demand { get; set; } /// <summary> /// 收料组织（扩展） /// /// </summary> [SugarColumn(ColumnName = "RECEIVING")] public string? Receiving { get; set; } /// <summary> /// 结算组织（扩展） /// /// </summary> [SugarColumn(ColumnName = "SETTLEMENT")] public string? Settlement { get; set; } /// <summary> /// 预留字段CGB014 /// /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "CGB014")] public decimal? Cgb014 { get; set; } /// <summary> /// 工厂 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// 公司编号 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// 需求部门 /// /// </summary> [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")] public string? DemandDepartment { get; set; } @@ -377,8 +359,14 @@ public string? ReceivingDepartment { get; set; } /// <summary> /// 预计到货时间 /// /// </summary> [SugarColumn(ColumnName = "prearrivaldate")] public DateTime? prearrivaldate { get; set; } [SugarColumn(ColumnName = "FPREARRIVALDATE")] public DateTime? Fprearrivaldate { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")] public string? FdemandbillnoLine { get; set; } } MES.Service/service/BasicData/MesRohInManager.cs
@@ -104,8 +104,8 @@ mesRohIn.Purchaser = rohIn.FPurchaserId; mesRohIn.SettlementParty = rohIn.FSettleId; mesRohIn.PaymentParty = rohIn.FChargeId; mesRohIn.Emall = rohIn.FProviderEMail; mesRohIn.Remarks = rohIn.F_XIFG_Text_qtr1; mesRohIn.Email = rohIn.FProviderEMail; mesRohIn.Remarks = rohIn.Remarks; mesRohIn.CancellationStatus = rohIn.FCancelStatus; mesRohIn.CancellationPerson = rohIn.FCancellerId; @@ -129,14 +129,20 @@ mesRohIn.ErpCheckBy = rohIn.FApproverId; mesRohIn.ErpCheckDate = rohIn.FApproveDate; mesRohIn.Changereason = rohIn.FChangeReason; mesRohIn.Prearrivaldate = rohIn.FPREARRIVALDATE != null ? DateTime.ParseExact(rohIn.FPREARRIVALDATE, mesRohIn.Prearrivaldate = rohIn.Prearrivaldate != null ? DateTime.ParseExact(rohIn.Prearrivaldate, "yyyy-MM-dd HH:mm:ss", null) : null; mesRohIn.ReceiveOrgId = rohIn.FReceiveOrgId; mesRohIn.ProviderId = rohIn.FProviderId; mesRohIn.Remark1 = rohIn.F_XIFG_PrintTimes_qtr; mesRohIn.Anred = rohIn.FTContact; mesRohIn.Telf1 = rohIn.Fmobilephone; mesRohIn.FixedTelephone = rohIn.FixedTelephone; mesRohIn.Address = rohIn.Address; mesRohIn.Acctype = rohIn.Acctype; return mesRohIn; } @@ -152,14 +158,12 @@ EbelnK3id = Convert.ToDecimal(s.id), ErpId = Convert.ToDecimal(s.Eid), BillNo = s.FBillNo, SalesOrderId = s.F_XIFG_Text_k79, ItemId = s.FMaterialId, PurchaseUnit = s.FUnitId, PurchaseQty = Convert.ToDecimal(s.FQty), InventoryUnit = s.FStockUnitID, PricingUnit = s.FPriceUnitId, PricingQty = Convert.ToDecimal(s.FPriceUnitQty), DeliveryDate = s.FDeliveryDate != null ? DateTime.ParseExact(s.FDeliveryDate, "yyyy-MM-dd HH:mm:ss", null) @@ -172,11 +176,6 @@ ? DateTime.ParseExact(s.FDeliveryLastDate, "yyyy-MM-dd HH:mm:ss", null) : null, DemandOrg = s.FRequireOrgId, DemandDepartment = s.FRequireDeptId, ReceivingOrg = s.FReceiveOrgId, ReceivingDepartment = s.FReceiveDeptId, SettlementOrg = s.FEntrySettleOrgId, IsGift = s.FGiveAway, Remarks = s.FEntryNote, SupplierItemCode = s.FSupMatId, @@ -196,32 +195,31 @@ ? DateTime.ParseExact(s.FTerminateDate, "yyyy-MM-dd HH:mm:ss", null) : null, TotalReceivedQty = Convert.ToDecimal(s.FBASERECEIVEQTY), //累计收料数 TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //累计收料数 RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty), TotalStoredQty = Convert.ToDecimal(s.FBASESTOCKINQTY), //累计入库数 TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //累计入库数 RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty), TotalReturnedQty = Convert.ToDecimal(s.FMrbQty), ReturnableReceivedQty = Convert.ToDecimal(s.FBASECHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FBASESTOCKRETQTY), //库存可退数 ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数 SourceDocumentType = s.FSrcBillTypeId, SourceDocumentId = s.FSourceBillNo, SourceDocumentId = s.FSrcBillNo, DemandTrackingId = s.FReqTraceNo, PlanTrackingId = s.FMtoNo, ChangeFlag = s.FChangeFlag, DemandSource = s.FDEMANDTYPE, DemandDocumentId = s.FDEMANDBILLNO, DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ, prearrivaldate = s.FTerminateDate != null ? DateTime.ParseExact(s.FPREARRIVALDATE, "yyyy-MM-dd HH:mm:ss", null) : null, Remark1 = s.F_XIFG_Text_ne1, Remark2 = s.F_XIFG_Text_6oq, Remark3 = s.F_XIFG_Base_c1c, Remark4 = s.F_XIFG_Text_qtr4 DemandOrg = s.FRequireOrgId, ReceivingOrg = s.FReceiveOrgId, SettlementOrg = s.FEntrySettleOrgId, PurchaseOrderLineNumber = s.FSEQ, Demand = s.FRequireOrgId, Receiving = s.FReceiveOrgId, Settlement = s.FSETTLEORGID, DemandDepartment = s.FRequireDeptId, ReceivingDepartment = s.FReceiveDeptId }; var single = rohInDataManager.GetSingle(it => MES.Service/service/BasicData/MesStaffManager.cs
@@ -27,7 +27,6 @@ break; case "2": case "4": DeleteStaff(db, sysUser, entity.Id); if (InsertOrUpdateStaff(db, sysUser, entity)) // 插入或更新员工 return 1; break; @@ -62,6 +61,12 @@ private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser, MesStaff entity) { db.Deleteable<SysUser>() .Where(s => s.Account == sysUser.Account).ExecuteCommand(); db.Deleteable<MesStaff>() .Where(s => s.Id == entity.Id).ExecuteCommand(); var insertUser = db.Insertable(sysUser).ExecuteCommand(); if (insertUser <= 0) return false; var insertStaff = db.Insertable(entity).ExecuteCommand(); @@ -231,12 +236,6 @@ private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList, List<MesStaff> staffList) { foreach (var sysUser in userList) { var entity = staffList.First(s => s.StaffNo == sysUser.Account); if (!InsertOrUpdateStaff(db, sysUser, entity)) return false; } return true; return !(from sysUser in userList let entity = staffList.First(s => s.StaffNo == sysUser.Account) where !InsertOrUpdateStaff(db, sysUser, entity) select sysUser).Any(); } } MES.Service/service/BasicData/MesSupplierManager.cs
@@ -123,12 +123,11 @@ SuppNo = supplier.FNumber, SuppSname = supplier.FShortName, SuppName = supplier.FName, Lxr = supplier.FContact, Telf1 = supplier.FTel, Lxr = supplier.FTContact, Telf1 = supplier.Fmobilephone, Fstaffid = supplier.FStaffId, Fforbidstatus = supplier.FForbidStatus, Type = supplier.Type, Remark = supplier.FDescription, FSubsidiary = supplier.FUseOrgId, Fumbrella = supplier.FCreateOrgId, CreateDate = DateTime.Now,
