diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index 0e37af2e..0107aa42 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -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总零件数:" diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs index 0af6158f..4cd83eba 100644 --- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs @@ -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 partnumbers = new(); + int totalPackage = 0; + int totalPartnumber = 0; + List 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() @@ -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() .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"; } } diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index f8263334..11c969ec 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -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总零件数:"