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-11-04 16:05:31 +08:00
parent 899414e0c7 b7916262e9
commit 1f6bb00f25
3 changed files with 87 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,16 +742,16 @@ namespace Tnb.ProductionMgr
} }
else else
{ {
Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput() // Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
{ // {
carry_id = detail.member_carry_id // carry_id = detail.member_carry_id
},_db); // },_db);
//
//
if (result.code != HttpStatusCode.OK) // if (result.code != HttpStatusCode.OK)
{ // {
throw Oops.Bah(result.msg); // throw Oops.Bah(result.msg);
} // }
//deleteCarryCodeIds.Add(detail.member_carry_id); //deleteCarryCodeIds.Add(detail.member_carry_id);
// int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == detail.member_carry_id).ExecuteCommandAsync(); // int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == detail.member_carry_id).ExecuteCommandAsync();
// Log.Information($"载具{detail.member_carry_id}已解绑,解绑条数{row}"); // Log.Information($"载具{detail.member_carry_id}已解绑,解绑条数{row}");
@@ -761,16 +761,16 @@ namespace Tnb.ProductionMgr
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{ {
Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput() // Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
{ // {
carry_id = carry.id // carry_id = carry.id
},_db); // },_db);
//
//
if (result.code != HttpStatusCode.OK) // if (result.code != HttpStatusCode.OK)
{ // {
throw Oops.Bah(result.msg); // throw Oops.Bah(result.msg);
} // }
//deleteCarryCodeIds.Add(carry.id); //deleteCarryCodeIds.Add(carry.id);
// int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == carry.id).ExecuteCommandAsync(); // int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == carry.id).ExecuteCommandAsync();

84
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -3131,9 +3131,13 @@ namespace Tnb.WarehouseMgr
List<string> clearCarryIds = new List<string>(); List<string> clearCarryIds = new List<string>();
clearCarryIds.Add(carry.id); clearCarryIds.Add(carry.id);
List<string> memberCarryIds = new List<string>(); List<string> memberCarryIds = new List<string>();
List<WmsCarryCode> deleteCarryCodes = new List<WmsCarryCode>();
List<string> deleteCarryCodeCarryIds = new List<string>();
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID ||
carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{ {
deleteCarryCodes = await _db.Queryable<WmsCarryCode>().Where(x=>x.carry_id==carry.id).ToListAsync();
} }
else else
{ {
@@ -3141,27 +3145,39 @@ namespace Tnb.WarehouseMgr
clearCarryIds.AddRange(memberCarryIds); clearCarryIds.AddRange(memberCarryIds);
} }
// await db.Updateable<WmsCarryH>()
// .SetColumns(x => x.carry_status == carryStatus)
// .SetColumns(x => x.is_check == isCheck)
// .Where(x => clearCarryIds.Contains(x.id))
// .ExecuteCommandAsync();
await db.Updateable<WmsCarryH>() await db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == carryStatus) .SetColumns(x => x.carry_status == carryStatus)
.Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync();
Logger.Information($"【TaskComplate FloorCallMaterial】 更新载具状态 {JsonConvert.SerializeObject(clearCarryIds)}成功");
await db.Updateable<WmsCarryH>()
.SetColumns(x => x.is_check == isCheck) .SetColumns(x => x.is_check == isCheck)
.Where(x => clearCarryIds.Contains(x.id)) .Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync(); .ExecuteCommandAsync();
Logger.Information($"【TaskComplate FloorCallMaterial】 更新载具检验 {JsonConvert.SerializeObject(clearCarryIds)}成功");
//await QTRK2BIP(dt, db); if (deleteCarryCodes != null && deleteCarryCodes.Count > 0)
// require_code是任务单 {
//string mo_task_code = dt.require_code; foreach (var item in deleteCarryCodes)
{
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{
}
else
{
deleteCarryCodeCarryIds.Add(item.carry_id);
}
}
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{
deleteCarryCodeCarryIds.Add(carry.id);
}
}
deleteCarryCodeCarryIds = deleteCarryCodeCarryIds.Distinct().ToList();
if (!deleteCarryCodeCarryIds.IsEmpty())
{
string unbindCarryStr = String.Join(',',await db.Queryable<WmsCarryH>().Where(x=>deleteCarryCodeCarryIds.Contains(x.id)).Select(x=>x.carry_code).ToListAsync());
Logger.Information($"【TaskComplate FloorCallMaterial】载具物料明细 {unbindCarryStr}已解绑");
await db.Deleteable<WmsCarryCode>().Where(r => deleteCarryCodeCarryIds.Contains(r.carry_id) ).ExecuteCommandAsync();
}
} }
else if (dt.biz_type ==WmsWareHouseConst.BIZTYPE_WMSMATERIALTRANSFER_ID)//长管签收 else if (dt.biz_type ==WmsWareHouseConst.BIZTYPE_WMSMATERIALTRANSFER_ID)//长管签收
{ {
@@ -3170,6 +3186,8 @@ namespace Tnb.WarehouseMgr
List<string> clearCarryIds = new List<string>(); List<string> clearCarryIds = new List<string>();
clearCarryIds.Add(carry.id); clearCarryIds.Add(carry.id);
List<string> memberCarryIds = new List<string>(); List<string> memberCarryIds = new List<string>();
List<WmsCarryCode> deleteCarryCodes = new List<WmsCarryCode>();
List<string> deleteCarryCodeCarryIds = new List<string>();
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID ||
carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{ {
@@ -3179,25 +3197,37 @@ namespace Tnb.WarehouseMgr
memberCarryIds = await db.Queryable<WmsCarryD>().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync(); memberCarryIds = await db.Queryable<WmsCarryD>().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync();
clearCarryIds.AddRange(memberCarryIds); clearCarryIds.AddRange(memberCarryIds);
// await db.Updateable<WmsCarryH>()
// .SetColumns(x => x.carry_status == carryStatus)
// .SetColumns(x => x.is_check == isCheck)
// .Where(x => clearCarryIds.Contains(x.id))
// .ExecuteCommandAsync();
await db.Updateable<WmsCarryH>() await db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == carryStatus) .SetColumns(x => x.carry_status == carryStatus)
.Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync();
Logger.Information($"【TaskComplate 长管签收】 更新载具状态 {JsonConvert.SerializeObject(clearCarryIds)}成功");
await db.Updateable<WmsCarryH>()
.SetColumns(x => x.is_check == isCheck) .SetColumns(x => x.is_check == isCheck)
.Where(x => clearCarryIds.Contains(x.id)) .Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync(); .ExecuteCommandAsync();
Logger.Information($"【TaskComplate 长管签收】 更新载具检验 {JsonConvert.SerializeObject(clearCarryIds)}成功");
// await db.Updateable<WmsCarryH>()
// .SetColumns(x => x.carry_status == carryStatus)
// .Where(x => clearCarryIds.Contains(x.id))
// .ExecuteCommandAsync();
// Logger.Information($"【TaskComplate 长管签收】 更新载具状态 {JsonConvert.SerializeObject(clearCarryIds)}成功");
//
// await db.Updateable<WmsCarryH>()
// .SetColumns(x => x.is_check == isCheck)
// .Where(x => clearCarryIds.Contains(x.id))
// .ExecuteCommandAsync();
// Logger.Information($"【TaskComplate 长管签收】 更新载具检验 {JsonConvert.SerializeObject(clearCarryIds)}成功");
} }
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{
deleteCarryCodeCarryIds.Add(carry.id);
}
deleteCarryCodeCarryIds = deleteCarryCodeCarryIds.Distinct().ToList();
if (!deleteCarryCodeCarryIds.IsEmpty())
{
string unbindCarryStr = String.Join(',',await db.Queryable<WmsCarryH>().Where(x=>deleteCarryCodeCarryIds.Contains(x.id)).Select(x=>x.carry_code).ToListAsync());
Logger.Information($"【TaskComplate 长管签收】载具物料明细 {unbindCarryStr}已解绑");
await db.Deleteable<WmsCarryCode>().Where(r => deleteCarryCodeCarryIds.Contains(r.carry_id) ).ExecuteCommandAsync();
}
} }
else if (dt.biz_type == "erp_qtrk") else if (dt.biz_type == "erp_qtrk")

20
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -2712,16 +2712,16 @@ namespace Tnb.WarehouseMgr
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{ {
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput() // Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbindWithoutTran(new CarryCodeUnbindInput()
{ // {
carry_id = carry.id // carry_id = carry.id
},_db); // },_db);
//
//
if (result.code != HttpStatusCode.OK) // if (result.code != HttpStatusCode.OK)
{ // {
throw Oops.Bah(result.msg); // throw Oops.Bah(result.msg);
} // }
//deleteCarryCodeIds.Add(carry.id); //deleteCarryCodeIds.Add(carry.id);
// int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == carry.id).ExecuteCommandAsync(); // int row = await db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == carry.id).ExecuteCommandAsync();