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-05-14 18:07:10 +08:00
parent 1f8d860379
commit 522cba1fbd
5 changed files with 141 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs
View File

@@ -132,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers
}
catch(Exception ex)
{
return ToResponse(new ApiResult(200, ex.Message, "同步失败"));
return ToResponse(new ApiResult(500, ex.Message, "同步失败"));
}

59
ZR.Admin.WebApi/Controllers/mes/wms/WmBlankRecordController.cs
View File

@@ -75,54 +75,63 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 1.增加库存
/// </summary>
/// <param name="id"></param>
/// <param name="blank"></param>
/// <param name="change_quantity"></param>
/// <param name="fkBlankInventoryId">库存id</param>
/// <param name="blankNum">毛坯号</param>
/// <param name="changeQuantity">变动量</param>
/// <param name="remark">备注</param>
/// <returns></returns>
[HttpGet("add_inventory")]
public IActionResult AddInventory(string id,string blank,int change_quantity)
public IActionResult AddInventory(string fkBlankInventoryId, string blankNum, int changeQuantity,string remark)
{
if(string.IsNullOrEmpty(blank))
try
{
return SUCCESS(null);
if (string.IsNullOrEmpty(fkBlankInventoryId))
{
return ToResponse(new ApiResult(500, "库存id为空!", "库存id为空!"));
}
if (string.IsNullOrEmpty(id))
if (string.IsNullOrEmpty(blankNum))
{
return SUCCESS(null);
return ToResponse(new ApiResult(500, "毛坯号为空!", "毛坯号为空!"));
}
if (string.IsNullOrEmpty(blank))
var response = _WmBlankRecordService.AddInventory(fkBlankInventoryId, blankNum, changeQuantity, HttpContext.GetName(),remark);
return SUCCESS(response);
}
catch (Exception ex)
{
return SUCCESS(null);
return ToResponse(new ApiResult(500, ex.Message, "添加记录失败"));
}
var response = _WmBlankRecordService.AddInventory(id, blank, change_quantity, HttpContext.GetName());
return SUCCESS(response);
}
/// <summary>
/// 2.减少库存
/// </summary>
/// <param name="id"></param>
/// <param name="blank"></param>
/// <param name="change_quantity"></param>
/// <param name="fkBlankInventoryId">库存id</param>
/// <param name="blankNum">毛坯号</param>
/// <param name="changeQuantity">变动量</param>
/// <param name="remark">备注</param>
/// <returns></returns>
[HttpGet("delete_inventory")]
public IActionResult DeleteInventory(string id, string blank, int change_quantity)
public IActionResult DeleteInventory(string fkBlankInventoryId, string blankNum, int changeQuantity, string remark)
{
if (string.IsNullOrEmpty(blank))
try
{
return SUCCESS(null);
if (string.IsNullOrEmpty(fkBlankInventoryId))
{
return ToResponse(new ApiResult(500, "库存id为空!", "库存id为空!"));
}
if (string.IsNullOrEmpty(id))
if (string.IsNullOrEmpty(blankNum))
{
return SUCCESS(null);
return ToResponse(new ApiResult(500, "毛坯号为空!", "毛坯号为空!"));
}
if (string.IsNullOrEmpty(blank))
{
return SUCCESS(null);
}
var response = _WmBlankRecordService.DeleteInventory(id, blank, change_quantity, HttpContext.GetName());
var response = _WmBlankRecordService.DeleteInventory(fkBlankInventoryId, blankNum, changeQuantity, HttpContext.GetName(), remark);
return SUCCESS(response);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message, "添加记录失败"));
}
}
/// <summary>

33
ZR.Model/MES/wms/Dto/WmBlankRecordDto.cs
View File

@@ -7,6 +7,17 @@ namespace ZR.Model.MES.wms.Dto
/// </summary>
public class WmBlankRecordQueryDto : PagerInfo
{
public string Id { get; set; }
public string FkBlankInventoryId { get; set; }
public string BlankNum { get; set; }
public int Type { get; set; }
public int Status { get; set; }
public DateTime? CreatedTimeStart { get; set; }
public DateTime? CreatedTimeEnd { get; set; }
}
/// <summary>
@@ -21,6 +32,28 @@ namespace ZR.Model.MES.wms.Dto
public string BlankNum { get; set; }
/// <summary>
/// 单位
///</summary>
public string Unit { get; set; }
/// <summary>
/// 颜色
///</summary>
public string Color { get; set; }
/// <summary>
/// 规格
///</summary>
public string Specification { get; set; }
/// <summary>
/// 描述
///</summary>
public string Description { get; set; }
/// <summary>
/// 版本号
///</summary>
public string Version { get; set; }
public int? ChangeQuantity { get; set; }
public int Type { get; set; }

4
ZR.Service/mes/wms/IService/IWmBlankRecordService.cs
View File

@@ -20,8 +20,8 @@ namespace ZR.Service.mes.wms.IService
int UpdateWmBlankRecord(WmBlankRecord parm);
int AddInventory(string id, string fk_blank_inventory_id, int change_quantity,string username);
int DeleteInventory(string id, string fk_blank_inventory_id, int change_quantity, string username);
int AddInventory(string fkBlankInventoryId, string blankNum, int changeQuantity, string username, string remark);
int DeleteInventory(string fkBlankInventoryId, string blankNum, int changeQuantity, string username, string remark);
}
}

90
ZR.Service/mes/wms/WmBlankRecordService.cs
View File

@@ -26,12 +26,41 @@ namespace ZR.Service.mes.wms
/// <returns></returns>
public PagedInfo<WmBlankRecordDto> GetList(WmBlankRecordQueryDto parm)
{
var predicate = Expressionable.Create<WmBlankRecord>();
DateTime startTime = parm.CreatedTimeStart ?? new DateTime(1999, 1, 1, 0, 0, 0);
DateTime endTime = parm.CreatedTimeEnd ?? new DateTime(1999, 1, 1, 0, 0, 0);
var predicate = Expressionable.Create<WmBlankRecord>()
.AndIF(!string.IsNullOrEmpty(parm.FkBlankInventoryId), it => it.FkBlankInventoryId == parm.FkBlankInventoryId)
.AndIF(!string.IsNullOrEmpty(parm.BlankNum), it => it.BlankNum.Contains(parm.BlankNum))
// .AndIF(parm.Status > -1, it => it.Status == parm.Status)
.AndIF(parm.Type > 0, it => it.Type == parm.Type)
.AndIF(parm.CreatedTimeStart > new DateTime(1999, 1, 1, 0, 0, 0), it => it.CreatedTime >= startTime.ToLocalTime())
.AndIF(parm.CreatedTimeEnd > new DateTime(1999, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
;
var response = Queryable()
.Where(predicate.ToExpression())
.OrderByDescending(it=>it.CreatedTime)
.ToPage<WmBlankRecord, WmBlankRecordDto>(parm);
if (response.Result.Count > 0)
{
foreach (WmBlankRecordDto item in response.Result)
{
WmMaterial material = Context.Queryable<WmMaterial>()
.Where(it => it.BlankNum == item.BlankNum)
.Where(it => it.Remarks == "毛坯")
.First();
if (material == null)
{
item.Description = "此毛坯号不在物料清单内！";
continue;
}
item.Color = material.Color;
item.Unit = material.Unit;
item.Version = material.Version;
item.Specification = material.Specification;
item.Description = !string.IsNullOrEmpty(material.Description) ? material.Description : material.ProductName;
}
}
return response;
}
@@ -57,6 +86,7 @@ namespace ZR.Service.mes.wms
/// <returns></returns>
public WmBlankRecord AddWmBlankRecord(WmBlankRecord model)
{
model.Id = SnowFlakeSingle.Instance.NextId().ToString();
return Context.Insertable(model).ExecuteReturnEntity();
}
@@ -90,22 +120,29 @@ namespace ZR.Service.mes.wms
/// <param name="fk_blank_inventory_id"></param>
/// <param name="change_quantity"></param>
/// <returns></returns>
public int AddInventory(string id, string fk_blank_inventory_id, int change_quantity,string username)
public int AddInventory(string fkBlankInventoryId, string blankNum, int changeQuantity, string username, string remark)
{
bool hasRecord = Context.Queryable<WmBlankInventory>()
.Where(it => it.Id == fkBlankInventoryId).Any();
if (!hasRecord)
{
throw new Exception("无此毛坯号记录！");
}
// 增加库存
int result=Context.Updateable<WmBlankInventory>()
.SetColumns(it => it.Quantity == it.Quantity + change_quantity)
.Where(it => it.Id == id)
.Where(it => it.BlankNum == fk_blank_inventory_id)
int result = Context.Updateable<WmBlankInventory>()
.SetColumns(it => it.Quantity == it.Quantity + changeQuantity)
.Where(it => it.Id == fkBlankInventoryId)
.ExecuteCommand();
if(result==1)
if (result == 1)
{
WmBlankRecord res = new WmBlankRecord();
res.Id= SnowFlakeSingle.Instance.NextId().ToString();
res.FkBlankInventoryId=fk_blank_inventory_id;
res.ChangeQuantity = change_quantity;
res.Id = SnowFlakeSingle.Instance.NextId().ToString();
res.FkBlankInventoryId = fkBlankInventoryId;
res.BlankNum = blankNum;
res.ChangeQuantity = changeQuantity;
res.Type = 1;
res.Status = 1;
res.Remark = remark;
res.CreatedBy = username;
res.CreatedTime = DateTime.Now;
@@ -125,40 +162,41 @@ namespace ZR.Service.mes.wms
/// <param name="fk_blank_inventory_id"></param>
/// <param name="change_quantity"></param>
/// <returns></returns>
public int DeleteInventory(string id, string fk_blank_inventory_id, int change_quantity, string username)
public int DeleteInventory(string fkBlankInventoryId, string blankNum, int changeQuantity, string username, string remark)
{
int resut = 0;
UseTran2(() =>
bool tranReuslt = UseTran2(() =>
{
WmBlankInventory record = Context.Queryable<WmBlankInventory>()
.Where(it => it.Id == id)
.Where(it => it.BlankNum == fk_blank_inventory_id).First();
if (record != null && record.Quantity < change_quantity)
.Where(it => it.Id == fkBlankInventoryId)
.Where(it => it.BlankNum == blankNum).First();
if (record != null && record.Quantity < changeQuantity)
{
resut = 0 - change_quantity;
resut = 0 - changeQuantity;
throw new Exception("所填变动数字大于库存，无法减少！");
}
else if (record == null)
{
resut = -1;
throw new Exception("无此毛坯号记录！");
}
else
{
resut = Context.Updateable<WmBlankInventory>()
.SetColumns(it => it.Quantity == it.Quantity - change_quantity)
.Where(it => it.Id == id)
.Where(it => it.FkPaintId == fk_blank_inventory_id)
.SetColumns(it => it.Quantity == it.Quantity - changeQuantity)
.Where(it => it.Id == fkBlankInventoryId)
.ExecuteCommand();
if (resut == 1)
{
WmBlankRecord res = new WmBlankRecord();
res.Id = SnowFlakeSingle.Instance.NextId().ToString();
res.FkBlankInventoryId = fk_blank_inventory_id;
res.ChangeQuantity = change_quantity;
res.FkBlankInventoryId = fkBlankInventoryId;
res.BlankNum = blankNum;
res.ChangeQuantity = changeQuantity;
res.Type = 2;
res.Status = 1;
res.Remark = remark;
res.CreatedBy = username;
res.CreatedTime = DateTime.Now;
@@ -171,6 +209,10 @@ namespace ZR.Service.mes.wms
}
});
if (!tranReuslt)
{
throw new Exception("操作执行失败，事务失败！");
}
return resut;
}