From ecb386a4201213c6635f28f9e9e02e3faf217b51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 16 三月 2024 11:08:34 +0800
Subject: [PATCH] 修改储位图例柱状图以及圆形图显示数据问题。
---
Wms/Wms/Controllers/PdaSoController.cs | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index de7edbc..b357110 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -203,7 +203,7 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, int.Parse(userId));
+ _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3,model.PickQty ,int.Parse(userId));
return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
}
@@ -340,5 +340,92 @@
}
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨�
+ /// </summary>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetSampleType(string palletNo)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ var type = _pdaSoSvc.GetSampleType(palletNo);
+
+ return Ok(new { data = type, code = 0, msg = "鑾峰彇鍙栨牱绫诲瀷" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = "鑾峰彇鍙栨牱绫诲瀷閿欒锛�" + e.Message });
+ }
+
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栧叆搴撳崟鎹�
+ /// </summary>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetAsnNoByPallet(string palletNo)
+ {
+ try
+ {
+ var type = _pdaSoSvc.GetAsnNoByPallet(palletNo);
+
+ return Ok(new { data = type, code = 0, msg = "鑾峰彇鍏ュ簱鍗曟嵁" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = "鑾峰彇鍏ュ簱鍗曟嵁閿欒锛�" + e.Message });
+ }
+
+ }
+ /// <summary>
+ /// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult SampleSoSetPick(PdaSoVm model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ int uid = Convert.ToInt32(UserId);
+
+ _pdaSoSvc.SampleSoSetPick(model.Type,model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.AsnNo, uid);
+
+ return Ok(new { data = "", code = 0, msg = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣閿欒锛�" + e.Message });
+ }
+
+ }
+
+
}
}
--
Gitblit v1.8.0