From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Wms/Controllers/BasisController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 6025132..310dcf3 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -1285,7 +1285,7 @@
int i = await _mate.AddMate(matedto);
await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "娣诲姞", "娣诲姞鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
- return Ok(new { data = i, code = 0, msg = "鎴愬姛" });
+ return Ok(new { data = i, code = i, msg = "鎴愬姛" });
}
catch (Exception ex)
@@ -1366,7 +1366,7 @@
//鍒ゆ柇鏄惁缂栬緫鎴愬姛
if (i == 0)
{
- return Ok(new { data = i, code = 1, msg = "澶辫触" });
+ return Ok(new { data = i, code = 1, msg = "淇敼澶辫触" });
}
else if (i == 2)
{
@@ -1379,7 +1379,7 @@
else
{
await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "淇敼", "缂栬緫鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
- return Ok(new { data = i, code = 0, msg = "鎴愬姛" });
+ return Ok(new { data = i, code = 0, msg = "淇敼鎴愬姛" });
}
}
catch (Exception ex)
@@ -1612,7 +1612,7 @@
{
try
{
- var bolls = _customerSvc.GetCustomerList(model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, out int count);
+ var bolls = _customerSvc.GetCustomerList(model.CustomerNo,model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, out int count);
return Ok(new { code = 0, count, msg = "瀹㈡埛淇℃伅", data = bolls });
}
--
Gitblit v1.8.0