wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-10-11 11:37:29 +08:00
parent 294442b933 e3f9561ad1
commit 908b02bc5e
2 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -742,17 +742,17 @@ namespace Tnb.ProductionMgr
}
else
{
// Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
// {
// carry_id = detail.member_carry_id
// },db);
//
//
// if (result.code != HttpStatusCode.OK)
// {
// throw Oops.Bah(result.msg);
// }
deleteCarryCodeIds.Add(detail.member_carry_id);
Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
{
carry_id = detail.member_carry_id
},_db);
if (result.code != HttpStatusCode.OK)
{
throw Oops.Bah(result.msg);
}
//deleteCarryCodeIds.Add(detail.member_carry_id);
// int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == detail.member_carry_id).ExecuteCommandAsync();
// Log.Information($"载具{detail.member_carry_id}已解绑,解绑条数{row}");
}
@@ -761,18 +761,18 @@ namespace Tnb.ProductionMgr
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{
// Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
// {
// carry_id = carry.id
// },db);
//
//
// if (result.code != HttpStatusCode.OK)
// {
// throw Oops.Bah(result.msg);
// }
Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
{
carry_id = carry.id
},_db);
deleteCarryCodeIds.Add(carry.id);
if (result.code != HttpStatusCode.OK)
{
throw Oops.Bah(result.msg);
}
//deleteCarryCodeIds.Add(carry.id);
// int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == carry.id).ExecuteCommandAsync();
// Log.Information($"载具{carry.id}已解绑,解绑条数{row}");
}
@@ -785,46 +785,41 @@ namespace Tnb.ProductionMgr
if (carry.carrystd_id==WmsWareHouseConst.CARRY_LXSTD_ID || carry.carrystd_id==WmsWareHouseConst.CARRY_LJSTD_ID)
{
// Result result2 = await _wmsCarryUnbindService.CarryUnbindWithoutTran(new CarryBindInput()
// {
// org = prdFeedingH.org_id,
// create_id = prdFeedingH.create_id,
// carry_id = prdMaterialReceiptH.carry_id,
// carry_code = prdMaterialReceiptH.carry_code,
// carrystd_id = carry.carrystd_id,
// membercarry_code = "",
// membercarry_id = "",
// },db);
//
// if (result2.code != HttpStatusCode.OK)
// {
// throw Oops.Bah(result2.msg);
// }
Result result2 = await _wmsCarryUnbindService.CarryUnbindWithoutTran(new CarryBindInput()
{
org = prdFeedingH.org_id,
create_id = prdFeedingH.create_id,
carry_id = prdMaterialReceiptH.carry_id,
carry_code = prdMaterialReceiptH.carry_code,
carrystd_id = carry.carrystd_id,
membercarry_code = "",
membercarry_id = "",
},_db);
if (result2.code != HttpStatusCode.OK)
{
throw Oops.Bah(result2.msg);
}
deleteCarryDIds.Add(prdMaterialReceiptH.carry_id);
//deleteCarryDIds.Add(prdMaterialReceiptH.carry_id);
// int row = await db.Deleteable<WmsCarryD>().Where(r => r.carry_id == prdMaterialReceiptH.carry_id).ExecuteCommandAsync();
// Log.Information($"载具{prdMaterialReceiptH.carry_id}已解绑,解绑条数{row}");
}
}
await _db.Updateable<WmsCarryH>().SetColumns(r => new WmsCarryH
{
work_station = ""
}).Where(r => input.carryIds.Contains(r.id)).ExecuteCommandAsync();
Log.Information($"清空载具信息:{JsonConvert.SerializeObject(clearCarryIds)}");
string carryStatus = ((int)EnumCarryStatus.空闲).ToString();
string isCheck = ((int)EnumCheckConclusion.待检).ToString();
foreach(string carryId in clearCarryIds)
{
await _db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == carryStatus)
.SetColumns(x => x.is_check == isCheck)
.Where(x => x.id==carryId)
.ExecuteCommandAsync();
Log.Information($"更新载具{carryId}状态为空闲{carryStatus},检验为{isCheck}成功");
}
// Log.Information($"清空载具信息:{JsonConvert.SerializeObject(clearCarryIds)}");
// string carryStatus = ((int)EnumCarryStatus.空闲).ToString();
// string isCheck = ((int)EnumCheckConclusion.待检).ToString();
// foreach(string carryId in clearCarryIds)
// {
// await _db.Updateable<WmsCarryH>()
// .SetColumns(x => x.carry_status == carryStatus)
// .SetColumns(x => x.is_check == isCheck)
// .Where(x => x.id==carryId)
// .ExecuteCommandAsync();
// Log.Information($"更新载具{carryId}状态为空闲{carryStatus},检验为{isCheck}成功");
// }
if (insertHList.Count <= 0 || insertDList.Count <= 0)
{
@@ -832,11 +827,11 @@ namespace Tnb.ProductionMgr
}
int dRow1 = await _db.Deleteable<WmsCarryD>().Where(r => deleteCarryDIds.Contains(r.carry_id)).ExecuteCommandAsync();
Log.Information($"子载具{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow1}");
int dRow2 = await _db.Deleteable<WmsCarryCode>().Where(r => deleteCarryCodeIds.Contains(r.carry_id)).ExecuteCommandAsync();
Log.Information($"载具条码{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow2}");
// int dRow1 = await _db.Deleteable<WmsCarryD>().Where(r => deleteCarryDIds.Contains(r.carry_id)).ExecuteCommandAsync();
// Log.Information($"子载具{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow1}");
//
// int dRow2 = await _db.Deleteable<WmsCarryCode>().Where(r => deleteCarryCodeIds.Contains(r.carry_id)).ExecuteCommandAsync();
// Log.Information($"载具条码{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow2}");
int row1 = await _db.Insertable(insertHList).ExecuteCommandAsync();
int row2 = await _db.Insertable(insertDList).ExecuteCommandAsync();