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

成品库存变动日志优化

Browse Source
This commit is contained in:
赵正易
2024-08-06 13:16:22 +08:00
parent 2c3082fa01
commit 52f1ae30f3
3 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Service/mes/wms/WMentryWarehousing_productService.cs
View File

@@ -127,17 +127,19 @@ namespace ZR.Service.mes.wms
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
Code = "PDA_IN",
Partnumber = string.Join(',', partnumbers),
Code = "IntoProductwarehouse",
Partnumber = partnumbers[0] ?? "无零件号",
BlankNum = "",
ChangeType = 1,
ChangeQuantity = totalPartnumber,
ActionTime = DateTime.Now,
Status = 1,
Remark =
"PDA入库"
"货物入库"
+ "\n仓库号:"
+ location
+ "\n零件号:"
+ string.Join(',', partnumbers)
+ "\n总箱数:"
+ totalPackage
+ "\n总零件数:"

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

@@ -1,5 +1,6 @@
using System;
using Infrastructure.Attribute;
using Microsoft.AspNetCore.Http.HttpResults;
using SqlSugar;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
@@ -170,6 +171,11 @@ namespace ZR.Service.mes.wms
{
int type = parm.Type;
var time = DateTime.Now.ToLocalTime();
// 统计记录
List<string> partnumbers = new();
int totalPackage = 0;
int totalPartnumber = 0;
List<string> packageCodeRemark = new();
if (type == 1)
{
var list = parm.Ids;
@@ -202,6 +208,14 @@ namespace ZR.Service.mes.wms
CreatedBy = parm.CreatedBy ?? "batch",
CreatedTime = time,
};
// 记录统计
totalPackage++;
if (!partnumbers.Contains(nowProduction.Partnumber))
{
partnumbers.Add(nowProduction.Partnumber);
}
totalPartnumber += nowProduction.GoodsNumAction ?? 0;
packageCodeRemark.Add(nowProduction.PackageCodeClient);
Context.Insertable(outRecord).ExecuteCommand();
Context
.Deleteable<WmGoodsNowProduction>()
@@ -254,13 +268,51 @@ namespace ZR.Service.mes.wms
CreatedBy = parm.CreatedBy ?? "batch",
CreatedTime = time,
};
// 记录统计
totalPackage++;
if (!partnumbers.Contains(nowProduction.Partnumber))
{
partnumbers.Add(nowProduction.Partnumber);
}
totalPartnumber += nowProduction.GoodsNumAction ?? 0;
packageCodeRemark.Add(nowProduction.PackageCodeClient);
Context.Insertable(outRecord).ExecuteCommand();
Context
.Deleteable<WmGoodsNowProduction>()
.Where(it => it.Id == nowProduction.Id)
.ExecuteCommand();
}
}
// 插入记录
WmGoodsRecord wmGoodsRecord =
new()
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
Code = "DoPatchOutProduction",
Partnumber = partnumbers[0] ?? "无零件号",
BlankNum = "",
ChangeType = 2,
ChangeQuantity = totalPartnumber,
ActionTime = DateTime.Now,
Status = 1,
Remark =
"货物出库"
+ "\n出库单:"
+ parm.FkOutOrderId
+ "\n零件号:"
+ string.Join(',', partnumbers)
+ "\n总箱数:"
+ totalPackage
+ "\n总零件数:"
+ totalPartnumber
+ "\n涉及批次号:\n"
+ string.Join(',', packageCodeRemark),
CreatedBy = parm.CreatedBy ?? "batch",
CreatedTime = DateTime.Now,
};
int recordNum = Context.Insertable(wmGoodsRecord).ExecuteCommand();
return "ok";
}
}

8
ZR.Service/mes/wms/WmOutOrderService.cs
View File

@@ -543,17 +543,19 @@ namespace ZR.Service.mes.wms
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
Code = "PDA_OUT",
Partnumber = string.Join(',', partnumbers),
Code = "DoMaterialOut",
Partnumber = partnumbers[0] ?? "无零件号",
BlankNum = "",
ChangeType = 2,
ChangeQuantity = totalPartnumber,
ActionTime = DateTime.Now,
Status = 1,
Remark =
"PDA出库"
"货物出库"
+ "\n出库单:"
+ shipnumber
+ "\n零件号:"
+ string.Join(',', partnumbers)
+ "\n总箱数:"
+ totalPackage
+ "\n总零件数:"