校准方法-统一

src/WMS.Web.Api/Controllers/InStockTaskController.cs

@@ -115,7 +115,15 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            return await _inStockTaskService.Adjust(sourceBillNo);
+            //校准
+            var result= await _inStockTaskService.Adjust(sourceBillNo);
+            if(!result.IsSuccess)
+                return ResultList<SourceBillNoQueryResponse>.ReFailure(result);
+
+            //再一次查询新的数据：并返回最后的结果
+            var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
+            var list = await _inStockTaskRepositories.GetListBy(request);
+            return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
         }
 
         /// <summary>
@@ -131,7 +139,15 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            return await _inStockTaskService.AdjustNoPurchase(sourceBillNo);
+            //校准
+            var result = await _inStockTaskService.Adjust(sourceBillNo);
+            if (!result.IsSuccess)
+                return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(result);
+
+            //再一次查询新的数据：并返回最后的结果
+            var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
+            var list = await _inStockTaskRepositories.GetListInfoBy(request);
+            return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
         }
 
 

src/WMS.Web.Domain/IService/IInStockTaskService.cs

@@ -13,18 +13,11 @@ namespace WMS.Web.Domain.IService
     public interface IInStockTaskService
     {
         /// <summary>
-        /// 来源单-与金蝶校准-第二步-pad：这个只针对采购订单
+        /// 来源单-与金蝶校准-第二步-pad
         /// </summary>
         /// <param name="sourceBillNo"></param>
         /// <returns></returns>
-        Task<ResultList<SourceBillNoQueryResponse>> Adjust(string sourceBillNo);
+        Task<Result> Adjust(string sourceBillNo);
-
-        /// <summary>
-        /// 来源单-与金蝶校准-第二步-pad：这个是非采购订单上架使用
-        /// </summary>
-        /// <param name="sourceBillNo"></param>
-        /// <returns></returns>
-        Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> AdjustNoPurchase(string sourceBillNo);
         /// <summary>
         /// 同步：采购入库类型单据
         /// </summary>

src/WMS.Web.Domain/Services/InStockTaskService.cs

@@ -40,11 +40,11 @@ namespace WMS.Web.Domain.Services
         }
 
         /// <summary>
-        /// 来源单-与金蝶校准-第二步-pad：这个只针对采购订单
+        /// 来源单-金蝶校准-实时
         /// </summary>
         /// <param name="sourceBillNo"></param>
         /// <returns></returns>
-        public async Task<ResultList<SourceBillNoQueryResponse>> Adjust(string sourceBillNo)
+        public async Task<Result> Adjust(string sourceBillNo)
         {
             //1.事务
             IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
@@ -54,78 +54,44 @@ namespace WMS.Web.Domain.Services
             //2.查看是否有入库任务单
             var task = await _inStockTaskRepositories.GetBySource(sourceBillNo);
             if (task == null)
-                return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.OrderNoData);
+                return Result.ReFailure(ResultCodes.OrderNoData);
 
             //3.有的话就同步一下金蝶的数据
             var billNos = new List<string>();
             billNos.Add(sourceBillNo);
-            //3.1采购订单类型-进去金蝶交互更新
+            //3.1订单类型-进去金蝶交互更新
             if (task.Type == InstockType.Purchase)
             {
                 var result = await this.SsynPurchaseInStock(billNos, isTransaction);
                 if (!result.IsSuccess) isRollback = true;
             }
-
+            else if (task.Type == InstockType.Miscellaneous)
-            //4.提交事务
-            var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
-            if (!isSuccess)
-                return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.AdjustError);
-
-
-            //5.再一次查询新的数据：并返回最后的结果
-            var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
-            var list = await _inStockTaskRepositories.GetListBy(request);
-            return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
-        }
-
-        /// <summary>
-        ///  来源单-与金蝶校准-第二步-pad：这个是非采购订单上架使用
-        /// </summary>
-        /// <param name="sourceBillNo"></param>
-        /// <returns></returns>
-        public async Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> AdjustNoPurchase(string sourceBillNo)
-        {
-            //1.事务
-            IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
-            bool isRollback = false;
-            bool isTransaction = false;
-
-            //2.查看是否有入库任务单
-            var task = await _inStockTaskRepositories.GetBySource(sourceBillNo);
-            if (task == null)
-                return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.OrderNoData);
-
-            //3.有的话就同步一下金蝶的数据
-            var billNos = new List<string>();
-            billNos.Add(sourceBillNo);
-            //3.1这里要对入库任务单的类型逐一判断，进行去ErpService找对应的单据类型重新获取；这里只有采购，后面再加其它的
-            if (task.Type == InstockType.Miscellaneous)
             {
                 var result = await this.SysnMiscellaneous(billNos, isTransaction);
                 if (!result.IsSuccess) isRollback = true;
             }
             else if (task.Type == InstockType.Assembled)
             {
-
+                var result = await this.SysnAssembledApp(billNos, isTransaction);
+                if (!result.IsSuccess) isRollback = true;
             }
             else if (task.Type == InstockType.Stkdirecttransfers)
             {
-
+                var result = await this.SysnTransferDirect(billNos, isTransaction);
+                if (!result.IsSuccess) isRollback = true;
             }
             else if (task.Type == InstockType.StktransferInst)
             {
-
+                var result = await this.SysnTransferin(billNos, isTransaction);
+                if (!result.IsSuccess) isRollback = true;
             }
+
             //4.提交事务
             var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
             if (!isSuccess)
-                return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.AdjustError);
+                return Result.ReFailure(ResultCodes.AdjustError);
 
-
+            return Result.ReSuccess();
-            //5.再一次查询新的数据：并返回最后的结果
-            var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
-            var list = await _inStockTaskRepositories.GetListInfoBy(request);
-            return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
         }       
 
         /// <summary>