修复bug

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

@@ -53,7 +53,7 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-          var entity=await  _takeStockRepositories.GetEntityList(new List<int>() {1 });
+          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);

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

@@ -725,6 +725,21 @@
             编码
             </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 提交和审核
@@ -1152,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.Core/Dto/Erp/ErpNumberDto.cs

@@ -8,10 +8,11 @@ namespace WMS.Web.Core.Dto.Erp
     /// <summary>
     /// 编码
     /// </summary>
-   public class ErpNumberDto
+    public class ErpNumberDto
     {
         public ErpNumberDto() { }
-        public ErpNumberDto(string number) {
+        public ErpNumberDto(string number)
+        {
             this.Number = number;
         }
         /// <summary>
@@ -27,12 +28,12 @@ namespace WMS.Web.Core.Dto.Erp
     public class ErpSubStockDto
     {
         public ErpSubStockDto() { }
-        public ErpSubStockDto(string code)
+        public ErpSubStockDto(string stockCode, string subCode)
         {
-            if (code.Equals("GD"))
+            if (stockCode != null && stockCode.Equals("GD"))
-                this.GD = new ErpNumberDto(code);
+                this.GD = new ErpNumberDto(subCode ?? "");
-            if (code.Equals("HD"))
+            if (stockCode != null && stockCode.Equals("HD"))
-                this.HD = new ErpNumberDto(code);
+                this.HD = new ErpNumberDto(subCode ?? "");
         }
         /// <summary>
         /// GD仓

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

@@ -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/Services/TakeStockService.cs

@@ -144,11 +144,12 @@ namespace WMS.Web.Domain.Services
                 MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId)),
                 UnitId = new ErpNumberDto(unitNumber), //物料带出来
                 StockId = new ErpNumberDto(stock.Code),
-                SubStockId =new ErpSubStockDto(resSub.Data.FirstOrDefault(f => f.Id == entity.Erp_SubStockId).Code),
+                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()
             {
@@ -173,7 +174,7 @@ namespace WMS.Web.Domain.Services
         /// <param name="dto"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        private async Task<(Result result, SyncStatus syncStatus,string erpId)> 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)}");
@@ -181,7 +182,7 @@ namespace WMS.Web.Domain.Services
             if (!res_s.IsSuccess)
             {
                 _logger.LogInformation($"盘点单->保存失败 单号:{dto.BillNo} 错误:{res_s.Message}");
-                return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail,"");
+                return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail, "");
             }
             //提交
             _logger.LogInformation($"盘点单->保存成功 开始提交 单号:{dto.BillNo}");