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

二楼细节完善 bug处理

Browse Source
This commit is contained in:
马健
2024-07-03 17:06:02 +08:00
parent 7fa009d599
commit 1b564293d1
16 changed files with 194 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/MaterialTransferInput.cs
View File

@@ -16,7 +16,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// <summary>
/// 单据状态
/// </summary>
public string? biil_status { get; set; }
public string? bill_status { get; set; }
/// <summary>
/// 入库单创建日期

8
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs
View File

@@ -38,6 +38,14 @@
/// 载具
/// </summary>
public List<String> carryIds { get; set; }
/// <summary>
/// 任务执行单号
/// </summary>
public string bill_code { get; set; }
/// <summary>
/// 任务执行区域
/// </summary>
public string area_code { get; set; }

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs
View File

@@ -139,10 +139,5 @@ public partial class WmsCarryH : BaseEntity<string>
/// 配送工位
/// </summary>
public string? work_station { get; set; }
/// <summary>
/// 需要退料
/// </summary>
public int need_return { get; set; }
}

1
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumCarryStatus.cs
View File

@@ -10,5 +10,6 @@
齐套 = 3,
寄存 = 4,
齐套分拣 = 5,
退料 = 6,
}
}

2
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
View File

@@ -133,7 +133,7 @@ namespace Tnb.WarehouseMgr.Interfaces
/// // 二楼机械臂
/// </summary>
/// <returns></returns>
Task Floor2MechanicalComplete(WmsDistaskH disTask, string action);
Task Floor2MechanicalConfirm(WmsDistaskH disTask, string action);
/// <summary>
/// 二楼kiva把料架送到下升降机后生成中储仓入库任务

3
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryBindService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Dtos.VisualDev;
using SqlSugar;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Dto.Outputs;
@@ -11,6 +12,6 @@ namespace Tnb.WarehouseMgr.Interfaces
{
Task<dynamic> CarryBind(VisualDevModelDataCrInput input);
Task<Result> CarryBind(CarryBindInput input);
Task<Result> CarryBind(CarryBindInput input, ISqlSugarClient dbConn = null);
}
}

3
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryUnbindService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Dtos.VisualDev;
using SqlSugar;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Dto.Outputs;
@@ -9,7 +10,7 @@ namespace Tnb.WarehouseMgr.Interfaces
/// </summary>
public interface IWmsCarryUnbindService
{
Task<Result> CarryUnbind(CarryBindInput input);
Task<Result> CarryUnbind(CarryBindInput input, ISqlSugarClient dbConn = null);
Task<Result> CarryCodeUnbind(CarryCodeUnbindInput input);
}
}

63
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -106,6 +106,20 @@ namespace Tnb.WarehouseMgr
return await ToApiResult(HttpStatusCode.InternalServerError, "失败");
}
}
// 机械臂边取货确认
else if (dis.area_code == "E")
{
if (dis.startlocation_code.Contains("AS") || dis.startlocation_code.Contains("AX"))
{
// 二楼机械臂
await _wareHouseService.Floor2MechanicalConfirm(dis, "LOAD");
return await ToApiResult(HttpStatusCode.OK, "成功");
}
else
{
return await ToApiResult(HttpStatusCode.OK, "成功");
}
}
}
catch (Exception ex)
{
@@ -255,20 +269,49 @@ namespace Tnb.WarehouseMgr
{
Logger.Information("【UnloadConfirm】 接收到WCS放货确认信号..................");
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode}");
var dis = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code == input.taskCode).First();
if (dis.area_code == "ZSCJ001")
try
{
var flag = await _wareHouseService.Check(dis.endlocation_code, "UNLOAD");
if (flag)
var dis = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code == input.taskCode).First();
if (dis.area_code == "ZSCJ001")
{
await _wareHouseService.SsxControl(dis, "UNLOAD");
return await ToApiResult(HttpStatusCode.OK, "成功");
var flag = await _wareHouseService.Check(dis.endlocation_code, "UNLOAD");
if (flag)
{
await _wareHouseService.SsxControl(dis, "UNLOAD");
return await ToApiResult(HttpStatusCode.OK, "成功");
}
else
{
return await ToApiResult(HttpStatusCode.InternalServerError, "失败");
}
}
else
// 机械臂边放货确认
else if (dis.area_code == "E")
{
return await ToApiResult(HttpStatusCode.InternalServerError, "失败");
if (dis.endlocation_code.Contains("AS") || dis.endlocation_code.Contains("AX"))
{
// 二楼机械臂
await _wareHouseService.Floor2MechanicalConfirm(dis, "UNLOAD");
return await ToApiResult(HttpStatusCode.OK, "成功");
}
else
{
return await ToApiResult(HttpStatusCode.OK, "成功");
}
}
}
catch (Exception ex)
{
Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace);
return await ToApiResult(HttpStatusCode.InternalServerError, $"放货确认..................失败 原因是{ex.Message}");
throw;
}
try
{
/*var whereExp = Expressionable.Create<WmsElevatorH, WmsElevatorD, WmsDistaskH>()
@@ -598,8 +641,6 @@ namespace Tnb.WarehouseMgr
else
{
await _wareHouseService.SsxControl(disTask, "LOAD");
// 二楼机械臂
await _wareHouseService.Floor2MechanicalComplete(disTask, "LOAD");
}
}
else if (input.action == "UNLOAD")
@@ -612,8 +653,6 @@ namespace Tnb.WarehouseMgr
Logger.Information($"taskCompleUpInput json parameter:{JsonConvert.SerializeObject(taskCompleUpInput)}");
await _wareHouseService.TaskComplate(taskCompleUpInput);
await _wareHouseService.SsxControl(disTask, "UNLOAD");
// 二楼机械臂
await _wareHouseService.Floor2MechanicalComplete(disTask, "UNLOAD");
Logger.Information($"【TaskCallback】 Agv放货完成,任务编号:{string.Join(",", disTasks.Select(x => x.bill_code))}");
}

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

@@ -867,7 +867,7 @@ namespace Tnb.WarehouseMgr
/// 二楼机械臂
/// </summary>
/// <returns></returns>
public async Task Floor2MechanicalComplete(WmsDistaskH disTask, string action)
public async Task Floor2MechanicalConfirm(WmsDistaskH disTask, string action)
{
List<string> rackAreaPointsUp = new List<string>();
List<string> rackAreaPointsDown = new List<string>();
@@ -2221,7 +2221,9 @@ namespace Tnb.WarehouseMgr
List<WmsDistaskCode> disTaskCodes = await _db.Queryable<WmsDistaskCode>().Where(it => it.bill_id == dt.id).ToListAsync();
WareHouseUpInput upInput = new() { bizTypeId = dt.biz_type, requireId = dt.require_id!, require_code = dt.require_code!, source_id = dt.source_id!
, source_code = dt.source_code!, distaskCodes = disTaskCodes, carryIds = disTasks.Select(x => x.carry_id).ToList() };
, source_code = dt.source_code!, distaskCodes = disTaskCodes, carryIds = disTasks.Select(x => x.carry_id).ToList(),
bill_code = dt.bill_code!,area_code= dt.area_code!
};
/*if (!_userManager?.LoginType.IsNullOrEmpty() ?? false)
{

42
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
View File

@@ -199,10 +199,14 @@ namespace Tnb.WarehouseMgr
/// <exception cref="ArgumentNullException"></exception>
/// <exception cref="AppFriendlyException"></exception>
[NonAction]
public async Task<Result> CarryBind(CarryBindInput input)
public async Task<Result> CarryBind(CarryBindInput input, ISqlSugarClient dbConn = null)
{
bool isOk = false;
var db = _db;
if (dbConn != null)
db = dbConn;
try
{
if (input == null)
@@ -210,24 +214,24 @@ namespace Tnb.WarehouseMgr
throw new ArgumentNullException(nameof(input));
}
await _db.Ado.BeginTranAsync();
WmsCarryH? carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carry_id);
WmsCarryH? subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.membercarry_id);
await db.Ado.BeginTranAsync();
WmsCarryH? carry = await db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carry_id);
WmsCarryH? subCarry = await db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.membercarry_id);
if (carry != null && subCarry != null)
{
// 插入子载具绑定记录
VisualDevModelDataCrInput visualDevModelCrInput = new() { data = new Dictionary<string, object>() };
visualDevModelCrInput.data[nameof(WmsCarrybindH.carry_id)] = input.carry_id;
visualDevModelCrInput.data[nameof(WmsCarrybindH.carry_code)] = input.carry_code;
visualDevModelCrInput.data[nameof(WmsCarrybindH.membercarry_id)] = input.membercarry_id;
visualDevModelCrInput.data[nameof(WmsCarrybindH.membercarry_code)] = input.membercarry_code;
visualDevModelCrInput.data[nameof(WmsCarrybindH.type)] = 0;
visualDevModelCrInput.data[nameof(WmsCarrybindH.carrystd_id)] = carry.carrystd_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.create_id)] = input.create_id;
visualDevModelCrInput.data[nameof(WmsCarrybindH.create_time)] = DateTime.Now;
visualDevModelCrInput.data[nameof(WmsCarrybindH.loc)] = 1;
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBIND_ID, true);
await _runService.Create(templateEntity, visualDevModelCrInput);
//VisualDevModelDataCrInput visualDevModelCrInput = new() { data = new Dictionary<string, object>() };
//visualDevModelCrInput.data[nameof(WmsCarrybindH.carry_id)] = input.carry_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.carry_code)] = input.carry_code;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.membercarry_id)] = input.membercarry_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.membercarry_code)] = input.membercarry_code;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.type)] = 0;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.carrystd_id)] = carry.carrystd_id;
////visualDevModelCrInput.data[nameof(WmsCarrybindH.create_id)] = input.create_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.create_time)] = DateTime.Now;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.loc)] = 1;
//VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBIND_ID, true);
//await _runService.Create(templateEntity, visualDevModelCrInput);
WmsCarryD wmsCarryD = new()
{
@@ -237,14 +241,14 @@ namespace Tnb.WarehouseMgr
loc = 1,
create_time = DateTime.Now
};
int row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
int row = await db.Insertable(wmsCarryD).ExecuteCommandAsync();
isOk = row > 0;
if (!isOk)
{
throw Oops.Oh(ErrorCode.COM1001);
}
await _db.Ado.CommitTranAsync();
await db.Ado.CommitTranAsync();
Logger.LogError($"【CarryBind】 {input.membercarry_code}成功绑定到{input.carry_code}");
}
else
@@ -259,7 +263,7 @@ namespace Tnb.WarehouseMgr
{
Logger.LogError($"【CarryBind】 {ex.Message}");
Logger.LogError($"【CarryBind】 {ex.StackTrace}");
await _db.Ado.RollbackTranAsync();
await db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}

15
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs
View File

@@ -129,9 +129,14 @@ namespace Tnb.WarehouseMgr
/// <exception cref="ArgumentNullException"></exception>
/// <exception cref="AppFriendlyException"></exception>
[NonAction]
public async Task<Result> CarryUnbind(CarryBindInput input)
public async Task<Result> CarryUnbind(CarryBindInput input, ISqlSugarClient dbConn = null)
{
bool isOk = false;
var db = _db;
if (dbConn != null)
db = dbConn;
try
{
if (input == null)
@@ -139,7 +144,7 @@ namespace Tnb.WarehouseMgr
throw new ArgumentNullException(nameof(input));
}
WmsCarryH? carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carry_id);
WmsCarryH? carry = await db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carry_id);
if (carry != null)
{
@@ -160,7 +165,7 @@ namespace Tnb.WarehouseMgr
//await _runService.Create(templateEntity, visualDevModelCrInput);
int row = await _db.Deleteable<WmsCarryD>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
int row = await db.Deleteable<WmsCarryD>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
//isOk = row > 0;
//if (!isOk)
@@ -170,7 +175,7 @@ namespace Tnb.WarehouseMgr
Logger.LogInformation($"【CarryUnbind】料架{carry.carry_code}已解绑,解绑条数{row}");
await _db.Ado.CommitTranAsync();
await db.Ado.CommitTranAsync();
}
else
{
@@ -184,7 +189,7 @@ namespace Tnb.WarehouseMgr
{
Logger.LogError($"【CarryUnbind】 {ex.Message}");
Logger.LogError($"【CarryUnbind】 {ex.StackTrace}");
await _db.Ado.RollbackTranAsync();
await db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}

8
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
View File

@@ -196,10 +196,10 @@ namespace Tnb.WarehouseMgr
//更新页面
//赋值签收状态
Logger.Information($"空载具出库生成的预任务数量：{preTasks.Count}");
if (loc.is_sign == 0)
{
preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
}
//if (loc.is_sign == 0)
//{
// preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
//}
isOk = await _wareHouseService.GenPreTask(preTasks, null!);
if (isOk)

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

@@ -594,6 +594,7 @@ namespace Tnb.WarehouseMgr
return;
}
await _db.Ado.BeginTranAsync();
// 更新已转数量
bool isOk = await _db.Updateable<WmsMaterialTransferD>().SetColumns(it => new WmsMaterialTransferD { yzqty = it.yzqty + wmsCarryCodes.Sum(r => r.codeqty) })
.Where(it => it.id == input.source_id).ExecuteCommandHasChangeAsync();
@@ -616,13 +617,16 @@ namespace Tnb.WarehouseMgr
{
throw Oops.Oh(ErrorCode.COM1001);
}
await sign(input);
if (input.area_code == "E")
await sign(input);
await _db.Ado.CommitTranAsync();
}
catch(Exception ex)
{
Logger.LogError("【WmsPrdReturnService ModifyAsync】" + ex.Message);
Logger.LogError("【WmsPrdReturnService ModifyAsync】" + ex.StackTrace);
Logger.LogError("【WmsMaterialTransferService ModifyAsync】" + ex.Message);
Logger.LogError("【WmsMaterialTransferService ModifyAsync】" + ex.StackTrace);
await _db.Ado.RollbackTranAsync();
}
}
@@ -709,7 +713,7 @@ namespace Tnb.WarehouseMgr
Logger.LogInformation($"【DistributeToZCC】更新转库单{wmsMaterialTransfer.bill_code}主表的数据");
await _db.Insertable(wmsMaterialTransferCarrys).ExecuteCommandAsync();
Logger.LogInformation($"【DistributeToZCC插入转库单{wmsMaterialTransfer.bill_code}载具表的数据");
Logger.LogInformation($"【DistributeToZCC】插入转库单{wmsMaterialTransfer.bill_code}载具表的数据");
foreach (WmsMaterialTransferCarry wmsMaterialTransferCarry in wmsMaterialTransferCarrys)
{
@@ -831,7 +835,7 @@ namespace Tnb.WarehouseMgr
//BasLocation endlocation = _db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.work_station).First();
WmsPretaskH wmsPretaskH = _db.Queryable<WmsPretaskH>().Where(r => r.carry_code == wmsCarryH.carry_code && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID).First();
WmsPretaskH wmsPretaskH = _db.Queryable<WmsPretaskH>().Where(r => r.carry_code == wmsCarryH.carry_code && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID).First();
if (wmsPretaskH != null)
{
Logger.LogWarning($"【CallRackToProductionLine】此料架{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！");
@@ -878,7 +882,8 @@ namespace Tnb.WarehouseMgr
{
try
{
List<WmsCarryH> wmsCarryHs = _db.Queryable<WmsCarryH>().Where(r => r.work_station == input.work_station).ToList();
List<WmsCarryH> wmsCarryHs = _db.Queryable<WmsCarryH>().Where(r => r.work_station == input.work_station && r.is_lock == 0
&& (r.carry_status == ((int)(EnumCarryStatus.占用)).ToString() || r.carry_status == ((int)(EnumCarryStatus.齐套)).ToString())).ToList();
if (string.IsNullOrEmpty(input.work_station))
{
Logger.LogWarning($"【RackAndMatByWorkstation】工位不能为空！");
@@ -1038,7 +1043,7 @@ namespace Tnb.WarehouseMgr
_carryBindInput.membercarry_id = membercarry.id;
_carryBindInput.membercarry_code = membercarry.carry_code;
_carryBindInput.carrystd_id = wmsCarryH.carrystd_id;
var resCarrybind = await _wmsCarryBindService.CarryBind(_carryBindInput);
var resCarrybind = await _wmsCarryBindService.CarryBind(_carryBindInput, _db);
if (resCarrybind.code != JNPF.Common.Enums.HttpStatusCode.OK)
{
throw new AppFriendlyException($"绑定料箱到料架失败 载具 {input.carry_code}", 500);

31
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdReturnService.cs
View File

@@ -25,9 +25,6 @@ using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// 载具解绑
/// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSPRDRETURN_ID)]
[ServiceModule(BizTypeId)]
public class WmsPrdReturnService : BaseWareHouseService, IWmsPrdReturnService
@@ -169,19 +166,24 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($"【PrdReturn】存在装有与生产退料单明细不匹配物料的料箱，请检查！{msg.Trim(',')}", 500);
}
WmsPretaskH wmsPretaskH = _db.Queryable<WmsPretaskH>().Where(r => r.carry_code == wmsCarryH.carry_code && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID).First();
WmsPretaskH wmsPretaskH = _db.Queryable<WmsPretaskH>().Where(r => r.carry_code == wmsCarryH.carry_code && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID).First();
if (wmsPretaskH != null)
{
Logger.LogWarning($"【CallRackToProductionLine】此料架{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！");
Logger.LogWarning($"【PrdReturn】此料架{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！");
throw new AppFriendlyException($"此料架{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！", 500);
}
await _db.Ado.BeginTranAsync();
// 标记为退料
await _db.Updateable<WmsCarryH>().SetColumns(r => r.need_return == 1).Where(r => r.id == wmsCarryH.id).ExecuteCommandAsync();
int row2= await _db.Updateable<WmsCarryH>().SetColumns(r => r.carry_status == ((int)(EnumCarryStatus.退料)).ToString()).Where(r => r.carry_code == wmsCarryH.carry_code).ExecuteCommandAsync();
if (row2 == 0)
{
throw new AppFriendlyException($"【PrdReturn】 料架 {wmsCarryH.carry_code} 退料状态回写失败", 500);
}
Logger.LogInformation($"【PrdReturn】料架 {wmsCarryH.carry_code} 退料状态回写成功！");
Logger.LogWarning($"【RackEmptyInstock】绑定料箱到料架");
Logger.LogInformation($"【PrdReturn】绑定料箱到料架");
List<WmsCarryH> membercarrys = _db.Queryable<WmsCarryH>().Where(r => input.details.Select(r => r.carry_code).Contains(r.carry_code)).ToList();
foreach (WmsCarryH membercarry in membercarrys)
@@ -193,7 +195,7 @@ namespace Tnb.WarehouseMgr
_carryBindInput.membercarry_id = membercarry.id;
_carryBindInput.membercarry_code = membercarry.carry_code;
_carryBindInput.carrystd_id = wmsCarryH.carrystd_id;
var resCarrybind = await _wmsCarryBindService.CarryBind(_carryBindInput);
var resCarrybind = await _wmsCarryBindService.CarryBind(_carryBindInput, _db);
if (resCarrybind.code != JNPF.Common.Enums.HttpStatusCode.OK)
{
throw new AppFriendlyException($"绑定料箱到料架失败 载具 {input.carry_code}", 500);
@@ -292,18 +294,23 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($"【PrdReturn】存在装有与生产退料单明细不匹配物料的料架/载运小车，请检查！{msg.Trim(',')}", 500);
}
WmsPretaskH wmsPretaskH = _db.Queryable<WmsPretaskH>().Where(r => r.carry_code == wmsCarryH.carry_code && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID).First();
WmsPretaskH wmsPretaskH = _db.Queryable<WmsPretaskH>().Where(r => r.carry_code == wmsCarryH.carry_code && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID && r.status != WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID).First();
if (wmsPretaskH != null)
{
Logger.LogWarning($"【CallRackToProductionLine】此料架/载运小车{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！");
Logger.LogWarning($"【PrdReturn】此料架/载运小车{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！");
throw new AppFriendlyException($"此料架/载运小车{wmsCarryH.carry_code}存在未完成的预任务{wmsPretaskH.bill_code}！", 500);
}
await _db.Ado.BeginTranAsync();
// 标记为退料
await _db.Updateable<WmsCarryH>().SetColumns(r => r.need_return == 1).Where(r => r.id == wmsCarryH.id).ExecuteCommandAsync();
int row2 =await _db.Updateable<WmsCarryH>().SetColumns(r => r.carry_status == ((int)(EnumCarryStatus.退料)).ToString()).Where(r => r.id == wmsCarryH.id).ExecuteCommandAsync();
if (row2 == 0)
{
throw new AppFriendlyException($"【PrdReturn】 料架 {wmsCarryH.carry_code} 退料状态回写失败", 500);
}
Logger.LogInformation($"【PrdReturn】料架 {wmsCarryH.carry_code} 退料状态回写成功！");
Logger.LogWarning($"【PrdReturn】开始生成预任务");
Logger.LogInformation($"【PrdReturn】开始生成预任务");
CommonCreatePretaskInput commonCreatePretaskInput = new();
commonCreatePretaskInput.startlocation_id = startlocation.id;
commonCreatePretaskInput.endlocation_id = endlocation.id;