提交

IService/TakeStock/ITakeStockService.cs

@@ -13,6 +13,8 @@ namespace IService.TakeStock
         /// <returns></returns>
         Task<bool> CreateTakeStockOrderAsync(TakeStockSchedule record, List<TakeStockOrder> orders);
 
+        Task<bool> ReTry(int scheduleId);
+
         /// <summary>
         /// 发起线下盘点
         /// </summary>
@@ -27,6 +29,13 @@ namespace IService.TakeStock
         /// <returns></returns>
         Task<bool> Feedback(int id, int afterQuantity, string description);
 
+        /// <summary>
+        /// 取消盘点的订单
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<bool> CancelOrder(int id);
+
         ///// <summary>
         ///// 冻结库存
         ///// </summary>

TakeStock.API/Controllers/TakeStockController.cs

@@ -56,12 +56,24 @@ namespace TakeStock.API.Controllers
             return await takeStockAppService.StartTakeStock(input);
         }
 
+        [HttpGet("ReTry")]
+        public async Task<bool> ReTry(int scheduleId)
+        {
+            return await takeStockAppService.ReTry(scheduleId);
+        }
+
         [HttpPost("Feedback")]
         public async Task<bool> Feedback([FromBody] FeedbackInputDto input)
         {
             return await takeStockAppService.Feedback(input);
         }
 
+        [HttpGet("CancelOrder")]
+        public async Task<bool> CancelOrder(int id)
+        {
+            return await takeStockAppService.ReTry(id);
+        }
+
         // DELETE: api/ApiWithActions/5
         [HttpDelete("{id}")]
         public void Delete(int id)

TakeStock.API/TakeStock.API.csproj

@@ -32,6 +32,6 @@
     <ProjectReference Include="..\TakeStock.SqlSugar\TakeStock.SqlSugar.csproj" />
   </ItemGroup>
 
-  <ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JSONSchema="" /></VisualStudio></ProjectExtensions>
 
 </Project>

TakeStock.API/appsettings.json

@@ -16,6 +16,7 @@
     "Localhost": "server=gz-cdb-hqmznu0w.sql.tencentcdb.com;port=63523;database=bailun_wms;uid=root;password=#7kfnymAM$Y9-Ntf;Convert Zero Datetime=True;Allow User Variables=true;",
     //"Redis": "127.0.0.1"
     "Redis": "172.31.1.74"
+    //"Redis": "129.204.97.78"
   },
   "App": {
     "CorsOrigins": "*"

TakeStock.Application/TakeStock/TakeStockAppService.cs

@@ -27,6 +27,11 @@ namespace TakeStock.Application.TakeStock
             return await takeStockService.CreateTakeStockOrderAsync(schedule, orders);
         }
 
+        public async Task<bool> ReTry(int scheduleId)
+        {
+            return await takeStockService.ReTry(scheduleId);
+        }
+
         public async Task<bool> StartTakeStock(StartTakeStockInputDto input)
         {
             return await takeStockService.StartTakeStock(input.Id, input.BeforeQuantity);
@@ -36,5 +41,10 @@ namespace TakeStock.Application.TakeStock
         {
             return await takeStockService.Feedback(input.Id, input.AfterQuantity, input.Description);
         }
+
+        public async Task<bool> CancelOrder(int id)
+        {
+            return await takeStockService.CancelOrder(id);
+        }
     }
 }