From 6386aef7cf286149224902d87fce927701fa7910 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Tue, 26 Mar 2024 15:03:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=A1=E5=88=92=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/appsettings.development.json | 6 +++--- .../ZrAdmin.NET-盘点记录-0326150209.zip | Bin 0 -> 8550 bytes ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs | 2 +- ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs | 8 ++++---- .../mes/wms/WmGoodsNowProductionService.cs | 4 ++++ .../mes/wms/WmGoodsOutProductionService.cs | 4 ++++ 6 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-盘点记录-0326150209.zip diff --git a/ZR.Admin.WebApi/appsettings.development.json b/ZR.Admin.WebApi/appsettings.development.json index b2849816..62b9f040 100644 --- a/ZR.Admin.WebApi/appsettings.development.json +++ b/ZR.Admin.WebApi/appsettings.development.json @@ -14,9 +14,9 @@ // "Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //外网连接服务器 - //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", // 干巷服务器 - "Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + // "Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //内网连接服务器 //"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4, @@ -28,7 +28,7 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名 - "Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog={dbName};", + "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog={dbName};", "DbType": 0, "IsAutoCloseConnection": true, "DbName": "ZrAdmin" //代码生成默认连接数据库 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-盘点记录-0326150209.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-盘点记录-0326150209.zip new file mode 100644 index 0000000000000000000000000000000000000000..f51977ea830d38ed611c3254097e0069cf2727a3 GIT binary patch literal 8550 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 public class WmGoodsNowProductionDto { - [Required(ErrorMessage = "雪花id不能为空")] + public string Id { get; set; } diff --git a/ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs b/ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs index 8701623d..a12160a8 100644 --- a/ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs +++ b/ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs @@ -49,22 +49,22 @@ namespace ZR.Model.MES.wms.Dto /// public class WmGoodsOutProductionDto { - [Required(ErrorMessage = "雪花id不能为空")] + public string Id { get; set; } public string FkNowProductionId { get; set; } public string FkOutOrderId { get; set; } - [Required(ErrorMessage = "箱子编号（MES）不能为空")] + public string PackageCode { get; set; } - [Required(ErrorMessage = "箱子编号（客户）不能为空")] + public string PackageCodeClient { get; set; } public string PackageCodeOriginal { get; set; } - [Required(ErrorMessage = "库位编号不能为空")] + public string LocationCode { get; set; } public string Partnumber { get; set; } diff --git a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs index 70dfaeec..0819f86f 100644 --- a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs @@ -60,6 +60,10 @@ namespace ZR.Service.mes.wms /// public WmGoodsNowProduction AddWmGoodsNowProduction(WmGoodsNowProduction model) { + if (string.IsNullOrEmpty(model.Id)) + { + model.Id = SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID + } return Context.Insertable(model).ExecuteReturnEntity(); } diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs index 78ada568..ffe0c5b3 100644 --- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs @@ -62,6 +62,10 @@ namespace ZR.Service.mes.wms /// public WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord model) { + if (string.IsNullOrEmpty(model.Id)) + { + model.Id= SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID + } return Context.Insertable(model).ExecuteReturnEntity(); }