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

毛坯库存

Browse Source
This commit is contained in:
qianhao.xu 2024-05-14 14:01:18 +08:00
parent 70e9f01d18
commit b73b7a1f0a
5 changed files with 179 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
View File

@ -175,6 +175,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
/// 1.更改站点托盘 ？？
/// 2.完成的配料任务不可见
/// 3.生产上线
/// 4.扣除毛坯库
/// </summary>
/// <returns></returns>
[HttpGet("finishBatchingTask")]

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

@ -72,6 +72,59 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(response);
}
/// <summary>
/// 1.增加库存
/// </summary>
/// <param name="id"></param>
/// <param name="blank"></param>
/// <param name="change_quantity"></param>
/// <returns></returns>
[HttpGet("add_inventory")]
public IActionResult AddInventory(string id,string blank,int change_quantity)
{
if(string.IsNullOrEmpty(blank))
{
return SUCCESS(null);
}
if (string.IsNullOrEmpty(id))
{
return SUCCESS(null);
}
if (string.IsNullOrEmpty(blank))
{
return SUCCESS(null);
}
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>
/// <returns></returns>
[HttpGet("delete_inventory")]
public IActionResult DeleteInventory(string id, string blank, int change_quantity)
{
if (string.IsNullOrEmpty(blank))
{
return SUCCESS(null);
}
if (string.IsNullOrEmpty(id))
{
return SUCCESS(null);
}
if (string.IsNullOrEmpty(blank))
{
return SUCCESS(null);
}
var response = _WmBlankRecordService.DeleteInventory(id, blank, change_quantity, HttpContext.GetName());
return SUCCESS(response);
}
/// <summary>
/// 更新毛坯库存库存变动记录表
/// </summary>

39
ZR.Service/mes/mm/MaterialInputService.cs
View File

@ -120,7 +120,7 @@ namespace ZR.Service.mes.mm
ingredient.FkWorkorder = workorder.ClientWorkorder ?? ("调试:" + workorder.Id);
ingredient.FkBlanknumber = workorder.BlankNumber;
ingredient.Isingredient = 0;
ingredient.Previous_numbered =0;
ingredient.Previous_numbered = 0;
ingredient.CreatedTime = DateTime.Now;
Context.Insertable(ingredient).ExecuteCommand();
}
@ -168,13 +168,13 @@ namespace ZR.Service.mes.mm
int remian = item.previousNumber - item.previousNumbered;
if (remian == 0)
{
int result= Context.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
.SetColumns(it => it.Isingredient == 1)
.SetColumns(it => it.UpdatedTime == DateTime.Now)
.ExecuteCommand();
int result = Context.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
.SetColumns(it => it.Isingredient == 1)
.SetColumns(it => it.UpdatedTime == DateTime.Now)
.ExecuteCommand();
}
else
@ -366,6 +366,29 @@ namespace ZR.Service.mes.mm
}
}
//查询毛坯号
List<MmIngredientTask> TO_blankList = Context.Queryable<MmIngredientTask>().Where(it => it.TaskId == taskId).ToList();
foreach (var task in TO_blankList)
{
if (!string.IsNullOrEmpty(task.Blanknumber))
{
//1 扣除库存
Context.Updateable<WmBlankInventory>().SetColumns(it=>it.Quantity== it.Quantity-task.PreviousNumbered)
.Where(it=>it.BlankNum==task.Blanknumber).ExecuteCommand();
//2 增加库存记录
WmBlankRecord res = new WmBlankRecord();
res.Id = SnowFlakeSingle.Instance.NextId().ToString();
res.FkBlankInventoryId = task.Blanknumber;
res.ChangeQuantity = task.PreviousNumbered;
res.Type = 3;
res.Status = 1;
res.CreatedBy = "仓库人员";
res.CreatedTime = DateTime.Now;
//填写库存记录
Context.Insertable(res).ExecuteCommand();
}
}
});

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

@ -20,5 +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);
}
}

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

@ -83,5 +83,96 @@ namespace ZR.Service.mes.wms
return Update(model, true);
}
/// <summary>
/// 增加库存
/// </summary>
/// <param name="id"></param>
/// <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)
{
// 增加库存
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)
.ExecuteCommand();
if(result==1)
{
WmBlankRecord res = new WmBlankRecord();
res.Id= SnowFlakeSingle.Instance.NextId().ToString();
res.FkBlankInventoryId=fk_blank_inventory_id;
res.ChangeQuantity = change_quantity;
res.Type = 1;
res.Status = 1;
res.CreatedBy = username;
res.CreatedTime = DateTime.Now;
//填写库存记录
Context.Insertable(res).ExecuteCommand();
}
return result;
}
/// <summary>
/// 删除库存
/// </summary>
/// <param name="id"></param>
/// <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)
{
int resut = 0;
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)
{
resut = 0 - change_quantity;
}
else if (record == null)
{
resut = -1;
}
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)
.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.Type = 2;
res.Status = 1;
res.CreatedBy = username;
res.CreatedTime = DateTime.Now;
//填写库存记录
Context.Insertable(res).ExecuteCommand();
}
}
});
return resut;
}
}
}