From 1e7283cacb5eb6de492c6c6874aeaa316063989c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 13 三月 2024 16:46:35 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/Wms/Controllers/BasisController.cs | 37 ++++++++++---------------------------
1 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index a73f38c..a737dda 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -1189,7 +1189,7 @@
}
catch (Exception ex)
{
- return Ok(new { data = "", code = 1, msg = "缂栬緫鍔熻兘寮傚父锛�"+ ex.Message });
+ return Ok(new { data = "", code = 1, msg = "缂栬緫鍔熻兘寮傚父锛�" + ex.Message });
}
}
@@ -1232,11 +1232,12 @@
/// <param name="isControlled">鏄惁鍙楁帶</param>
/// <param name="isInspect">鏄惁鍏嶆</param>
/// <param name="environment">瀛樺偍鐜</param>
+ /// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment)
+ public IActionResult GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
- List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment);
+ List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
return Ok(new
{
data = matedto,
@@ -1282,28 +1283,10 @@
matedto.CreateUser = uid;
//鏂板
int i = await _mate.AddMate(matedto);
- //鍒ゆ柇鏄惁鏂板鎴愬姛
- if (i == 0)
- {
- return Ok(new { data = i, code = 1, msg = "澶辫触" });
- }
- else if (i == 2)
- {
- return Ok(new { data = i, code = 2, msg = "涓存湡澶╂暟涓嶅彲澶т簬365鍙婂皬浜�30" });
- }
- else if (i == 3)
- {
- return Ok(new { data = i, code = 3, msg = "澶辩墿鏂欏彿蹇呴』鍞竴璐�" });
- }
- //else if (i == 4)
- //{
- // return Ok(new { data = i, code = 4, msg = "浣庡簱瀛樹笉鍙珮浜�1000" });
- //}
- else
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "娣诲姞", "娣诲姞鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
- return Ok(new { data = i, code = 0, msg = "鎴愬姛" });
- }
+
+ await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "娣诲姞", "娣诲姞鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
+ return Ok(new { data = i, code = 0, msg = "鎴愬姛" });
+
}
catch (Exception ex)
{
@@ -1383,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)
{
@@ -1396,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)
--
Gitblit v1.8.0