From a26e6b89f9b4a5e7e7c657d98a76656a45de8367 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 2 Nov 2023 15:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4erp=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IService/Public/IErpService.cs            |  6 +-
 .../Services/Public/ErpService.cs             | 59 +++----------------
 2 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index d88300a9..571409b8 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -29,9 +29,7 @@ namespace WMS.Web.Domain.IService.Public
         /// </summary>
         /// <returns></returns>
         Task<ResultList<ErpStockDto>> BillQueryForStock();
-        //盘盈
-        Task<Result> TakeStock_Profit(TakeStock entity);
-        //盘亏
-        Task<Result> TakeStock_Loss(TakeStock entity);
+        //同步数据(保存提交审核)
+        Task<Result> Sync<T>(T dto, string formId);
     }
 }
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 397eee6a..cee411dd 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -254,65 +254,30 @@ namespace WMS.Web.Domain.Services.Public
             }
         }
         /// <summary>
-        /// 盘盈
+        /// 同步数据(保存提交审核)
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="dto"></param>
+        /// <param name="formId"></param>
         /// <returns></returns>
-        public async Task<Result> TakeStock_Profit(TakeStock entity)
+        public async Task<Result> Sync<T>(T dto,string formId)
         {
             try
             {
-                //获取金蝶仓库仓位编码
-                var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
-                var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
-
-                var res = await this.BillQueryForStock();
-                var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
-                var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
-                if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
-                //组装dto
-                #region 组装dto
-                List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
-                detils.Add(new ErpTakeStockDetailsSaveDto()
-                {
-                    FOwnerid = stock.OrgId.ToString(),
-                    FKeeperId = stock.OrgId.ToString(),
-                    MaterialId = entity.MaterialId.ToString(),
-                    UnitId = entity.UnitId.ToString(),
-                    StockId = stock.Id.ToString(),
-                    SubStockId = subStock.Id.ToString(),
-                    BeforeQty = entity.BeforeQty,
-                    AfterQty = entity.AfterQty,
-                    FinalQty = entity.FinalQty,
-                    Fnote = ""
-                });
-                ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
-                {
-                    BillNo = entity.BillNo,
-                    StockOrgId = stock.OrgId.ToString(),
-                    Type = "PY01_SYS",
-                    Date = entity.Date,
-                    Details = detils
-                };
-                #endregion
-
                 var token_result = await this.Init();
                 if (!token_result.IsSuccess)
                     return token_result;
                 var query = new ErpBillQueryDto(token_result.Data);
-                var param = new ErpSave<ErpTakeStockSaveDto>(FormIdParam.STK_StockCountGain.ToString(), dto);
+                var param = new ErpSave<T>(formId, dto);
                 query.Data = JsonConvert.SerializeObject(param);
-
+                //保存
                 var result_json = await _client.SaveAsync(JsonConvert.SerializeObject(query));
                 //提交
-                var sparam = new ErpSubmitDto(FormIdParam.STK_StockCountGain.ToString(), "");
+                var sparam = new ErpSubmitDto(formId, "");
                 query.Data = JsonConvert.SerializeObject(sparam);
                 result_json = await _client.SubmitAsync(JsonConvert.SerializeObject(query));
-
                 //审核
                 result_json = await _client.AuditAsync(JsonConvert.SerializeObject(query));
 
-
                 return Result.ReSuccess();
 
             }
@@ -321,14 +286,6 @@ namespace WMS.Web.Domain.Services.Public
                 return Result.ReFailure("错误", 10002);
             }
         }
-        /// <summary>
-        /// 盘亏
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public async Task<Result> TakeStock_Loss(TakeStock entity)
-        {
-            return Result.ReSuccess();
-        }
+        
     }
 }