From 638b471ad73bce1c701d9f9c8d02effe6a38c7ca Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 22 七月 2024 16:57:20 +0800
Subject: [PATCH] 修改托盘绑定方法
---
Wms/Wms/Controllers/UpApiController.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 4929f8e..b966b0b 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/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);
--
Gitblit v1.8.0