RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加WMS操作人信息createBy

Browse Source
This commit is contained in:
赵正易 2024-06-28 08:37:21 +08:00
parent 99ae98af20
commit 9b63150b66
7 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs
View File

@ -111,7 +111,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.wms
string msg = "";
string createName = HttpContext.GetName();
int num = this.wm_entryWarehousing_productService.IntoProductwarehouse(wmgoodsDto, createName);
if (num == 0)
{

1
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs
View File

@ -120,6 +120,7 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "按批次出库", BusinessType = BusinessType.INSERT)]
public IActionResult DoPatchOutProduction([FromBody] WmBatchGoodsOutProductionDto parm)
{
parm = parm.ToCreate(HttpContext);
string response = _WmGoodsOutProductionService.DoPatchOutProduction(parm);
if (response == "ok")
{

4
ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs
View File

@ -255,8 +255,8 @@ namespace ZR.Admin.WebApi.Controllers
{
return SUCCESS(null);
}
(int, int) data = _WmOutOrderService.DoMaterialOut(doMaterialOut, "PDA出库");
string createName = HttpContext.GetName();
(int, int) data = _WmOutOrderService.DoMaterialOut(doMaterialOut, createName);
return SUCCESS(data);
}

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

@ -105,5 +105,14 @@ namespace ZR.Model.MES.wms.Dto
/// 1-传ids全部出库 2-按批次号全部出库
/// </summary>
public int Type { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
}
}

7
ZR.Model/MES/wms/Dto/WmgoodsDto.cs
View File

@ -13,5 +13,12 @@
/// 箱子列表(原始外箱标签码)
/// </summary>
public string[] packagelist { set; get; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
}

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

@ -300,12 +300,18 @@ namespace ZR.Service.mes.wms
}
// 2.判断是否已入库
// 2.1判断是否已入库
bool isExistedWarehouse = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
if (isExistedWarehouse)
{
return "该箱号已入库！";
}
// 2.2判断是否有出库记录
bool isoutWarehouse = Context.Queryable<WmGoodsOutRecord>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
if (isoutWarehouse)
{
return "该箱号已有出库记录，需要删除后再入库！";
}
// 提取库位信息
WmInfo wmInfo = Context.Queryable<WmInfo>().Where(it => it.Location == location).First();
if (wmInfo == null)

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

@ -153,7 +153,7 @@ namespace ZR.Service.mes.wms
EntryWarehouseTime = nowProduction.EntryWarehouseTime,
OutTime = time,
Remark = "批量出库",
CreatedBy = "batch",
CreatedBy = parm.CreatedBy ?? "batch",
CreatedTime = time,
};
Context.Insertable(outRecord).ExecuteCommand();
@ -197,7 +197,7 @@ namespace ZR.Service.mes.wms
EntryWarehouseTime = nowProduction.EntryWarehouseTime,
OutTime = time,
Remark = "批量出库",
CreatedBy = "batch",
CreatedBy = parm.CreatedBy ?? "batch",
CreatedTime = time,
};
Context.Insertable(outRecord).ExecuteCommand();