From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Wms/Wms/Controllers/SysController.cs | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 24560ea..43f7184 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -21,6 +21,7 @@
using Model.ModelDto;
using Model.ModelDto.LogDto;
using Newtonsoft.Json.Linq;
+using Model.ModelVm.LogVm;
namespace Wms.Controllers
{
@@ -1260,6 +1261,47 @@
return Ok(new { code = 1, msg = "鏁版嵁鏍煎紡閿欒" });
}
}
+
+ /// <summary>
+ /// 淇敼鍌ㄤ綅鐘舵�佹爣璇嗕俊鎭泦鍚�
+ /// </summary>
+ /// <param name="model">妯″瀷</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult EditStorageLocatListNew (EditLocateListNewVm 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 = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var bolls = _locatSvc.EditStorageLocatListNew(model, int.Parse(userId));
+ if (bolls)
+ {
+ _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", "", "淇敼", $"淇敼宸烽亾锛歿model.RoadWayNo}銆佹帓:{model.Row}銆佸垪:{model.Column}銆佸眰:{model.Layer}銆佹繁搴︼細{model.Dept}鐨勫尯鍩燂細{model.AreaNo}銆佺姸鎬�:{model.Status}銆佹爣璇嗭細{model.Flag}鐨勫偍浣嶄俊鎭� ", Convert.ToInt32(userId));
+
+ return Ok(new { code = 0, msg = "缂栬緫鎴愬姛", data = "" });
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = "缂栬緫澶辫触", data = "" });
+ }
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
#endregion
#region 鎵樼洏鏉＄爜绠＄悊
@@ -1374,17 +1416,21 @@
{
throw new Exception("褰撳墠鏄剧ず鐨勬潯鐮佷笉鏄渶鏂版潯鐮侊紝璇烽噸鏂版坊鍔�");
}
- string str = model.PalletNo.Substring(3, 5);
- string remove = model.PalletNo.Substring(0, 3);
+ string str = model.PalletNo.Substring(2, 6);
+ string remove = model.PalletNo.Substring(0, 2);
int sibelius = Convert.ToInt16(str);
for (int i = 0; i < model.GroupCount; i++)
{
+ if (sibelius>999999)
+ {
+ throw new Exception("鎵樼洏缁勪腑宸叉湁鎵樼洏鐮佷綅鏁板凡杈句笂绾�");
+ }
if (i != 0)
{
sibelius += 1;
}
- string code = remove + Convert.ToString(sibelius).PadLeft(5, '0');
+ string code = remove + Convert.ToString(sibelius).PadLeft(6, '0');
for (int j = 0; j < model.SameCount; j++)
{
var re = BarcodeHelper.GetCodeBarBase64(code, 80, 50);
@@ -1997,7 +2043,30 @@
#endregion
+ #region 鎿嶄綔鏃ュ織
+ /// <summary>
+ /// 鑾峰彇鎿嶄綔鏃ュ織淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult GetLogOperationList(GetOperationVm model)
+ {
+ try
+ {
+ var bolls = _operation.GetOperationList(model.MenuName, model.Type, model.Msg, model.StartTime, model.EndTime, model.Page, model.Limit, out int count);
+
+ return Ok(new { code = 0, count, msg = "鎿嶄綔鏃ュ織淇℃伅", data = bolls });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ #endregion
#region 鏁版嵁琛ㄦ牸琛ㄥご鑷畾涔�(閫氱敤鏂规硶)
/// <summary>
--
Gitblit v1.8.0