增加预任务的点位ID和点位编号，更改任务执行字段

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs

@@ -44,6 +44,27 @@ public partial class WmsDistaskH : BaseEntity<string>
     /// </summary>
     public string? end_floor { get; set; }
 
+    /// <summary>
+    /// 起始点位ID
+    /// </summary>
+    public string startpoint_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 起始点位编号
+    /// </summary>
+    public string startpoint_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 终止点位ID
+    /// </summary>
+    public string endpoint_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 终止点位编号
+    /// </summary>
+    public string endpoint_code { get; set; } = string.Empty;
+
+
     /// <summary>
     /// 单号
     /// </summary>

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs

@@ -44,6 +44,26 @@ public partial class WmsPretaskH : BaseEntity<string>
     /// </summary>
     public string? end_floor { get; set; }
 
+    /// <summary>
+    /// 起始点位ID
+    /// </summary>
+    public string startpoint_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 起始点位编号
+    /// </summary>
+    public string startpoint_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 终止点位ID
+    /// </summary>
+    public string endpoint_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 终止点位编号
+    /// </summary>
+    public string endpoint_code { get; set; } = string.Empty;
+
     /// <summary>
     /// 单号
     /// </summary>

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs

@@ -109,6 +109,10 @@ namespace Tnb.WarehouseMgr
                              preTask.endlocation_code = ePoint?.location_code!;
                              preTask.start_floor = sPoint?.floor.ToString();
                              preTask.end_floor = ePoint?.floor.ToString();
+                             preTask.startpoint_id = sPoint?.id!;
+                             preTask.startpoint_code = sPoint?.point_code!;
+                             preTask.endpoint_id = ePoint?.id!;
+                             preTask.endpoint_code = ePoint?.point_code!;
                              preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                              preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                              preTask.biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs

@@ -106,6 +106,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSMOOUTSTK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs

@@ -110,6 +110,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSEMPTYINSTOCK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs

@@ -77,7 +77,7 @@ namespace Tnb.WarehouseMgr
                 //判断目标库位是否自动签收                
                 var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
                 //出库取起点，获取所有符合输入的载具规格的载具
-                var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString()};
+                var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString() };
                 var outStkCarrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
 
                 // 判断最终目标库位是否可以放置当前载具
@@ -128,6 +128,10 @@ namespace Tnb.WarehouseMgr
                                         endlocation_code = ePoint?.location_code!,
                                         start_floor = sPoint?.floor.ToString(),
                                         end_floor = ePoint?.floor.ToString(),
+                                        startpoint_id = sPoint?.id!,
+                                        startpoint_code = sPoint?.point_code!,
+                                        endpoint_id = ePoint?.id!,
+                                        endpoint_code = ePoint?.point_code!,
                                         bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
                                         status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
                                         biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID,
@@ -152,7 +156,7 @@ namespace Tnb.WarehouseMgr
                                 }
                                 isOk = await _wareHouseService.GenPreTask(preTasks, null!);
                             }
-                            if(isOk)   
+                            if (isOk)
                             {
                                 GenPreTaskUpInput preTaskUpInput = new()
                                 {

WarehouseMgr/Tnb.WarehouseMgr/WmsKittingInStkService.cs

@@ -108,6 +108,10 @@ namespace Tnb.WarehouseMgr
                              preTask.endlocation_code = ePoint?.location_code!;
                              preTask.start_floor = sPoint?.floor.ToString();
                              preTask.end_floor = ePoint?.floor.ToString();
+                             preTask.startpoint_id = sPoint?.id!;
+                             preTask.startpoint_code = sPoint?.point_code!;
+                             preTask.endpoint_id = ePoint?.id!;
+                             preTask.endpoint_code = ePoint?.point_code!;
                              preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                              preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                              preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSKITTINGINSTK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs

@@ -106,6 +106,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSOUTBALE_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs

@@ -219,6 +219,10 @@ namespace Tnb.WarehouseMgr
                                                 endlocation_code = ePoint?.location_code!,
                                                 start_floor = sPoint?.floor.ToString(),
                                                 end_floor = ePoint?.floor.ToString(),
+                                                startpoint_id = sPoint?.id!,
+                                                startpoint_code = sPoint?.point_code!,
+                                                endpoint_id = ePoint?.id!,
+                                                endpoint_code = ePoint?.point_code!,
                                                 bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
                                                 status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
                                                 biz_type = WmsWareHouseConst.BIZTYPE_WMSOUTSTOCK_ID,

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs

@@ -107,6 +107,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs

@@ -102,6 +102,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSMOOUTSTK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs

@@ -137,6 +137,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService!.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs

@@ -106,6 +106,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSEMPTYINSTOCK_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs

@@ -116,6 +116,10 @@ namespace Tnb.WarehouseMgr
                                     endlocation_code = ePoint?.location_code!,
                                     start_floor = sPoint?.floor.ToString(),
                                     end_floor = ePoint?.floor.ToString(),
+                                    startpoint_id = sPoint?.id!,
+                                    startpoint_code = sPoint?.point_code!,
+                                    endpoint_id = ePoint?.id!,
+                                    endpoint_code = ePoint?.point_code!,
                                     bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
                                     status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
                                     biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID,

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs

@@ -120,6 +120,10 @@ namespace Tnb.WarehouseMgr
                                 endlocation_code = ePoint?.location_code ?? "",
                                 start_floor = sPoint?.floor.ToString(),
                                 end_floor = ePoint?.floor.ToString(),
+                                startpoint_id = sPoint?.id!,
+                                startpoint_code = sPoint?.point_code!,
+                                endpoint_id = ePoint?.id!,
+                                endpoint_code = ePoint?.point_code!,
                                 bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
                                 status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
                                 biz_type = input.data[nameof(WmsPretaskH.biz_type)]?.ToString() ?? "",

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs

@@ -107,6 +107,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSINBALE_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs

@@ -99,6 +99,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSOUTBALE_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs

@@ -99,6 +99,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs

@@ -99,6 +99,10 @@ namespace Tnb.WarehouseMgr
                             preTask.endlocation_code = ePoint?.location_code!;
                             preTask.start_floor = sPoint?.floor.ToString();
                             preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.startpoint_id = sPoint?.id!;
+                            preTask.startpoint_code = sPoint?.point_code!;
+                            preTask.endpoint_id = ePoint?.id!;
+                            preTask.endpoint_code = ePoint?.point_code!;
                             preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
                             preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
                             preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID;

WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs

@@ -191,6 +191,10 @@ namespace Tnb.WarehouseMgr
                                                 endlocation_code = ePoint?.location_code!,
                                                 start_floor = sPoint?.floor.ToString(),
                                                 end_floor = ePoint?.floor.ToString(),
+                                                startpoint_id = sPoint?.id!,
+                                                startpoint_code = sPoint?.point_code!,
+                                                endpoint_id = ePoint?.id!,
+                                                endpoint_code = ePoint?.point_code!,
                                                 bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
                                                 status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
                                                 biz_type = ko.biz_type,