Merge branch 'master' into Liudl

bklLiudl

2024-10-19 fe41831b0e9057a16aef1e82048105aee671bbda

 Wms/Wms/Controllers/UpApiController.cs

@@ -17,7 +17,7 @@
namespace Wms.Controllers
{
    /// <summary>
    /// 上游系统交互ceshi
    /// 上游系统交互
    /// </summary>
    [Route("api/[controller]/[action]")]
    [ApiController]
@@ -74,7 +74,7 @@
        /// <param name="model">入库单号</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult FinishAsn(IdVm model) 
        public IActionResult FinishAsn(FinshVm model) 
        {
            try
            {
@@ -89,7 +89,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl, int.Parse(userId));
                _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl,model.UserNo,model.Password, int.Parse(userId));

                return Ok(new { code = 0, count = 0, msg = "入库单复核并上传成功" });
            }
@@ -135,7 +135,7 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult FinishExportNotice(IdVm model)
        public IActionResult FinishExportNotice(FinshVm model)
        {
            try
            {
@@ -150,7 +150,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, model.UserNo, model.Password, int.Parse(userId));
                return Ok(new { code = 0, count = 0, msg = "出库单复核并上传成功" });
            }
            catch (Exception e)