diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 3154460b..d9a4086f 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -236,19 +236,19 @@ namespace WMS.Web.Api.Controllers
///
/// 根据箱号获取箱信息
///
- /// 必填
+ /// 必填
///
[HttpGet]
[Route("GetBox")]
- public async Task> GetBox([FromQuery] List billNos)
+ public async Task> GetBox([FromQuery] List boxBillNos)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList.ReFailure(ResultCodes.Token_Invalid_Error);
- var res = await _boxRepositories.GetBox(billNos);
+ var res = await _boxRepositories.GetBox(boxBillNos);
var bStrList = res.Select(s => s.BoxBillNo).ToList();
- var ex = billNos.Except(bStrList).ToList();
+ var ex = boxBillNos.Except(bStrList).ToList();
if (ex.Count() > 0)
return ResultList.ReFailure("箱号" + JsonConvert.SerializeObject(ex) + "不存在", 800000);
diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs
index 76d4eb32..7839c036 100644
--- a/src/WMS.Web.Domain/Services/TakeStockService.cs
+++ b/src/WMS.Web.Domain/Services/TakeStockService.cs
@@ -1,6 +1,7 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -137,9 +138,9 @@ namespace WMS.Web.Domain.Services
};
#endregion
//判断盘盈盘亏
- string formId = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss.ToString() : FormIdParam.STK_StockCountGain.ToString();
+ FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain;
//操作金蝶
- var resSync = await ErpOperate(dto, formId);
+ var resSync = await ErpOperate(dto, type);
entity.Sync(resSync.IsSuccess, resSync.Message);
await _takeStockRepositories.Edit(entity, true);
return res;
@@ -148,13 +149,15 @@ namespace WMS.Web.Domain.Services
/// 同步金蝶操作
///
///
- ///
+ ///
///
- private async Task ErpOperate(ErpTakeStockSaveDto dto, string formId)
+ private async Task ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
{
+ string formId = type.ToString();
+ _logger.LogInformation($"开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}");
var res_s = await _erpService.Save(dto, formId);
if (!res_s.IsSuccess)
- return Result.ReFailure(res_s.Message,res_s.Status);
+ return Result.ReFailure(res_s.Message, res_s.Status);
//提交
ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);
var res = await _erpService.Submit(o_dto, formId);
@@ -186,7 +189,7 @@ namespace WMS.Web.Domain.Services
_logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 删单失败原因:{del_res.Message}");
return res;
}
-
+ _logger.LogInformation($"同步金蝶成功");
return Result.ReSuccess();
}
}