MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -5,8 +5,8 @@ public string? Type { get; set; } public string? F_UNW_Text_xsddh { get; set; } // 销售订单号 public string? FMaterialId { get; set; } // 物料编码 public string? FMaterialName { get; set; } // 物料名称 public string? FMaterialModel { get; set; } // 规格型号 //public string? FMaterialName { get; set; } // 物料名称 //public string? FMaterialModel { get; set; } // 规格型号 public string? FUnitID { get; set; } // 销售单位 public string? FQty { get; set; } // 销售数量 public string? FIsFree { get; set; } // 是否赠品 @@ -14,12 +14,12 @@ public string? FStockId { get; set; } // 仓库 public string? FMtoNo { get; set; } // 计划跟踪号 public string? FLot { get; set; } // 批号 public string? FEntryDescription { get; set; } // 备注 public string? FRmType { get; set; } // 退货类型 //public string? FEntryDescription { get; set; } // 备注 //public string? FRmType { get; set; } // 退货类型 public string? F_UNW_Base_GDY { get; set; } // 跟单员 public string? FStockUnitID { get; set; } // 库存单位 public decimal? FStockQty { get; set; } // 库存数量 public string? FMaterialType { get; set; } // 物料类别 // public string? FMaterialType { get; set; } // 物料类别 public string? FOwnerTypeID { get; set; } // 货主类型 public string? FOwnerId { get; set; } // 货主 public string? FSrcType { get; set; } // 源单类型 @@ -39,8 +39,6 @@ public string? FTerminateDate { get; set; } // 业务终止日期 public decimal? FSumOutQty { get; set; } // 累计出库数量 public decimal? FRemainOutQty { get; set; } // 未出库数量 public string? ErpID { get; set; } // ERPID public string? EHID { get; set; } // ERP头ID MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
@@ -40,5 +40,6 @@ public string? FCancelStatus { get; set; } // 作废状态 public string? FCancellerId { get; set; } // 作废人 public string? FCancelDate { get; set; } // 作废日期 public string? FDocumentStatus { get; set; } // 单据状态 } MES.Service/Dto/webApi/ErpSalesReturnDto.cs
@@ -38,4 +38,5 @@ public string? FCancellerId { get; set; } // 作废人 public string? FCancelDate { get; set; } // 作废日期 public string? FBillCloseStatus { get; set; } // 关闭状态 public string? FDocumentStatus { get; set; } // 单据状态 } MES.Service/Modes/SalesDeliveryNotice.cs
@@ -225,5 +225,12 @@ ///</summary> [SugarColumn(ColumnName="ERP_ID" )] public string ErpId { get; set; } /// <summary> /// 单据状态 ///</summary> [SugarColumn(ColumnName = "BILL_STATUS")] public string BillStatus { get; set; } } } MES.Service/Modes/SalesReturnNotice.cs
@@ -205,5 +205,10 @@ ///</summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } /// <summary> /// 单据状态 ///</summary> [SugarColumn(ColumnName = "BILL_STATUS")] public string BillStatus { get; set; } } } MES.Service/bin/Debug/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdbBinary files differ
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -142,6 +142,7 @@ CancelledBy = erpDto.FCancellerId, // 作废人 CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 作废日期 CloseStatus = erpDto.FBillCloseStatus, // 关闭状态 BillStatus = erpDto.FDocumentStatus //单据状态 }; @@ -181,8 +182,8 @@ ErpHeadId = erpDto.EHID,//ERP头ID SalesOrderId = erpDto.F_UNW_Text_xsddh,//销售订单号 MaterialId = erpDto.FMaterialId,//物料编号 MaterialName = erpDto.FMaterialName,// 物料名称 MaterialSpecification = erpDto.FMaterialModel,//规格型号 // MaterialName = erpDto.FMaterialName,// 物料名称 //MaterialSpecification = erpDto.FMaterialModel,//规格型号 SalesUnitId = erpDto.FUnitID,//销售单位 SalesQuantity = Convert.ToDecimal(erpDto.FQty),//销售数量 IsFree = erpDto.FIsFree,//是否赠品 @@ -195,7 +196,7 @@ OwnerId = erpDto.FOwnerIdHead,//货主 InventoryUnit = erpDto.FStockUnitID,//库存单位 InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//库存数量 MaterialCategory = erpDto.FMaterialType,//物料类别 //MaterialCategory = erpDto.FMaterialType,//物料类别 PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate),//计划发货日期 OutLmtUnit = erpDto.FOutLmtUnit,//超发控制单位 OutMaxQty = erpDto.FOutMaxQty,//出库上限 MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -135,7 +135,8 @@ CancelledBy = erpDto.FCancellerId, // 作废人 CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 作废日期 CloseStatus = erpDto.FBillCloseStatus, // 关闭状态 BillStatus = erpDto.FDocumentStatus //单据状态 }; var single = base.GetSingle(it => it.ErpId == erpDto.ErpID); MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@ </PropertyGroup> <PropertyGroup> <ActiveDebugProfile>IIS Express</ActiveDebugProfile> <NameOfLastUsedPublishProfile>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>F:\F盘桌面专属\项目代码管理文件夹\上格项目\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> </PropertyGroup> </Project> MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@ --> <Project> <PropertyGroup> <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl> <History>True|2024-11-26T01:07:33.5654976Z||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History> <_PublishTargetUrl>F:\F盘桌面专属\项目代码管理文件夹\上格项目\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl> <History>True|2024-12-06T08:11:01.2090466Z;True|2024-11-26T09:07:33.5654976+08:00;True|2024-11-20T15:49:27.1100474+08:00;True|2024-11-16T18:18:42.4224922+08:00;True|2024-11-15T09:32:12.6287354+08:00;True|2024-11-13T10:19:32.3283327+08:00;True|2024-09-06T14:40:56.3762241+08:00;True|2024-08-20T17:12:00.2924570+08:00;True|2024-08-17T10:57:05.6670396+08:00;True|2024-08-17T10:56:46.8068041+08:00;True|2024-08-16T14:09:17.0526491+08:00;True|2024-08-15T08:40:32.8134665+08:00;True|2024-08-14T10:00:27.7017207+08:00;True|2024-08-14T08:54:44.8284031+08:00;True|2024-08-07T10:32:10.3689256+08:00;True|2024-08-05T15:45:03.0864530+08:00;True|2024-08-03T09:59:13.7916520+08:00;True|2024-07-31T17:27:28.1965929+08:00;True|2024-07-31T15:27:34.7943845+08:00;True|2024-07-30T15:04:50.5849235+08:00;True|2024-07-30T14:09:06.2877325+08:00;True|2024-07-29T16:11:30.4493940+08:00;True|2024-07-23T14:30:34.4591002+08:00;True|2024-07-22T14:17:39.8186158+08:00;True|2024-04-10T12:55:31.3963752+08:00;True|2024-04-08T13:59:25.5487203+08:00;True|2024-04-06T09:30:09.5350539+08:00;True|2024-04-06T08:46:05.8814658+08:00;True|2024-04-05T14:06:52.0448024+08:00;True|2024-04-05T12:47:46.0561601+08:00;True|2024-02-26T08:46:22.0988887+08:00;True|2024-02-24T19:17:13.6770376+08:00;True|2024-02-24T14:32:37.4450337+08:00;True|2024-02-23T10:22:06.5150173+08:00;True|2024-02-22T13:19:56.6997993+08:00;True|2024-02-22T10:53:17.7929585+08:00;True|2024-02-21T17:08:06.5553444+08:00;True|2024-02-19T16:24:37.4912012+08:00;True|2024-02-02T10:07:23.2726075+08:00;True|2024-02-02T08:36:49.2904460+08:00;True|2024-01-29T17:44:43.6800769+08:00;True|2024-01-23T09:47:26.7811926+08:00;True|2024-01-18T16:23:30.3373836+08:00;True|2024-01-17T14:22:04.2552286+08:00;True|2024-01-16T16:54:42.2316892+08:00;True|2024-01-16T16:37:23.8028858+08:00;True|2024-01-16T09:25:24.4007775+08:00;True|2024-01-15T10:18:57.3362616+08:00;True|2024-01-15T10:07:14.2044763+08:00;True|2024-01-10T14:03:36.4451130+08:00;True|2024-01-09T16:45:32.9601815+08:00;True|2024-01-06T14:16:34.2732220+08:00;True|2024-01-06T14:11:45.2134717+08:00;True|2024-01-06T11:30:58.9198887+08:00;</History> <LastFailureDetails /> </PropertyGroup> </Project> MESApplication/bin/Debug/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -606,37 +606,37 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetList"> <summary> 获取所有 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetById(System.Int32)"> <summary> 根据主键获取 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.DeleteByIds(System.Object[])"> <summary> 根据主键删除 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)"> <summary> 添加 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)"> <summary> 添加返回自增 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)"> <summary> 修改 </summary> @@ -750,6 +750,78 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList"> <summary> 获取所有 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)"> <summary> 根据主键获取 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])"> <summary> 根据主键删除 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)"> <summary> 添加 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)"> <summary> 添加返回自增 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)"> <summary> 修改 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetList"> <summary> 获取所有 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetById(System.Int32)"> <summary> 根据主键获取 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])"> <summary> 根据主键删除 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)"> <summary> 添加 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)"> <summary> 添加返回自增 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)"> <summary> 修改 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList"> <summary> 获取所有 MESApplication/bin/Release/net8.0/publish/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -606,37 +606,37 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetList"> <summary> 获取所有 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetById(System.Int32)"> <summary> 根据主键获取 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.DeleteByIds(System.Object[])"> <summary> 根据主键删除 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)"> <summary> 添加 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)"> <summary> 添加返回自增 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)"> <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)"> <summary> 修改 </summary> @@ -750,6 +750,78 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList"> <summary> 获取所有 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)"> <summary> 根据主键获取 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])"> <summary> 根据主键删除 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)"> <summary> 添加 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)"> <summary> 添加返回自增 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)"> <summary> 修改 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetList"> <summary> 获取所有 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetById(System.Int32)"> <summary> 根据主键获取 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])"> <summary> 根据主键删除 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)"> <summary> 添加 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)"> <summary> 添加返回自增 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)"> <summary> 修改 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList"> <summary> 获取所有
