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/PdaSoController.cs | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index e68aed2..bc959a6 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -159,7 +159,27 @@
return Ok(new { code = 1, msg = e.Message });
}
}
-
+
+ /// <summary>
+ /// 鑾峰彇绠辩爜淇℃伅锛堣幏鍙栧簱鍐呮棤绠辩爜鐨勬墭鐩樺垎閰嶄俊鎭級
+ /// </summary>
+ /// <param name="model">BoxNo:绠辩爜鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetAllotPlnInfo(PdaSoVm model)
+ {
+ try
+ {
+ var models = _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
+
+ return Ok(new { code = 0, msg = "绠辩爜淇℃伅", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
/// <summary>
/// 鍑哄簱pda鎷ｈ揣
@@ -183,7 +203,39 @@
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 = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鍑哄簱pda鎷ｈ揣
+ /// </summary>
+ /// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult SoSetQtyPick(PdaSoVm model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+
+ _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, int.Parse(userId));
return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
}
@@ -288,5 +340,61 @@
}
+
+ /// <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 });
+ }
+
+ }
+
+
+
}
}
--
Gitblit v1.8.0