From 50dc30f76a8e4cc67b5014e5ba1f93f861a547dc Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Thu, 15 Jun 2023 19:36:41 +0800
Subject: [PATCH 1/4] 1

---
 .../Dto/Inputs/GenPreTaskUpInput.cs                         | 4 ++++
 .../Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs        | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs           | 6 ++----
 WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs | 4 +++-
 .../Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs         | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs     | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs   | 3 +--
 .../Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs       | 2 +-
 .../Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs      | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs  | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs       | 4 ++--
 11 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
index 0c4907b6..f4decc33 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
@@ -20,6 +20,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// </summary>
         public string CarryId { get; set; }
         /// <summary>
+        /// 载具Code
+        /// </summary>
+        public string CarryCode { get; set; }
+        /// <summary>
         /// 载具起始库位Id
         /// </summary>
         public string CarryStartLocationId { get; set; }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
index ca5fb036..52e6804a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
@@ -1 +1 @@
-using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;

namespace Tnb.WarehouseMgr.Interfaces
{
    /// <summary>
    /// 库房业务(出入库)接口
    /// </summary>
    public interface IWareHouseService
    {
        /// <summary>
        /// 入库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input);
        /// <summary>
        /// 出库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        //Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
        /// <summary>
        /// 路径算法
        /// </summary>
        /// <param name="pStartId"></param>
        /// <param name="pEndId"></param>
        /// <returns></returns>
        Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId);
        /// <summary>
        /// 生成预任务
        /// </summary>
        /// <param name="preTasks"></param>
        /// <returns></returns>
        Task<bool> GenPreTask(List<WmsPretaskH> preTasks);
        /// <summary>
        /// 生成预任务成功后操作
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task GenTaskHandleAfter(GenPreTaskUpInput input);
    }
}

\ No newline at end of file
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;

namespace Tnb.WarehouseMgr.Interfaces
{
    /// <summary>
    /// 库房业务(出入库)接口
    /// </summary>
    public interface IWareHouseService
    {
        /// <summary>
        /// 入库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input);
        /// <summary>
        /// 出库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        //Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
        /// <summary>
        /// 路径算法
        /// </summary>
        /// <param name="pStartId"></param>
        /// <param name="pEndId"></param>
        /// <returns></returns>
        Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId);
        /// <summary>
        /// 生成预任务
        /// </summary>
        /// <param name="preTasks"></param>
        /// <returns></returns>
        Task<bool> GenPreTask(List<WmsPretaskH> preTasks);
        /// <summary>
        /// 生成预任务成功后操作
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task GenInStockTaskHandleAfter(GenPreTaskUpInput input);
    }
}

\ No newline at end of file
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index ed3d97f3..484e4f31 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -460,16 +460,14 @@ namespace Tnb.WarehouseMgr
         /// </summary>
         /// <returns></returns>
         [NonAction]
-        public async Task GenTaskHandleAfter(GenPreTaskUpInput input)
+        public async Task GenInStockTaskHandleAfter(GenPreTaskUpInput input)
         {
             try
             {
                 await _db.Ado.BeginTranAsync();
-                //根据载具移入Id，回更单据状态
-                await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.PreTaskId).ExecuteCommandAsync();
                 //根据生成的预任务，插入预任务操作记录
                 await _db.Insertable(input.PreTaskRecord).ExecuteCommandAsync();
-                if(input.PreTaskHandleCodes.Count > 0)
+                if (input.PreTaskHandleCodes.Count > 0)
                 {
                     await _db.Insertable(input.PreTaskHandleCodes).ExecuteCommandAsync();
                 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
index 63e394d2..d1273e6c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
@@ -138,8 +138,10 @@ namespace Tnb.WarehouseMgr
                             handleH.create_id = _userManager.UserId;
                             handleH.create_time = DateTime.Now;
                             preTaskUpInput.PreTaskRecord = handleH;
+                            //根据载具移入Id，回更单据状态
+                            await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.PreTaskId).ExecuteCommandAsync();
 
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
index d4610965..4e6ea11c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
@@ -124,7 +124,7 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
index 5adddff7..2b9b5057 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
@@ -125,7 +125,7 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
index a7b06a43..8abb05fa 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs	
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs	
@@ -81,7 +81,6 @@ namespace Tnb.WarehouseMgr
                 var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
                         .Where(a => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString())
                         .ToListAsync();
-                carrys.Where()
                 WmsPointH sPoint = null;
                 WmsPointH ePoint = null;
                 if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
@@ -137,7 +136,7 @@ namespace Tnb.WarehouseMgr
                                 preTaskUpInput.LocationIds = points.Select(x => x.id).ToList();
                                 preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                                 preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                                await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                                await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                             }
                         }
                     }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
index c7340eaf..9d9f3e51 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
@@ -127,7 +127,7 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
index c5044282..0b12afc7 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
@@ -124,7 +124,7 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
index 94e9a9bb..64b433b9 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
@@ -125,7 +125,7 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
index 001de9db..25c219ab 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
@@ -157,7 +157,6 @@ namespace Tnb.WarehouseMgr
                                             handleCode.code_batch = jo.Value<string>(nameof(WmsHandleCode.code_batch));
                                             handleCode.codeqty = jo.Value<int>(nameof(WmsHandleCode.codeqty));
                                             handleCode.unit_id = _db.Queryable<BasMaterial>().Single(it => it.id == materialId).unit_id;
-                                            //handleCode.unit_code=_db.Queryable<BasMaterial>().Single(it => it.id == materialId);
                                             handleCode.create_id = _userManager.UserId;
                                             handleCode.create_time = DateTime.Now;
                                             preTaskUpInput.PreTaskHandleCodes.Add(handleCode);
@@ -165,7 +164,8 @@ namespace Tnb.WarehouseMgr
                                     }
                                 }
                             }
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
+                            await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString(), is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode }).Where(it => it.id == preTaskUpInput.CarryId).ExecuteCommandAsync();
+
                         }
                     }
                 }

From 1a2f3aa8ea3b79388209b14fbdfa93e79b6a5d86 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Thu, 15 Jun 2023 19:37:43 +0800
Subject: [PATCH 2/4] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
index 25c219ab..56c393ec 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
@@ -164,6 +164,7 @@ namespace Tnb.WarehouseMgr
                                     }
                                 }
                             }
+                            await _db.Insertable(preTaskUpInput.PreTaskRecord).ExecuteCommandAsync();
                             await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString(), is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode }).Where(it => it.id == preTaskUpInput.CarryId).ExecuteCommandAsync();
 
                         }

From 04f2d5c5514c284626b3233f3a6601d5aaf4be05 Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Thu, 15 Jun 2023 19:52:22 +0800
Subject: [PATCH 3/4] 1

---
 .../Consts/WmsWareHouseConst.cs                       | 10 ++++++++++
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs     | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index ea87929d..88261f3e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -19,6 +19,10 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// </summary>
         public const string WMS_PRETASK_H_ENCODE = "PreTaskGen";
         /// <summary>
+        /// 任务执行ENCODE
+        /// </summary>
+        public const string WMS_TASK_EXECUTE_ENCODE = "WmsTaskRequest";
+        /// <summary>
         /// 预任务单据状态-待下发Id
         /// </summary>
         public const string PRETASK_BILL_STATUS_DXF_ID = "26126822610469";
@@ -38,6 +42,12 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// 预任务单据状态-已完成Id
         /// </summary>
         public const string PRETASK_BILL_STATUS_CANCEL_ID = "26126842129701";
+        
+         //
+        /// <summary>
+        /// 任务单据状态-待执行Id
+        /// </summary>
+        public const string TASK_BILL_STATUS_DZX_ID = "26126851525157";
         //
         /// <summary>
         /// 任务单据状态-已下达Id
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 484e4f31..71270b75 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -47,10 +47,12 @@ namespace Tnb.WarehouseMgr
     {
         private readonly ISqlSugarClient _db;
         private readonly IDictionaryDataService _dictionaryDataService;
-        public WareHouseService(ISqlSugarRepository<WmsInstockH> repository, IDictionaryDataService dictionaryDataService)
+        private readonly IBillRullService _billRullService;
+        public WareHouseService(ISqlSugarRepository<WmsInstockH> repository, IDictionaryDataService dictionaryDataService, IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
             _dictionaryDataService = dictionaryDataService;
+            _billRullService= billRullService;
         }
         /// <summary>
         /// 根据载具Id带出库位、仓库信息
@@ -231,6 +233,7 @@ namespace Tnb.WarehouseMgr
                     items.ForEach(x =>
                     {
                         x.is_chain = 0;
+                        x.bill_code= _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
                         x.chain_type = "0";
                     });
                 }
@@ -266,6 +269,12 @@ namespace Tnb.WarehouseMgr
                 {
                     var moveNum = itGroup.First().move_num;
                     var items = itGroup.Adapt<List<WmsDistaskH>>();
+                    items.ForEach(x =>
+                    {
+                        x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
+                        x.bill_code = $"";
+                        x.is_sign = 1;
+                    });
                     var areaPreTasks = itGroup.ToList();
                     if (moveNum == 1)
                     {

From 0aceef8697aa77d4dd67d2ad3bbbb14a4ed93079 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Thu, 15 Jun 2023 19:55:09 +0800
Subject: [PATCH 4/4] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 71270b75..2e015270 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -233,7 +233,7 @@ namespace Tnb.WarehouseMgr
                     items.ForEach(x =>
                     {
                         x.is_chain = 0;
-                        x.bill_code= _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
+                        
                         x.chain_type = "0";
                     });
                 }
@@ -272,7 +272,7 @@ namespace Tnb.WarehouseMgr
                     items.ForEach(x =>
                     {
                         x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
-                        x.bill_code = $"";
+                        x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
                         x.is_sign = 1;
                     });
                     var areaPreTasks = itGroup.ToList();