Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

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

@@ -210,7 +210,7 @@ namespace WMS.Web.Api.Controllers
                 return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             List<UcStockResponse> list = new List<UcStockResponse>();
-            if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("JD"))
+            if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("GD"))
                 return Result<List<UcStockResponse>>.ReSuccess(list);
 
             var subs = await _erpService.BillQueryForSubStock(number, orgCode);

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

@@ -102,7 +102,7 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpPost]
         [Route("Sync")]
         public async Task<Result> Sync(OperateRequest dto)
         {

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

@@ -30,9 +30,12 @@ namespace WMS.Web.Api.Controllers
         private readonly IOutStockTaskRepositories _outStockTaskRepositories;
         private readonly IOutStockTaskService _outStockTaskService;
         private readonly IBoxInventoryRepositories _boxInventoryRepositories;
+        private readonly ITakeStockService _takeStockService;
+        private readonly ITakeStockRepositories _takeStockRepositories;
         public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBoxInventoryRepositories boxInventoryRepositories,
             IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService,
-            IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService)
+            IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService,
+            ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories)
         {
             _boxInventoryRepositories = boxInventoryRepositories;
             this._erpService = erpService;
@@ -42,14 +45,16 @@ namespace WMS.Web.Api.Controllers
             _boxService = boxService;
             _outStockTaskRepositories = outStockTaskRepositories;
             _outStockTaskService = outStockTaskService;
+            _takeStockService = takeStockService;
+            _takeStockRepositories = takeStockRepositories;
         }
 
         [HttpGet]
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-
+          var entity=await  _takeStockRepositories.GetEntityList(new List<int>() {2 });
-
+          var r= await _takeStockService.Loss_Profit(entity.First());
             //var list = await GetList();
             //var c = await _erpService.BillQueryForSubStock(null,null);
             //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -590,6 +590,11 @@
             参数
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpBillQueryDto.FormId">
+            <summary>
+            参数(保存提交审核formId在外层)
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryParamDto">
             <summary>
             ERP：单据查询-参数-dto
@@ -710,6 +715,31 @@
             单据类型
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.ErpNumberDto">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpNumberDto.Number">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.ErpSubStockDto">
+            <summary>
+            盘点子仓库
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpSubStockDto.GD">
+            <summary>
+            GD仓
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpSubStockDto.HD">
+            <summary>
+            HD仓
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpOperateDto">
             <summary>
             erp 提交和审核
@@ -800,6 +830,11 @@
             基本单位名称
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.BaseUnitNumber">
+            <summary>
+            基本单位编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
             <summary>
             金蝶组织-基本信息
@@ -1015,6 +1050,11 @@
             业务组织(使用组织)
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.OrgCode">
+            <summary>
+            业务组织(使用组织)编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto">
             <summary>
             erp供应商基础数据
@@ -1127,7 +1167,12 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FinalQty">
             <summary>
-            盘点后数量
+            盘盈数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.LossQty">
+            <summary>
+            盘亏数量
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.Fnote">

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -1660,6 +1660,11 @@
             备注
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.TakeStock.ErpSyncId">
+            <summary>
+            同步到金蝶后金蝶的单据Id
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.TakeStock.SerialNumbers">
             <summary>
             序列号  
@@ -1671,7 +1676,7 @@
             </summary>
             <param name="creatorId"></param>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String,WMS.Web.Domain.Values.SyncStatus)">
+        <member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String,WMS.Web.Domain.Values.SyncStatus,System.String)">
             <summary>
             同步金蝶结果
             </summary>
@@ -2631,6 +2636,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitNumber(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
+            <summary>
+            获取物料基本单位编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
             <summary>
             获取组织名称
@@ -3958,6 +3971,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitNumber(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
+            <summary>
+            获取物料基本单位编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
             <summary>
             获取组织名称
@@ -5644,7 +5665,7 @@
         </member>
         <member name="F:WMS.Web.Domain.Values.SyncStatus.Fail">
             <summary>
-            失败
+            失败(保存失败 未保存)
             </summary>
         </member>
         <member name="F:WMS.Web.Domain.Values.SyncStatus.Success">
@@ -5652,9 +5673,14 @@
             成功
             </summary>
         </member>
-        <member name="F:WMS.Web.Domain.Values.SyncStatus.PortionSuccess">
+        <member name="F:WMS.Web.Domain.Values.SyncStatus.SubmitFail">
             <summary>
-            部分成功(数据保存成功,提交或者审核失败)
+            提交失败
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.SyncStatus.CheckFail">
+            <summary>
+            审核失败
             </summary>
         </member>
         <member name="T:WMS.Web.Domain.Values.TakeStockType">

src/WMS.Web.Core/Dto/Erp/ErpBillQueryDto.cs

@@ -16,6 +16,11 @@ namespace WMS.Web.Core.Dto.Erp
         {
             this.AccessToken = accessToken;
         }
+        public ErpBillQueryDto(string accessToken,string formid)
+        {
+            this.AccessToken = accessToken;
+            this.FormId = formid;
+        }
         /// <summary>
         /// 令牌
         /// </summary>
@@ -26,5 +31,10 @@ namespace WMS.Web.Core.Dto.Erp
         /// </summary>
         [JsonProperty(PropertyName = "data")]
         public string Data { get; set; }
+        /// <summary>
+        /// 参数(保存提交审核formId在外层)
+        /// </summary>
+        [JsonProperty(PropertyName = "formid")]
+        public string FormId { get; set; }
     }
 }

src/WMS.Web.Core/Dto/Erp/ErpNumberDto.cs

@@ -0,0 +1,50 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Erp
+{
+    /// <summary>
+    /// 编码
+    /// </summary>
+    public class ErpNumberDto
+    {
+        public ErpNumberDto() { }
+        public ErpNumberDto(string number)
+        {
+            this.Number = number;
+        }
+        /// <summary>
+        /// 编码
+        /// </summary>
+        [JsonProperty("FNumber")]
+        public string Number { get; set; }
+    }
+
+    /// <summary>
+    /// 盘点子仓库
+    /// </summary>
+    public class ErpSubStockDto
+    {
+        public ErpSubStockDto() { }
+        public ErpSubStockDto(string stockCode, string subCode)
+        {
+            if (stockCode != null && stockCode.Equals("GD"))
+                this.GD = new ErpNumberDto(subCode ?? "");
+            if (stockCode != null && stockCode.Equals("HD"))
+                this.HD = new ErpNumberDto(subCode ?? "");
+        }
+        /// <summary>
+        /// GD仓
+        /// </summary>
+        [JsonProperty("FSTOCKLOCID__FF100005")]
+        public ErpNumberDto GD { get; set; } = new ErpNumberDto("");
+
+        /// <summary>
+        /// HD仓
+        /// </summary>
+        [JsonProperty("FSTOCKLOCID__FF100007")]
+        public ErpNumberDto HD { get; set; } = new ErpNumberDto("");
+    }
+}

src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs

@@ -36,5 +36,9 @@ namespace WMS.Web.Core.Dto.Erp
         /// 基本单位名称
         /// </summary>
         public string BaseUnitName { get; set; }
+        /// <summary>
+        /// 基本单位编码
+        /// </summary>
+        public string BaseUnitNumber { get; set; }
     }
 }

src/WMS.Web.Core/Dto/Erp/Stock/ErpStockDto.cs

@@ -25,5 +25,9 @@ namespace WMS.Web.Core.Dto.Erp
         /// 业务组织(使用组织)
         /// </summary>
         public int OrgId { get; set; }
+        /// <summary>
+        /// 业务组织(使用组织)编码
+        /// </summary>
+        public string OrgCode { get; set; }
     }
 }

src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs

@@ -35,16 +35,16 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
         ///  单据类型(标准盘亏单; 标准盘盈单 PY01_SYS) 盘亏 PK01_SYS 
         /// </summary>
         [JsonProperty("FBillTypeID")]
-        public string Type { get; set; }
+        public ErpNumberDto Type { get; set; }
         /// <summary>
         ///  库存组织 (取仓库对应的库存组织)
         /// </summary>
         [JsonProperty("FStockOrgId")]
-        public string StockOrgId { get; set; }
+        public ErpNumberDto StockOrgId { get; set; }
         /// <summary>
         /// 货主类型: 默认为业务组织 BD_OwnerOrg
         /// </summary>
-        [JsonProperty("FBillTypeID")]
+        [JsonProperty("FOwnerTypeIdHead")]
         public string FOwnerTypeIdHead { get; set; } = "BD_OwnerOrg";
         /// <summary>
         /// 单据编号
@@ -68,7 +68,7 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
         /// 库存状态 KCZT001
         /// </summary>
         [JsonProperty("FStockStatusId")]
-        public string FStockStatusId { get; set; } = "KCZT001";
+        public ErpNumberDto FStockStatusId { get; set; } = new ErpNumberDto("KCZT001");
         /// <summary> 
         /// 货主类型: 默认为业务组织 BD_OwnerOrg
         /// </summary>
@@ -78,7 +78,7 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
         /// 取仓库对应的货主信息 货主: 等于库存组织
         /// </summary>
         [JsonProperty("FOwnerid")]
-        public string FOwnerid { get; set; }
+        public ErpNumberDto FOwnerid { get; set; }
         /// <summary>
         /// 保管者类型
         /// </summary>
@@ -88,27 +88,27 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
         /// 保管者 仓库”库存组织”
         /// </summary>
         [JsonProperty("FKeeperId")]
-        public string FKeeperId { get; set; }
+        public ErpNumberDto FKeeperId { get; set; }
         /// <summary>
         /// 物料ID
         /// </summary>
         [JsonProperty("FMaterialId")]
-        public string MaterialId { get; set; }
+        public ErpNumberDto MaterialId { get; set; }
         /// <summary>
         /// 单位ID
         /// </summary>
         [JsonProperty("FUnitID")]
-        public string UnitId { get; set; }
+        public ErpNumberDto UnitId { get; set; }
         /// <summary>
         /// 仓库ID
         /// </summary>
         [JsonProperty("FStockId")]
-        public string StockId { get; set; }
+        public ErpNumberDto StockId { get; set; }
         /// <summary>
         /// 仓位ID
         /// </summary>
         [JsonProperty("FStockLocId")]
-        public string SubStockId { get; set; }
+        public ErpSubStockDto SubStockId { get; set; }
         /// <summary>
         /// 盘点前数量（wms系统数量）
         /// </summary>
@@ -120,11 +120,16 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
         [JsonProperty("FCountQty")]
         public decimal AfterQty { get; set; }
         /// <summary>
-        /// 盘点后数量
+        /// 盘盈数量
         /// </summary>
         [JsonProperty("FGainQty")]
         public decimal FinalQty { get; set; }
         /// <summary>
+        /// 盘亏数量
+        /// </summary>
+        [JsonProperty("FLossQty")]
+        public decimal LossQty { get; set; }
+        /// <summary>
         /// 备注
         /// </summary>
         [JsonProperty("Fnote")]

src/WMS.Web.Domain/Entitys/TakeStock.cs

@@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Entitys
         [Column("Remark")]
         public string Remark { get; set; }
         /// <summary>
+        /// 同步到金蝶后金蝶的单据Id
+        /// </summary>
+        [Column("ErpSyncId")]
+        public string ErpSyncId { get; set; }
+        /// <summary>
         /// 序列号  
         /// </summary>
         [Column("SerialNumbers")]
@@ -115,10 +120,11 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         /// <param name="isSuccess"></param>
         /// <param name="remark"></param>
-        public void Sync(bool isSuccess, string remark, SyncStatus syncStatus)
+        public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpId)
         {
             this.SuccessSync = syncStatus;
             this.Remark = "";
+            this.ErpSyncId = erpId;
         }
         /// <summary>
         /// 生成单据号

src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs

@@ -51,6 +51,13 @@ namespace WMS.Web.Domain.IService.Public
         /// <returns></returns>
         int GetMaterialUnitId(List<ErpMaterialDto> erpMaterials, int materialId);
         /// <summary>
+        /// 获取物料基本单位编码
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialId"></param>
+        /// <returns></returns>
+        string GetMaterialUnitNumber(List<ErpMaterialDto> erpMaterials, int materialId);
+        /// <summary>
         /// 获取组织名称
         /// </summary>
         /// <param name="erpOrgs"></param>

src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs

@@ -125,6 +125,24 @@ namespace WMS.Web.Domain.Services.Public
             }
             return mat.BaseUnitId;
         }
+        /// <summary>
+        /// 获取物料基本单位编码
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialId"></param>
+        /// <returns></returns>
+        public string GetMaterialUnitNumber(List<ErpMaterialDto> erpMaterials, int materialId)
+        {
+            var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
+            if (mat == null)
+            {
+                var result = _erpService.BillQueryForMaterial(materialId).Result;
+                if (!result.IsSuccess)
+                    return "";
+                return result.Data == null ? "" : result.Data.BaseUnitNumber;
+            }
+            return mat.BaseUnitNumber;
+        }
 
         /// <summary>
         /// 获取组织名称

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -845,7 +845,7 @@ namespace WMS.Web.Domain.Services.Public
             //3.获取金蝶物料：拼接参数和条件
             var query = new ErpBillQueryDto(token_result.Data);
             var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
-            param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName";
+            param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber";
             param.Limit = 10000;
 
             //查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -885,6 +885,7 @@ namespace WMS.Web.Domain.Services.Public
                     lis.Specifications = item[3];
                     lis.BaseUnitId = Convert.ToInt32(item[4]);
                     lis.BaseUnitName = item[5];
+                    lis.BaseUnitNumber = item[6];
                     erp_materials_list.Add(lis);
                 }
                 //4.6页面的叠加
@@ -913,7 +914,7 @@ namespace WMS.Web.Domain.Services.Public
             //3.获取金蝶物料：拼接参数和条件
             var query = new ErpBillQueryDto(token_result.Data);
             var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
-            param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName";
+            param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber";
             param.Limit = 10000;
 
             //查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -947,6 +948,7 @@ namespace WMS.Web.Domain.Services.Public
                 lis.Specifications = item[3];
                 lis.BaseUnitId = Convert.ToInt32(item[4]);
                 lis.BaseUnitName = item[5];
+                lis.BaseUnitNumber = item[6];
                 erp_materials_list.Add(lis);
             }
             if (erp_materials_list.Count == 0)
@@ -1191,7 +1193,7 @@ namespace WMS.Web.Domain.Services.Public
                     //3.获取金蝶仓库：拼接参数和条件
                     var query = new ErpBillQueryDto(token_result.Data);
                     var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
-                    param.FieldKeys = "FStockId,FName,FNumber,FUseOrgId";
+                    param.FieldKeys = "FStockId,FName,FNumber,FUseOrgId,FUseOrgId.FNumber";
                     param.Limit = 10000;
                     //查询条件：备注其中的条件值以金蝶的值为准！！！
                     param.FilterString = "";
@@ -1213,6 +1215,7 @@ namespace WMS.Web.Domain.Services.Public
                         lis.Name = item[1];
                         lis.Code = item[2];
                         lis.OrgId = Convert.ToInt32(item[3]);
+                        lis.OrgCode = item[4];
                         list.Add(lis);
 
                     }
@@ -1273,8 +1276,9 @@ namespace WMS.Web.Domain.Services.Public
                         list.Add(lis);
 
                     }
-                    //5.供应商集合进行缓存
+                    //5.供应商集合进行缓存 只有查询全部的时候才缓存
-                    _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
+                    if (code == null)
+                        _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
                     _logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
                     return ResultList<ErpStockDto>.ReSuccess(list);
                 }
@@ -1303,23 +1307,22 @@ namespace WMS.Web.Domain.Services.Public
                 var token_result = await this.Init();
                 if (!token_result.IsSuccess)
                     return Result<string>.ReFailure(token_result.Message, token_result.Status);
-                var query = new ErpBillQueryDto(token_result.Data);
+                var query = new ErpBillQueryDto(token_result.Data, formId);
                 var param = new ErpSave<T>(formId, dto);
                 query.Data = JsonConvert.SerializeObject(param);
                 //保存
                 var result_json = await _client.SaveAsync(JsonConvert.SerializeObject(query));
 
                 JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
-                var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
 
                 if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
                 {
                     //保存成功后返回Id 后续操作根据Id操作
-                    string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"]["Id"].ToString();
+                    string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString();
                     return Result<string>.ReSuccess(id);
                 }
 
-                var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
+                var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
                 return Result<string>.ReFailure(msg, 10002);
             }
             catch (Exception ex)
@@ -1340,18 +1343,17 @@ namespace WMS.Web.Domain.Services.Public
                 var token_result = await this.Init();
                 if (!token_result.IsSuccess)
                     return token_result;
-                var query = new ErpBillQueryDto(token_result.Data);
+                var query = new ErpBillQueryDto(token_result.Data, formId);
 
                 //提交
                 query.Data = JsonConvert.SerializeObject(dto);
                 var result_json = await _client.SubmitAsync(JsonConvert.SerializeObject(query));
                 JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
-                var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
 
                 if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
                     return Result.ReSuccess();
 
-                var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
+                var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
                 return Result.ReFailure(msg, 10002);
             }
             catch (Exception ex)
@@ -1372,18 +1374,17 @@ namespace WMS.Web.Domain.Services.Public
                 var token_result = await this.Init();
                 if (!token_result.IsSuccess)
                     return token_result;
-                var query = new ErpBillQueryDto(token_result.Data);
+                var query = new ErpBillQueryDto(token_result.Data, formId);
 
                 //提交
                 query.Data = JsonConvert.SerializeObject(dto);
                 var result_json = await _client.AuditAsync(JsonConvert.SerializeObject(query));
                 JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
-                var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
 
                 if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
                     return Result.ReSuccess();
 
-                var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
+                var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
                 return Result.ReFailure(msg, 10002);
             }
             catch (Exception ex)

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

@@ -82,7 +82,7 @@ namespace WMS.Web.Domain.Services
                 isSuccess = await _takeStockRepositories.AddRange(list, false);
                 if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
             }
-            if(res_Rollback.IsSuccess)
+            if (res_Rollback.IsSuccess)
             {
                 var res_Inventory = await _boxInventoryService.GenerateTakeBox(list, false);
                 if (!res_Inventory.IsSuccess) res_Rollback = res_Inventory;
@@ -127,32 +127,35 @@ namespace WMS.Web.Domain.Services
             var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
             var materials_result = await _erpService.BillQueryForMaterial();
             var materials = materials_result.Data.ToList();
-           var unitId = _erpBasicDataExtendService.GetMaterialUnitId(materials,entity.MaterialId);
+            var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, entity.MaterialId);
             var res = await _erpService.BillQueryForStock();
+            var resSub = await _erpService.BillQueryForSubStock();
             var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
-            var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
+            var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
-            if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
+            if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
             //组装dto
             #region 组装dto
+            //子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004
             List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
             detils.Add(new ErpTakeStockDetailsSaveDto()
             {
-                FOwnerid = stock.OrgId.ToString(),
+                FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()),
-                FKeeperId = stock.OrgId.ToString(),
+                FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()),
-                MaterialId = entity.MaterialId.ToString(),
+                MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId)),
-                UnitId = unitId.ToString(), //物料带出来
+                UnitId = new ErpNumberDto(unitNumber), //物料带出来
-                StockId = stock.Id.ToString(),
+                StockId = new ErpNumberDto(stock.Code),
-                SubStockId = subStock.Id.ToString(),
+                SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == entity.Erp_SubStockId)?.Code),
                 BeforeQty = entity.BeforeQty,
                 AfterQty = entity.AfterQty,
-                FinalQty = entity.FinalQty,
+                FinalQty = entity.ResultType == TakeStockType.Profit ? entity.FinalQty : 0,
-                Fnote = ""
+                LossQty = entity.ResultType == TakeStockType.Loss ? entity.FinalQty : 0,
+                Fnote = entity.ResultType == TakeStockType.Loss ? "wms盘亏单同步" : "wms盘盈单同步"
             });
             ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
             {
                 BillNo = entity.BillNo,
-                StockOrgId = stock.OrgId.ToString(),
+                StockOrgId = new ErpNumberDto(stock.OrgCode),
-                Type = entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS",
+                Type = new ErpNumberDto(entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS"),
                 Date = entity.Date,
                 Details = detils
             };
@@ -161,7 +164,7 @@ namespace WMS.Web.Domain.Services
             FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain;
             //操作金蝶
             var resSync = await ErpOperate(dto, type);
-            entity.Sync(resSync.result.IsSuccess, resSync.result.Message,resSync.syncStatus);
+            entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpId);
             await _takeStockRepositories.Edit(entity, true);
             return res;
         }
@@ -171,15 +174,19 @@ namespace WMS.Web.Domain.Services
         /// <param name="dto"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        private async Task<(Result result,SyncStatus syncStatus)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
+        private async Task<(Result result, SyncStatus syncStatus, string erpId)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
         {
             string formId = type.ToString();
-            _logger.LogInformation($"开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}");
+            _logger.LogInformation($"盘点单->开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}");
             var res_s = await _erpService.Save<ErpTakeStockSaveDto>(dto, formId);
             if (!res_s.IsSuccess)
-                return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail);
+            {
+                _logger.LogInformation($"盘点单->保存失败 单号:{dto.BillNo} 错误:{res_s.Message}");
+                return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail, "");
+            }
             //提交
-            ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);
+            _logger.LogInformation($"盘点单->保存成功 开始提交 单号:{dto.BillNo}");
+            ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data
             var res = await _erpService.Submit(o_dto, formId);
             if (!res.IsSuccess)
             {
@@ -188,9 +195,11 @@ namespace WMS.Web.Domain.Services
                 //var del_res = await _erpService.Delete(o_dto, formId);
                 //if (!del_res.IsSuccess)
                 //    _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 提交失败原因: {res.Message} 删单失败原因:{del_res.Message}");
-                return (res, SyncStatus.PortionSuccess);
+                _logger.LogInformation($"盘点单->提交失败 单号:{dto.BillNo} 错误:{res.Message}");
+                return (res, SyncStatus.SubmitFail, o_dto.Ids);
             }
             //审核
+            _logger.LogInformation($"盘点单->提交成功 开始审核 单号:{dto.BillNo}");
             res = await _erpService.Audit(o_dto, formId);
             if (!res.IsSuccess)
             {
@@ -207,10 +216,11 @@ namespace WMS.Web.Domain.Services
                 //var del_res = await _erpService.Delete(o_dto, formId);
                 //if (!del_res.IsSuccess)
                 //    _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 删单失败原因:{del_res.Message}");
-                return (res, SyncStatus.PortionSuccess);
+                _logger.LogInformation($"盘点单->审核失败 单号:{dto.BillNo} 错误:{res.Message}");
+                return (res, SyncStatus.CheckFail, o_dto.Ids);
             }
             _logger.LogInformation($"同步金蝶成功");
-            return (Result.ReSuccess(),SyncStatus.Success);
+            return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids);
         }
     }
 }

src/WMS.Web.Domain/Values/SyncStatus.cs

@@ -11,7 +11,7 @@ namespace WMS.Web.Domain.Values
    public enum SyncStatus
     {
         /// <summary>
-        /// 失败
+        /// 失败(保存失败 未保存)
         /// </summary>
         [EnumRemark("失败")]
         Fail =0,
@@ -21,9 +21,14 @@ namespace WMS.Web.Domain.Values
         [EnumRemark("成功")]
         Success =1,
         /// <summary>
-        /// 部分成功(数据保存成功,提交或者审核失败)
+        /// 提交失败
         /// </summary>
-        [EnumRemark("部分成功")]
+        [EnumRemark("提交失败")]
-        PortionSuccess =2
+        SubmitFail = 2,
+        /// <summary>
+        /// 审核失败
+        /// </summary>
+        [EnumRemark("审核失败")]
+        CheckFail = 3
     }
 }