diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/RobotCallBackInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/RobotCallBackInput.cs
new file mode 100644
index 00000000..3d0338a9
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/RobotCallBackInput.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
+{
+ ///
+ /// 机器人回调操作输入参数s
+ ///
+ public class RobotCallBackInput
+ {
+ ///
+ /// 主载具Id
+ ///
+ public string carry_id { get; set; }
+ ///
+ /// 主载具编号
+ ///
+ public string carry_code { get; set; }
+ ///
+ /// 子载具ID
+ ///
+ public string membercarry_id { get; set; }
+ ///
+ /// 子载具编号
+ ///
+ public string membercarry_code { get; set; }
+ ///
+ /// 方向
+ ///
+ public int direction { get; set; }
+ ///
+ /// 是否最后一个
+ ///
+ public bool isLast { get; set; }
+ }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
index 006c31e9..85a9ccd0 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
@@ -52,7 +52,7 @@ namespace Tnb.WarehouseMgr
_billRullService = billRullService;
OverideFuncs.CreateAsync = CarryBind;
}
-
+
private async Task CarryBind(VisualDevModelDataCrInput input)
{
var isOk = false;
@@ -127,6 +127,19 @@ namespace Tnb.WarehouseMgr
}
return Task.FromResult(true);
}
+
+ ///
+ /// 机器人回调操作
+ ///
+ ///
+ [HttpPost]
+ public async Task RobotCallBack()
+ {
+
+
+ }
+
+
/* public override async Task ModifyAsync(WareHouseUpInput input)
{
if (input == null) throw new ArgumentNullException(nameof(input));
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs
index df1727ef..e1c65cae 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs
@@ -50,7 +50,7 @@ namespace Tnb.WarehouseMgr
})
.Mapper(it => it.material_name = dicMaterial.ContainsKey(it.material_id) ? dicMaterial[it.material_id].ToString()! : "")
.ToListAsync();
- return items;
+ return items ?? Enumerable.Empty();
}
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
index ba1ace87..c3733ac8 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
@@ -31,10 +31,10 @@ namespace Tnb.WarehouseMgr
/// 空载具出库
///
[OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID)]
-
+ [ServiceModule(BizTypeId)]
public class WmsPDAEmptyOutstockService : BaseWareHouseService, IPdaStroage
{
- private const string BizTypeId = "26121986416677";
+ private const string BizTypeId = "26475845405733";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
index 43d8af9d..bedfb86b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
@@ -80,10 +80,12 @@ namespace Tnb.WarehouseMgr
break;
}
}
+ var loc = await _db.Queryable().SingleAsync(it => it.id == carry.location_id);
+ loc.is_use = "0";
+ await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
+ WareHouseUpInput upInput = new() { bizTypeId = disTask.biz_type, requireId = disTask.require_id, carryIds = new List { input.carryId } };
+ await DoUpdate(upInput); //回更业务
}
- var loc = await _db.Queryable().SingleAsync(it => it.id == carry.location_id);
- loc.is_use = "0";
- await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
}
await _db.Ado.CommitTranAsync();