Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS

hwh

2024-07-19 5d94e93813ca45250287c802db2ad8796eeabe79

 Wms/Wms/Controllers/UpApiController.cs

@@ -20,6 +20,8 @@
using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;

namespace Wms.Controllers
{
@@ -206,7 +208,7 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult FinishCr(AdjustStockCheckVm model)
        public async Task<IActionResult> FinishCr(AdjustStockCheckVm model)
        {
            try
            {
@@ -221,27 +223,24 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                bool bolls = false;
                //bool bolls = false;
                if (model.Origin == "0")
                {
                    bolls = _stockCheckSvc.StockAdjust(model.Id, int.Parse(userId));
                    await _stockCheckSvc.StockAdjust(model.Id);
                }
                else
                {
                    bolls = _stockCheckSvc.StockAdjustAuto(model.Id, int.Parse(userId));
                    await _stockCheckSvc.StockAdjustAuto(model.Id);
                }
                if (bolls)
                {
                    //系统对接后放开
                    //var bl =_stockCheckSvc.FinishCr(model.Id,_config.ErpHost + _config.DataChangeUrl, int.Parse(userId));
                    //if (bl)
                    //{
                    return Ok(new { code = 0, count = 0, msg = "盘点单调整上传成功" });
                    //}
                    //return Ok(new { code = 1, count = 0, msg = "出库单关单成功但上传失败" });
                }
                //系统对接后放开
                //var bl =_stockCheckSvc.FinishCr(model.Id,_config.ErpHost + _config.DataChangeUrl, int.Parse(userId));
                //if (bl)
                //{
                return Ok(new { code = 0, count = 0, msg = "盘点单调整上传成功" });
                //}
                //return Ok(new { code = 1, count = 0, msg = "出库单关单成功但上传失败" });

                return Ok(new { code = 1, msg = "盘点单调整失败" });
                //return Ok(new { code = 1, msg = "盘点单调整失败" });

            }
            catch (Exception e)
@@ -447,6 +446,7 @@
        /// 测试验签加密
        /// </summary>
        /// <returns></returns>
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [Verification]
        [HttpPost]
        public IActionResult Demo2(IdVm model)
@@ -468,11 +468,12 @@
            }
        }

        [HttpGet]
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public string Demo3()
        [UnitOfWork]
        public string Demo3(IdVm model)
        {
            string jsonParams = "{\"param1\": \"value1\", \"param2\": \"value2\"}";
            string jsonParams = JsonConvert.SerializeObject(model);

            // 生成时间戳（Unix 时间戳）
            var timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString();
@@ -487,7 +488,7 @@

        private static string GenerateSignature(string jsonParams)
        {
            var appKey = "90170307d4184844ac2a26b431f79980";
            var appKey = "90170307d4184844ac2a26b431f79981";
            // 将 JSON 字符串转换为 JObject
            JObject jObject = JObject.Parse(jsonParams);