diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs
new file mode 100644
index 00000000..117b1bdf
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs
@@ -0,0 +1,18 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+///
+/// 载具台账主表
+///
+public partial class WmsCarryH
+{
+ ///
+ /// 是否签收
+ ///
+ [SugarColumn(IsIgnore = true)]
+ public int is_sign { get; set; }
+
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs
index c416a809..87c8ae05 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs
@@ -157,5 +157,9 @@ public partial class WmsPretaskH : BaseEntity
/// 优先级
///
public int priority { get; set; } = 1;
+ ///
+ /// 优先级
+ ///
+ public int is_sign { get; set; } = 1;
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
index 1f742be8..f300d069 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
@@ -67,7 +67,7 @@ namespace Tnb.WarehouseMgr
await _runService.Create(templateEntity, input);
//入库取终点
//var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
- var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
+ var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
WmsPointH sPoint = null;
WmsPointH ePoint = null;
if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
@@ -113,6 +113,11 @@ namespace Tnb.WarehouseMgr
preTask.create_time = DateTime.Now;
return preTask;
}).ToList();
+ //判断目标库位是否自动签收
+ var loc = await _db.Queryable().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
+ if (loc.is_sign ==0 ) {
+ preTasks[^1].is_sign = 1; // 修改最后一个元素的是否签收值
+ }
var isOk = await _wareHouseService.GenPreTask(preTasks,null);
if (isOk)
{
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
index 7a0255c1..4080deca 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
@@ -72,7 +72,8 @@ namespace Tnb.WarehouseMgr
/*//入库取终点
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/
-
+ //判断目标库位是否自动签收
+ var loc = await _db.Queryable().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
//出库取起点,获取所有符合输入的载具规格的载具
var setQty = await _db.Queryable().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
var carrys = await _db.Queryable().LeftJoin((a, b) => a.location_id == b.id)
@@ -131,6 +132,11 @@ namespace Tnb.WarehouseMgr
return preTask;
}).ToList();
//更新页面
+ //赋值签收状态
+ if (loc.is_sign == 0)
+ {
+ preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
+ }
isOk = await _wareHouseService.GenPreTask(preTasks, null);
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
index 5f2ced5c..03d4b985 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
@@ -114,8 +114,12 @@ namespace Tnb.WarehouseMgr
preTask.create_time = DateTime.Now;
return preTask;
}).ToList();
-
- //preTasks[^1].is_sign =1; 修改最后一个元素的是否签收值
+ //判断目标库位是否自动签收
+ var loc = await _db.Queryable().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
+ if (loc.is_sign == 0)
+ {
+ preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
+ }
var isOk = await _wareHouseService.GenPreTask(preTasks, null);
if (isOk)
{
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
index cdf8b102..45198d3f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
@@ -71,7 +71,9 @@ namespace Tnb.WarehouseMgr
/*//入库取终点
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/
-
+ //判断目标库位是否自动签收
+ var loc = await _db.Queryable().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
+
//出库取起点,获取所有符合输入的载具规格的载具
var setQty = await _db.Queryable().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
var carrys = await _db.Queryable().LeftJoin((a, b) => a.location_id == b.id)
@@ -130,6 +132,10 @@ namespace Tnb.WarehouseMgr
return preTask;
}).ToList();
//更新页面
+ if (loc.is_sign == 0)
+ {
+ preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
+ }
isOk = await _wareHouseService.GenPreTask(preTasks, null);
}