From 845ccac41be71294fdd4dec197537c85d4828665 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 30 一月 2024 16:26:56 +0800
Subject: [PATCH] 入库流程增加订单复核功能
---
Wms/Wms/Controllers/UpApiController.cs | 48 ++++++++++++++++-------
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 19 +++++++--
HTML/views/ASNSetting/ArrivalNotice.html | 31 +++++++++++++++
3 files changed, 77 insertions(+), 21 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 690df4d..1ab7926 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -180,6 +180,9 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
<a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
break;
+ case "3" :
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
+ break;
default :
break;
}
@@ -962,6 +965,32 @@
var param = {
Id:data.Id,
};
+ sendData(IP + "/UpApi/CloseAsn", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true });
+ }
+ });
+ });
+
+ break;
+ case "check" :
+ // 浠ｇ爜鍖哄煙
+ layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function(index) {
+ // 浠ｇ爜鍖哄煙
+ var param = {
+ Id:data.Id,
+ };
sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -978,7 +1007,7 @@
}, function () { doing = true });
}
});
- });
+ });
break;
case "chexiao" :
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 4f45bdc..5609bc5 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -847,6 +847,10 @@
{
throw new Exception("鏈煡璇㈠埌鍗曟嵁鏄庣粏淇℃伅");
}
+ if (userId == notice.UpdateUser)
+ {
+ throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍏抽棴璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
+ }
var list = new List<AsnDetail>();
foreach (var d in detail)
{
@@ -865,21 +869,26 @@
OrderCode = notice.OrderCode,
AsnDetails = list
};
- // 閫氳繃鎺ュ彛鍙戦�佽嚦erp
- var jsonData = JsonConvert.SerializeObject(soInfo);
+
+ #region 閫氳繃鎺ュ彛鍙戦�佽嚦erp
+ //绯荤粺瀵规帴鍚庢斁寮�
+ /*var jsonData = JsonConvert.SerializeObject(soInfo);
var response = HttpHelper.DoPost(url, jsonData, "鍏ュ簱鍗曞畬鎴愪笂浼�", "ERP");
- //瑙ｆ瀽杩斿洖鏁版嵁
- var obj = JsonConvert.DeserializeObject<ErpModel>(response);
+ var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
if (obj.Success != 0)
{
throw new Exception("涓婁紶澶辫触" + obj.Message);
- }
+ }*/
+ #endregion
+
notice.Status = "4";
notice.UpdateTime = DateTime.Now;
notice.UpdateUser = userId;
Db.Updateable(notice).ExecuteCommand();
+
+ new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", notice.ASNNo, "澶嶆牳", $"澶嶆牳浜嗗崟鎹彿涓簕notice.ASNNo}鐨勫崟鎹俊鎭�", userId);
return true;
}
catch (Exception e)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 1e6feb4..5b724f7 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -37,9 +37,38 @@
#endregion
#region 璋冪敤涓婃父绯荤粺鎺ュ彛
-
/// <summary>
- /// 鍏ュ簱鍗曞畬鎴愬洖浼�
+ /// 鍏ュ簱鍗曞叧闂�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CloseAsn(IdVm 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _arrivalNoticeSvc.CloseArrivalNotice(model.Id, int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞叧鍗曟垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鍏ュ簱鍗曞鏍稿苟鍥炰紶
/// </summary>
/// <param name="model">鍏ュ簱鍗曞彿</param>
/// <returns></returns>
@@ -59,20 +88,9 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _arrivalNoticeSvc.CloseArrivalNotice(model.Id, int.Parse(userId));
-
- if (bolls == "")
- {
- //绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_ArrivalNoticeSvc.FinishAsn(model.Id,_config.ErpHost+_config.AsnFinishUrl,int.Parse(userId));
- //if (bl)
- //{
- return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞叧鍗曚笂浼犳垚鍔�" });
- //}
- //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- }
- return Ok(new { code = 1, msg = "鍏ュ簱鍗曞叧鍗曞け璐�" });
+ _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, int.Parse(userId));
+ return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
catch (Exception e)
{
--
Gitblit v1.8.0