iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingInput.cs
@@ -6,7 +6,7 @@ { /// <summary> /// å è£ å ³ç³»åºç¡è¡¨æ¥è¯¢åæ° /// 容å¨å ³ç³»åºç¡è¡¨æ¥è¯¢åæ° /// </summary> public class WmsContainerPackagingSearch : PageInputBase { @@ -63,7 +63,7 @@ } /// <summary> /// å è£ å ³ç³»åºç¡è¡¨ä¸å页æ¥è¯¢åæ° /// 容å¨å ³ç³»åºç¡è¡¨ä¸å页æ¥è¯¢åæ° /// </summary> public class WmsContainerPackagingSearchNonPage : PageInputNonPageBase { @@ -120,7 +120,7 @@ } /// <summary> /// å è£ å ³ç³»åºç¡è¡¨è¾å ¥åæ° /// 容å¨å ³ç³»åºç¡è¡¨è¾å ¥åæ° /// </summary> public class WmsContainerPackagingInput { @@ -163,21 +163,21 @@ } /// <summary> /// å è£ å ³ç³»åºç¡è¡¨æ°å¢åæ° /// 容å¨å ³ç³»åºç¡è¡¨æ°å¢åæ° /// </summary> public class AddWmsContainerPackagingInput : WmsContainerPackagingInput { } /// <summary> /// å è£ å ³ç³»åºç¡è¡¨å é¤åæ° /// 容å¨å ³ç³»åºç¡è¡¨å é¤åæ° /// </summary> public class DeleteWmsContainerPackagingInput : BaseId { } /// <summary> /// å è£ å ³ç³»åºç¡è¡¨æ´æ°åæ° /// 容å¨å ³ç³»åºç¡è¡¨æ´æ°åæ° /// </summary> public class UpdateWmsContainerPackagingInput : WmsContainerPackagingInput { @@ -190,7 +190,7 @@ } /// <summary> /// å è£ å ³ç³»åºç¡è¡¨è·åå个åæ° /// 容å¨å ³ç³»åºç¡è¡¨è·åå个åæ° /// </summary> public class QueryeWmsContainerPackagingInput : BaseId { iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingOutput.cs
@@ -4,7 +4,7 @@ namespace Admin.NET.Application { /// <summary> /// å è£ å ³ç³»åºç¡è¡¨è¾åºåæ° /// 容å¨å ³ç³»åºç¡è¡¨è¾åºåæ° /// </summary> public class WmsContainerPackagingOutput { iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/WmsContainerPackagingService.cs
@@ -16,7 +16,7 @@ namespace Admin.NET.Application { /// <summary> /// å è£ å ³ç³»åºç¡è¡¨æå¡ /// 容å¨å ³ç³»åºç¡è¡¨æå¡ /// </summary> [ApiDescriptionSettings("WmsBase", Name = "WmsContainerPackaging", Order = 100)] [Route("api")] @@ -42,7 +42,7 @@ } /// <summary> /// å页æ¥è¯¢å è£ å ³ç³»åºç¡è¡¨ /// å页æ¥è¯¢å®¹å¨å ³ç³»åºç¡è¡¨ /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -67,10 +67,10 @@ } /// <summary> /// ä¸å页æ¥è¯¢å è£ å ³ç³»åºç¡è¡¨å表 /// ä¸å页æ¥è¯¢å®¹å¨å ³ç³»åºç¡è¡¨å表 /// </summary> /// <param name="input">å è£ å ³ç³»åºç¡è¡¨æ¥è¯¢åæ°</param> /// <returns>(å è£ å ³ç³»åºç¡è¡¨)å®ä¾å表</returns> /// <param name="input">容å¨å ³ç³»åºç¡è¡¨æ¥è¯¢åæ°</param> /// <returns>(容å¨å ³ç³»åºç¡è¡¨)å®ä¾å表</returns> [HttpGet("WmsContainerPackaging/listNonPage")] public async Task<List<WmsContainerPackagingOutput>> ListNonPageAsync([FromQuery] WmsContainerPackagingSearchNonPage input) { @@ -102,7 +102,7 @@ } /// <summary> /// è·åå è£ å ³ç³»åºç¡è¡¨ /// è·å容å¨å ³ç³»åºç¡è¡¨ /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -113,7 +113,7 @@ } /// <summary> /// è·åå è£ å ³ç³»åºç¡è¡¨å表 /// è·å容å¨å ³ç³»åºç¡è¡¨å表 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -126,7 +126,7 @@ #region å¢ãå ãæ¹ /// <summary> /// å¢å å è£ å ³ç³»åºç¡è¡¨ /// å¢å 容å¨å ³ç³»åºç¡è¡¨ /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -144,7 +144,7 @@ } /// <summary> /// å é¤å è£ å ³ç³»åºç¡è¡¨ /// å é¤å®¹å¨å ³ç³»åºç¡è¡¨ /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -157,7 +157,7 @@ } /// <summary> /// æ´æ°å è£ å ³ç³»åºç¡è¡¨ /// æ´æ°å®¹å¨å ³ç³»åºç¡è¡¨ /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -182,7 +182,7 @@ #region å¯¼å ¥ /// <summary> /// Excel模æ¿å¯¼å ¥å è£ å ³ç³»åºç¡è¡¨åè½ /// Excel模æ¿å¯¼å ¥å®¹å¨å ³ç³»åºç¡è¡¨åè½ /// </summary> /// <param name="file">Excel模æ¿æ件</param> /// <returns>å¯¼å ¥çè®°å½æ°</returns> @@ -378,7 +378,7 @@ } /// <summary> /// æ ¹æ®çæ¬ä¸è½½å è£ å ³ç³»åºç¡è¡¨çExcelå¯¼å ¥æ¨¡æ¿ /// æ ¹æ®çæ¬ä¸è½½å®¹å¨å ³ç³»åºç¡è¡¨çExcelå¯¼å ¥æ¨¡æ¿ /// </summary> /// <param name="version">模æ¿çæ¬</param> /// <returns>ä¸è½½ç模æ¿æ件</returns> @@ -386,7 +386,7 @@ public IActionResult DownloadExcelTemplate([FromQuery] string version) { string _path = TemplateConst.EXCEL_TEMPLATEFILE_å¯¼å ¥æ¨¡çè·¯å¾ + $"\\WmsContainerPackaging{TemplateConst.EXCEL_TEMPLATEFILE_å¯¼å ¥æ¨¡çå称åç¼}.xlsx"; var fileName = HttpUtility.UrlEncode($"å¯¼å ¥æ¨¡æ¿(å è£ å ³ç³»åºç¡è¡¨).xlsx", Encoding.GetEncoding("UTF-8")); var fileName = HttpUtility.UrlEncode($"å¯¼å ¥æ¨¡æ¿(容å¨å ³ç³»åºç¡è¡¨).xlsx", Encoding.GetEncoding("UTF-8")); return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName }; }
@@ -417,4 +417,31 @@ { } /// <summary> /// æ°å¢ç©æä¸å¡ä¿¡æ¯å®ä½å ¥å--å å«ç©æãç©æ客æ·å ³ç³»ãæ§å¶å±æ§ãæ¿ä»£å /// </summary> public class AddWmsMaterialInfoInput { /// <summary> /// ç©æåºç¡ä¿¡æ¯ /// </summary> public WmsMaterialInput MaterialInput { get; set; } /// <summary> /// æ§å¶å±æ§è§åID /// </summary> public long ControlRuleld { get; set; } /// <summary> /// æ¿ä»£å /// </summary> public List<WmsSubstituteGood> SubstituteGoodList { get; set; } /// <summary> /// ç©æ客æ·å ³ç³»è¡¨ /// </summary> public List<WmsMaterialCustomer> MaterialCustomerList { get; set; } } } iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs
@@ -13,7 +13,7 @@ Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input); Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input); Task Add(AddWmsMaterialInput input); Task Add(AddWmsMaterialInfoInput input); Task Update(UpdateWmsMaterialInput input); Task Delete(DeleteWmsMaterialInput input); Task<int> ImportExcelAsync(IFormFile file); iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -170,15 +170,25 @@ #region å¢ãå ãæ¹ /// <summary> /// å¢å ç©æä¿¡æ¯è¡¨ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost("WmsMaterial/add")] public async Task Add(AddWmsMaterialInput input) public async Task Add(AddWmsMaterialInfoInput input) { var wmsMaterial = input.Adapt<WmsMaterial>(); //ç©æä¿¡æ¯ var wmsMaterial = input.MaterialInput.Adapt<WmsMaterial>(); //æ§å¶è§åä¿¡æ¯ var controlRuleld = input.ControlRuleld; //ç©æ客æ·å ³èä¿¡æ¯ var materialCustomerList = input.MaterialCustomerList.Adapt<WmsMaterialCustomer>(); //æ¿ä»£åä¿¡æ¯ var substituteGoodList = input.SubstituteGoodList.Adapt<WmsSubstituteGood>(); //éªè¯ await CheckExisit(wmsMaterial);
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,83 @@ using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; /* * @author : åæå¥ * @date : 2024/4/23ä¸å4:29:28 * @desc : 容å¨å ³ç³»åºç¡è¡¨ */ namespace Admin.NET.Core { /// <summary> /// 容å¨å ³ç³»åºç¡è¡¨ /// </summary> [Table("wms_container_packaging")] [Comment("容å¨å ³ç³»åºç¡è¡¨")] public class WmsContainerPackaging : DEntityBase { /// <summary> /// 容å¨ç±»åID /// </summary> [Comment("容å¨ç±»åID")] [Required] public long ContainerTypeId { get; set; } /// <summary> /// 容å¨ç±»åå称 /// </summary> [Comment("容å¨ç±»åå称")] [Required] [MaxLength(255)] public string ContainerTypeName { get; set; } /// <summary> /// ç©æç±»åID /// </summary> [Comment("ç©æç±»åID")] [Required] public long MaterialTypeId { get; set; } /// <summary> /// ç©æç±»åç¼å· /// </summary> [Comment("ç©æç±»åç¼å·")] [Required] [MaxLength(255)] public string MaterialTypeCode { get; set; } /// <summary> /// ç©æç±»åå称 /// </summary> [Comment("ç©æç±»åå称")] [Required] [MaxLength(255)] public string MaterialTypeName { get; set; } /// <summary> /// ç©æ容å¨å®¹é /// </summary> [Comment("ç©æ容å¨å®¹é")] [Column("BoxQty", TypeName = "decimal(10,3)")] public decimal? BoxQty { get; set; } } } iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
@@ -4,72 +4,80 @@ /* * @author : åæå¥ * @date : 2024/4/23ä¸å4:29:28 * @desc : å è£ å ³ç³»åºç¡è¡¨ * @date : 2024/4/24ä¸å10:48:23 * @desc : ç©æ客æ·å ³è表 */ namespace Admin.NET.Core { /// <summary> /// å è£ å ³ç³»åºç¡è¡¨ /// ç©æ客æ·å ³è表 /// </summary> [Table("wms_container_packaging")] [Comment("å è£ å ³ç³»åºç¡è¡¨")] public class WmsContainerPackaging : DEntityBase [Table("wms_material_customer")] [Comment("ç©æ客æ·å ³è表")] public class WmsMaterialCustomer : DEntityBase { /// <summary> /// 容å¨ç±»åID /// ç©æID /// </summary> [Comment("容å¨ç±»åID")] [Comment("ç©æID")] [Required] public long ContainerTypeId { get; set; } public long MaterialId { get; set; } /// <summary> /// 容å¨ç±»åå称 /// ç©æç¼å· /// </summary> [Comment("容å¨ç±»åå称")] [Comment("ç©æç¼å·")] [Required] [MaxLength(50)] public string MaterialCode { get; set; } /// <summary> /// ç©æå称 /// </summary> [Comment("ç©æå称")] [Required] [MaxLength(50)] public string MaterialName { get; set; } /// <summary> /// 客æ·ID /// </summary> [Comment("客æ·ID")] [Required] public long CustId { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [Comment("客æ·ç¼å·")] [Required] [MaxLength(50)] public string CustCode { get; set; } /// <summary> /// 客æ·è±æå称 /// </summary> [Comment("客æ·è±æå称")] [MaxLength(255)] public string CustEnglishName { get; set; } /// <summary> /// 客æ·ä¸æå称 /// </summary> [Comment("客æ·ä¸æå称")] [Required] [MaxLength(255)] public string ContainerTypeName { get; set; } /// <summary> /// ç©æç±»åID /// </summary> [Comment("ç©æç±»åID")] [Required] public long MaterialTypeId { get; set; } /// <summary> /// ç©æç±»åç¼å· /// </summary> [Comment("ç©æç±»åç¼å·")] [Required] [MaxLength(255)] public string MaterialTypeCode { get; set; } /// <summary> /// ç©æç±»åå称 /// </summary> [Comment("ç©æç±»åå称")] [Required] [MaxLength(255)] public string MaterialTypeName { get; set; } /// <summary> /// ç©æ容å¨å®¹é /// </summary> [Comment("ç©æ容å¨å®¹é")] [Column("BoxQty", TypeName = "decimal(10,3)")] public decimal? BoxQty { get; set; } public string CustChinaName { get; set; }
@@ -50,15 +50,15 @@ BIAOZHUANCHANPIN = 4, /// <summary> /// å è£ ææ /// 容å¨ææ /// </summary> [Description("å è£ ææ")] [Description("容å¨ææ")] BAOZHUANGCAILIAO = 5, /// <summary> /// è¾ å©ææ /// </summary> [Description("å è£ ææ")] [Description("容å¨ææ")] FUZHUCAILIAO = 6, /// <summary>
