Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库管理：出货计划：新增修改

Browse Source
This commit is contained in:
qianhao.xu
2024-03-26 15:03:49 +08:00
parent 4bf469a5c4
commit 6386aef7cf
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ZR.Admin.WebApi/appsettings.development.json
View File

@@ -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" //代码生成默认连接数据库

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-盘点记录-0326150209.zip Normal file
View File

Binary file not shown.

2
ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs
View File

@@ -44,7 +44,7 @@ namespace ZR.Model.MES.wms.Dto
/// </summary>
public class WmGoodsNowProductionDto
{
[Required(ErrorMessage = "雪花id不能为空")]
public string Id { get; set; }

8
ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs
View File

@@ -49,22 +49,22 @@ namespace ZR.Model.MES.wms.Dto
/// </summary>
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; }

4
ZR.Service/mes/wms/WmGoodsNowProductionService.cs
View File

@@ -60,6 +60,10 @@ namespace ZR.Service.mes.wms
/// <returns></returns>
public WmGoodsNowProduction AddWmGoodsNowProduction(WmGoodsNowProduction model)
{
if (string.IsNullOrEmpty(model.Id))
{
model.Id = SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID
}
return Context.Insertable(model).ExecuteReturnEntity();
}

4
ZR.Service/mes/wms/WmGoodsOutProductionService.cs
View File

@@ -62,6 +62,10 @@ namespace ZR.Service.mes.wms
/// <returns></returns>
public WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord model)
{
if (string.IsNullOrEmpty(model.Id))
{
model.Id= SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID
}
return Context.Insertable(model).ExecuteReturnEntity();
}