From 8826a713798e645e42381227e9263c16c65c9f97 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 05 七月 2024 15:04:47 +0800
Subject: [PATCH] 客户、物流、单位、包装
---
Wms/WMS.IBLL/ISysServer/IPackagServer.cs | 11
HTML/views/BaseSetting/PackagFrom.html | 2
HTML/views/BaseSetting/Unit.html | 9
HTML/views/BaseSetting/UnitFrom.html | 2
HTML/views/BaseSetting/Customer.html | 9
HTML/views/Archiving/WaveMage.html | 2
HTML/views/SOSetting/WaveMage.html | 2
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 2
HTML/views/SOSetting/ExportNoticeEditFrom.html | 4
HTML/views/SOSetting/ExportNoticeAddFrom.html | 4
HTML/views/BaseSetting/CustomerFrom.html | 2
HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html | 2
HTML/views/BaseSetting/Packag.html | 7
HTML/views/SOSetting/WaveMageAddInfo.html | 2
HTML/views/BaseSetting/LogisticsInfoFrom.html | 2
Wms/WMS.BLL/SysServer/PackagServer.cs | 388 +++++++++----------
HTML/views/BaseSetting/LogisticsInfo.html | 9
HTML/views/SOSetting/ExportNotice.html | 2
Wms/Wms/Controllers/BasisController.cs | 732 ++++--------------------------------
HTML/views/Archiving/ExportNotice.html | 2
20 files changed, 310 insertions(+), 885 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 3c7406f..8243770 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -518,7 +518,7 @@
0銆�2銆�4銆�6
*/
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
diff --git a/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html b/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
index 5d5845c..9a447ae 100644
--- a/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
@@ -615,7 +615,7 @@
0銆�2銆�4銆�6
*/
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
diff --git a/HTML/views/Archiving/ExportNotice.html b/HTML/views/Archiving/ExportNotice.html
index 363100d..cbad9b0 100644
--- a/HTML/views/Archiving/ExportNotice.html
+++ b/HTML/views/Archiving/ExportNotice.html
@@ -361,7 +361,7 @@
// refreshTablemx(xqid);
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/Archiving/WaveMage.html b/HTML/views/Archiving/WaveMage.html
index 70f2331..2ba2158 100644
--- a/HTML/views/Archiving/WaveMage.html
+++ b/HTML/views/Archiving/WaveMage.html
@@ -191,7 +191,7 @@
bindTable();
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/BaseSetting/Customer.html b/HTML/views/BaseSetting/Customer.html
index 2adf509..aad7852 100644
--- a/HTML/views/BaseSetting/Customer.html
+++ b/HTML/views/BaseSetting/Customer.html
@@ -133,6 +133,7 @@
height: 'full-95',
id: 'LAY-app-content-list',
where: param,
+ parseData: FnParseData,
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
page: true,
@@ -299,7 +300,7 @@
};
sendData(IP + "/Basis/DelsCustomer", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -352,7 +353,7 @@
sendData(IP + "/Basis/AddCustomer", param, 'post',
function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -402,7 +403,7 @@
};
sendData(IP + "/Basis/DelCustomer", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -456,7 +457,7 @@
sendData(IP + "/Basis/EditCustomer", param, 'post',
function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/CustomerFrom.html b/HTML/views/BaseSetting/CustomerFrom.html
index 3cd5df4..accaac8 100644
--- a/HTML/views/BaseSetting/CustomerFrom.html
+++ b/HTML/views/BaseSetting/CustomerFrom.html
@@ -117,7 +117,7 @@
Id: parseInt(id),
};
sendData(IP + "/Basis/GetCustomer", param, 'post', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
//椤甸潰璧嬪��
$("input[name='CustomerNo']").val(res.data.CustomerNo);
$("input[name='CustomerNo']").attr('disabled', 'true');
diff --git a/HTML/views/BaseSetting/LogisticsInfo.html b/HTML/views/BaseSetting/LogisticsInfo.html
index 7d7d190..7d5959d 100644
--- a/HTML/views/BaseSetting/LogisticsInfo.html
+++ b/HTML/views/BaseSetting/LogisticsInfo.html
@@ -137,6 +137,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
+ parseData: FnParseData,
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
// toolbar:'#toolbarDemo',
@@ -323,7 +324,7 @@
sendData(IP + "/Basis/DelsLogisticsInfo", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -375,7 +376,7 @@
};
sendData(IP + "/Basis/AddLogisticsInfo", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -427,7 +428,7 @@
};
sendData(IP + "/Basis/DelLogisticsInfo", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -482,7 +483,7 @@
sendData(IP + "/Basis/EditLogisticsInfo", param, 'post',
function (res) {
console.log(res);
- if(res.code == 0) { //鎴愬姛
+ if(res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/LogisticsInfoFrom.html b/HTML/views/BaseSetting/LogisticsInfoFrom.html
index 6bba914..6221b36 100644
--- a/HTML/views/BaseSetting/LogisticsInfoFrom.html
+++ b/HTML/views/BaseSetting/LogisticsInfoFrom.html
@@ -113,7 +113,7 @@
Id: parseInt(id),
};
sendData(IP + "/Basis/GetLogisticsInfo", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
//椤甸潰璧嬪��
$("input[name='CarrierName']").val(res.data.CarrierName);
$("input[name='Address']").val(res.data.Address);
diff --git a/HTML/views/BaseSetting/Packag.html b/HTML/views/BaseSetting/Packag.html
index 2335d89..84549ce 100644
--- a/HTML/views/BaseSetting/Packag.html
+++ b/HTML/views/BaseSetting/Packag.html
@@ -138,6 +138,7 @@
url: url,
method: 'post',
where: where,
+ parseData: FnParseData,
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
page: true,
@@ -413,7 +414,7 @@
sendData(IP + "/Basis/AddPackag", param, 'post',
function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -470,7 +471,7 @@
if (doing) {
doing = false;
sendData(IP + "/Basis/DelPackag", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -542,7 +543,7 @@
sendData(IP + "/Basis/EditPackag", param, 'post',
function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/PackagFrom.html b/HTML/views/BaseSetting/PackagFrom.html
index 00f81dc..9bf174c 100644
--- a/HTML/views/BaseSetting/PackagFrom.html
+++ b/HTML/views/BaseSetting/PackagFrom.html
@@ -152,7 +152,7 @@
sendData(IP + "/Basis/GetPackagById?Id="+id, param, 'get', function(res) {
console.log(res);
//console.log(res.data.IsValid == 0);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
//鍖呰缂栫爜
if (res.data.SkuNo != "") {
$("input[name='PackCode']").attr("disabled", "disabled")
diff --git a/HTML/views/BaseSetting/Unit.html b/HTML/views/BaseSetting/Unit.html
index af698ff..1328e03 100644
--- a/HTML/views/BaseSetting/Unit.html
+++ b/HTML/views/BaseSetting/Unit.html
@@ -109,6 +109,7 @@
url: url,
method: 'post',
where: where,
+ parseData: FnParseData,
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
page: true,
@@ -245,7 +246,7 @@
doing = false;
synData(IP + "/Basis/DelsUnit", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -303,7 +304,7 @@
sendData(IP + "/Basis/AddUnit", param, 'post',
function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -404,7 +405,7 @@
doing = false;
sendData(IP + "/Basis/DelUnit", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -462,7 +463,7 @@
sendData(IP + "/Basis/EditUnit", param, 'post',
function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/UnitFrom.html b/HTML/views/BaseSetting/UnitFrom.html
index 4f9706f..e09867c 100644
--- a/HTML/views/BaseSetting/UnitFrom.html
+++ b/HTML/views/BaseSetting/UnitFrom.html
@@ -52,7 +52,7 @@
};
sendData(IP + "/Basis/GetUnit", param, 'post', function(res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
//椤甸潰璧嬪��
$("input[name='UnitNo']").val(res.data.UnitNo);
$("input[name='UnitName']").val(res.data.UnitName);
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 3f9836c..73b68ab 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -472,7 +472,7 @@
// refreshTablemx(xqid);
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 0a0b1f1..4f4fa21 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -496,7 +496,7 @@
//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
function getCustomerList() {
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#CustomerNo").empty();
$("#CustomerNo").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
@@ -561,7 +561,7 @@
//鑾峰彇鐗╂祦鎵胯繍鍟嗕笅鎷夋淇℃伅
function getLogisticsInfoList() {
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index b6dc461..b5412ce 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -501,7 +501,7 @@
//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
function getCustomerList(customerNo) {
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
var TypeNum = 0;
switch($("#Type").val())
@@ -567,7 +567,7 @@
//鑾峰彇鐗╂祦鎵胯繍鍟嗕笅鎷夋淇℃伅
function getLogisticsInfoList(logisticsId) {
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SOSetting/WaveMage.html b/HTML/views/SOSetting/WaveMage.html
index 463f526..bd47d5b 100644
--- a/HTML/views/SOSetting/WaveMage.html
+++ b/HTML/views/SOSetting/WaveMage.html
@@ -263,7 +263,7 @@
bindTable();
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SOSetting/WaveMageAddInfo.html b/HTML/views/SOSetting/WaveMageAddInfo.html
index 0a107c2..90c7c00 100644
--- a/HTML/views/SOSetting/WaveMageAddInfo.html
+++ b/HTML/views/SOSetting/WaveMageAddInfo.html
@@ -62,7 +62,7 @@
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/Wms/WMS.BLL/SysServer/PackagServer.cs b/Wms/WMS.BLL/SysServer/PackagServer.cs
index 8da9fd8..d6ca134 100644
--- a/Wms/WMS.BLL/SysServer/PackagServer.cs
+++ b/Wms/WMS.BLL/SysServer/PackagServer.cs
@@ -9,6 +9,8 @@
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
using Model.ModelVm.SysVm;
+using System.Threading.Tasks;
+using Utility;
namespace WMS.BLL.SysServer
{
@@ -29,7 +31,7 @@
/// <param name="packagName">鍖呰鍚嶇О</param>
/// <param name="level">绛夌骇</param>
/// <returns>鍖呰闆嗗悎</returns>
- public List<PackagDto> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, out int count)
+ public async Task<List<PackagDto>> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, RefAsync<int> count)
{
try
{
@@ -39,9 +41,9 @@
.AndIF(level != null, it => it.Level.Equals(level))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var data = PackagRst.GetAllByOrderPage(item, limit, page, out int counts)
+ var data = await PackagRst.GetAllByOrderPage(item, limit, page, out int counts)
.Includes(x => x.CreateUserInfo)
- .Includes(x => x.UpdateUserInfo).ToList();
+ .Includes(x => x.UpdateUserInfo).ToListAsync();
count = counts;
return data.Select(m => new PackagDto()
@@ -83,10 +85,9 @@
/// </summary>
/// <param name="id">鍖呰id</param>
/// <returns></returns>
- public SysPackag GetPackagById(int id)
+ public async Task<SysPackag> GetPackagById(int id)
{
- SysPackag packag = PackagRst.GetOneById(id);
- return packag;
+ return await PackagRst.GetOneByIdAsync(id);
}
/// <summary>
@@ -94,101 +95,88 @@
/// </summary>
/// <param name="model">鍖呰淇℃伅</param>
/// <returns>true锛氭垚鍔� flase锛氬け璐�</returns>
- public int AddPackag(AddEditPackagVm model)
+ public async Task<int> AddPackag(AddEditPackagVm model)
{
- try
+ var rowCount = await PackagRst.GetAllWhere(m => m.PackagNo == model.PackagNo).CountAsync();
+ if (rowCount > 0)
{
- var rowCount = PackagRst.GetAllWhere(m => m.PackagNo == model.PackagNo).Count();
- if (rowCount > 0)
- {
- throw new Exception("鍖呰缂栧彿宸插瓨鍦�!");
- }
+ throw Oops.Bah("鍖呰缂栧彿宸插瓨鍦�!");
+ }
- rowCount = PackagRst.GetAllWhere(m => m.PackagName == model.PackagName).Count();
- if (rowCount > 0)
- {
- throw new Exception("鍖呰鍚嶇О宸插瓨鍦�!");
- }
+ rowCount = await PackagRst.GetAllWhere(m => m.PackagName == model.PackagName).CountAsync();
+ if (rowCount > 0)
+ {
+ throw Oops.Bah("鍖呰鍚嶇О宸插瓨鍦�!");
+ }
- SysPackag packagModel = new SysPackag();
- packagModel.PackagNo = model.PackagNo;
- packagModel.PackagName = model.PackagName;
- packagModel.Level = 0;
+ SysPackag packagModel = new SysPackag();
+ packagModel.PackagNo = model.PackagNo;
+ packagModel.PackagName = model.PackagName;
+ packagModel.Level = 0;
- //鍒ゆ柇浜旂骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
- {
- packagModel.L5Num = int.Parse(model.L5Num);
- packagModel.L5Name = model.L5Name;
- packagModel.Level += 1;
- //鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
- {
- return 2;
- }
- }
+ //鍒ゆ柇浜旂骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
+ {
+ packagModel.L5Num = int.Parse(model.L5Num);
+ packagModel.L5Name = model.L5Name;
+ packagModel.Level += 1;
//鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
+ if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
{
- packagModel.L4Num = int.Parse(model.L4Num);
- packagModel.L4Name = model.L4Name;
- packagModel.Level += 1;
- //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
- {
- return 2;
- }
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇娣诲姞!");
}
- //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
- {
- packagModel.L3Num = int.Parse(model.L3Num);
- packagModel.L3Name = model.L3Name;
- packagModel.Level += 1;
- //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
- {
- return 2;
- }
- }
- //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
- {
- packagModel.L2Num = int.Parse(model.L2Num);
- packagModel.L2Name = model.L2Name;
- packagModel.Level += 1;
- //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
- if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
- {
- return 2;
- }
- }
- //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
- if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
- {
- packagModel.L1Num = int.Parse(model.L1Num);
- packagModel.L1Name = model.L1Name;
- packagModel.Level += 1;
- }
- else
- {
- return 2;
- }
-
- packagModel.CreateUser = (int)model.CreateUser;
-
- int rowNum = PackagRst.Add(packagModel);
- if (rowNum > 0)
- {
- return 1;
- }
-
- return 0;
}
- catch (Exception e)
+ //鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
{
- throw new Exception(e.Message);
+ packagModel.L4Num = int.Parse(model.L4Num);
+ packagModel.L4Name = model.L4Name;
+ packagModel.Level += 1;
+ //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
+ if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇娣诲姞!");
+ }
}
+ //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
+ {
+ packagModel.L3Num = int.Parse(model.L3Num);
+ packagModel.L3Name = model.L3Name;
+ packagModel.Level += 1;
+ //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
+ if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇娣诲姞!");
+ }
+ }
+ //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
+ {
+ packagModel.L2Num = int.Parse(model.L2Num);
+ packagModel.L2Name = model.L2Name;
+ packagModel.Level += 1;
+ //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
+ if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇娣诲姞!");
+ }
+ }
+ //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
+ if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
+ {
+ packagModel.L1Num = int.Parse(model.L1Num);
+ packagModel.L1Name = model.L1Name;
+ packagModel.Level += 1;
+ }
+ else
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇娣诲姞!");
+ }
+
+ packagModel.CreateUser = (int)model.CreateUser;
+
+ return await PackagRst.AddAsync(packagModel);
}
/// <summary>
@@ -196,117 +184,109 @@
/// </summary>
/// <param name="model">鍖呰淇℃伅</param>
/// <returns>true锛氭垚鍔� flase锛氬け璐�</returns>
- public int EditPackag(AddEditPackagVm model)
+ public async Task<int> EditPackag(AddEditPackagVm model)
{
- try
+ if (string.IsNullOrEmpty(model.PackagName))
{
- if (string.IsNullOrEmpty(model.PackagName))
+ var date = await PackagRst.GetAllWhere(m => m.Id != model.Id && (m.PackagName == model.PackagName)).CountAsync();
+ if (date > 0)
{
- var date = PackagRst.GetAllWhere(m => m.Id != model.Id && (m.PackagName == model.PackagName)).Count();
- if (date > 0)
- {
- throw new Exception("鍖呰鍚嶇О宸插瓨鍦�!");
- }
+ throw Oops.Bah("鍖呰鍚嶇О宸插瓨鍦�!");
}
- var packagItems = PackagRst.GetOneById(model.Id);
- packagItems.Id = model.Id; //id
- packagItems.PackagNo = model.PackagNo; //鍖呰缂栧彿
- packagItems.PackagName = model.PackagName; //鍖呰鎻忚堪
- //packagItems.IsDel = model.IsDel; 鍘熷洜: 淇敼鏃朵笉闇�瑕佷慨鏀笽sDel瀛楁
- packagItems.UpdateTime = DateTime.Now; //淇敼鏃堕棿
- packagItems.UpdateUser = model.CreateUser; //淇敼浜�
- packagItems.Level = 0;
+ }
+ var packagItems = PackagRst.GetOneById(model.Id);
+ packagItems.Id = model.Id; //id
+ packagItems.PackagNo = model.PackagNo; //鍖呰缂栧彿
+ packagItems.PackagName = model.PackagName; //鍖呰鎻忚堪
+ //packagItems.IsDel = model.IsDel; 鍘熷洜: 淇敼鏃朵笉闇�瑕佷慨鏀笽sDel瀛楁
+ packagItems.UpdateTime = DateTime.Now; //淇敼鏃堕棿
+ packagItems.UpdateUser = model.CreateUser; //淇敼浜�
+ packagItems.Level = 0;
- //鍒ゆ柇浜旂骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
- {
- packagItems.L5Num = int.Parse(model.L5Num);
- packagItems.L5Name = model.L5Name;
- packagItems.Level += 1;
- //鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
- {
- return 2;
- }
- }
- else
- {
- packagItems.L5Num = null;
- packagItems.L5Name = null;
- }
+ //鍒ゆ柇浜旂骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
+ {
+ packagItems.L5Num = int.Parse(model.L5Num);
+ packagItems.L5Name = model.L5Name;
+ packagItems.Level += 1;
//鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
+ if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
{
- packagItems.L4Num = int.Parse(model.L4Num);
- packagItems.L4Name = model.L4Name;
- packagItems.Level += 1;
- //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
- {
- return 2;
- }
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇淇敼 璇烽噸鏂拌緭鍏�");
}
- else
- {
- packagItems.L4Num = null;
- packagItems.L4Name = null;
- }
- //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
- {
- packagItems.L3Num = int.Parse(model.L3Num);
- packagItems.L3Name = model.L3Name;
- packagItems.Level += 1;
- //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
- {
- return 2;
- }
- }
- else
- {
- packagItems.L3Num = null;
- packagItems.L3Name = null;
- }
- //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
- {
- packagItems.L2Num = int.Parse(model.L2Num);
- packagItems.L2Name = model.L2Name;
- packagItems.Level += 1;
- //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
- if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
- {
- return 2;
- }
- }
- else
- {
- packagItems.L3Num = null;
- packagItems.L3Name = null;
- }
- //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
- if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
- {
- packagItems.L1Num = int.Parse(model.L1Num);
- packagItems.L1Name = model.L1Name;
- packagItems.Level += 1;
- }
- else
- {
- packagItems.L1Num = null;
- packagItems.L1Name = null;
-
- return 2;
- }
-
- var rowCount = PackagRst.Edit(packagItems);
- return rowCount;
}
- catch (Exception e)
+ else
{
- throw new Exception(e.Message);
+ packagItems.L5Num = null;
+ packagItems.L5Name = null;
}
+ //鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
+ {
+ packagItems.L4Num = int.Parse(model.L4Num);
+ packagItems.L4Name = model.L4Name;
+ packagItems.Level += 1;
+ //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
+ if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇淇敼 璇烽噸鏂拌緭鍏�");
+ }
+ }
+ else
+ {
+ packagItems.L4Num = null;
+ packagItems.L4Name = null;
+ }
+ //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
+ {
+ packagItems.L3Num = int.Parse(model.L3Num);
+ packagItems.L3Name = model.L3Name;
+ packagItems.Level += 1;
+ //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
+ if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇淇敼 璇烽噸鏂拌緭鍏�");
+ }
+ }
+ else
+ {
+ packagItems.L3Num = null;
+ packagItems.L3Name = null;
+ }
+ //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
+ {
+ packagItems.L2Num = int.Parse(model.L2Num);
+ packagItems.L2Name = model.L2Name;
+ packagItems.Level += 1;
+ //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
+ if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
+ {
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇淇敼 璇烽噸鏂拌緭鍏�");
+ }
+ }
+ else
+ {
+ packagItems.L3Num = null;
+ packagItems.L3Name = null;
+ }
+ //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
+ if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
+ {
+ packagItems.L1Num = int.Parse(model.L1Num);
+ packagItems.L1Name = model.L1Name;
+ packagItems.Level += 1;
+ }
+ else
+ {
+ packagItems.L1Num = null;
+ packagItems.L1Name = null;
+
+ throw Oops.Bah("鍖呰绛夌骇涓嶅彲瓒婄骇淇敼 璇烽噸鏂拌緭鍏�");
+ }
+
+ return await PackagRst.EditAsync(packagItems);
}
/// <summary>
@@ -314,27 +294,19 @@
/// </summary>
/// <param name="packagId">鍖呰淇℃伅涓婚敭ID</param>
/// <returns>true锛氭垚鍔� flase锛氬け璐�</returns>
- public bool DelPackag(int packagId, int userId)
+ public async Task<bool> DelPackag(int packagId, int userId)
{
- try
+ var packagItems = await PackagRst.GetOneByIdAsync(packagId);
+ if (packagItems == null)
{
- var packagItems = PackagRst.GetOneById(packagId);
- if (packagItems == null)
- {
- throw new Exception("鍖呰淇℃伅涓嶅瓨鍦紒");
- }
-
- packagItems.IsDel = "1";
- packagItems.UpdateTime = DateTime.Now;
- packagItems.UpdateUser = userId;
-
- var rowCount = PackagRst.Edit(packagItems);
- return rowCount > 0;
+ throw Oops.Bah("鍖呰淇℃伅涓嶅瓨鍦紒");
}
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
+
+ packagItems.IsDel = "1";
+ packagItems.UpdateTime = DateTime.Now;
+ packagItems.UpdateUser = userId;
+
+ return await PackagRst.EditAsync(packagItems) > 0;
}
}
}
diff --git a/Wms/WMS.IBLL/ISysServer/IPackagServer.cs b/Wms/WMS.IBLL/ISysServer/IPackagServer.cs
index 21156aa..9dfeb42 100644
--- a/Wms/WMS.IBLL/ISysServer/IPackagServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IPackagServer.cs
@@ -4,6 +4,7 @@
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
using Model.ModelVm.SysVm;
+using SqlSugar;
using WMS.Entity.SysEntity;
namespace WMS.IBLL.ISysServer
@@ -20,35 +21,35 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<PackagDto> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, out int count);
+ Task<List<PackagDto>> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, RefAsync<int> count);
/// <summary>
/// 鏍规嵁id鑾峰彇鍖呰淇℃伅
/// </summary>
/// <param name="id">鍖呰id</param>
/// <returns></returns>
- SysPackag GetPackagById(int id);
+ Task<SysPackag> GetPackagById(int id);
/// <summary>
/// 鏂板鍖呰淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- int AddPackag(AddEditPackagVm model);
+ Task<int> AddPackag(AddEditPackagVm model);
/// <summary>
/// 淇敼鍖呰淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- int EditPackag(AddEditPackagVm model);
+ Task<int> EditPackag(AddEditPackagVm model);
/// <summary>
/// 閫昏緫鍒犻櫎鍖呰淇℃伅
/// </summary>
/// <param name="packagId">鍖呰涓婚敭Id</param>
/// <returns></returns>
- bool DelPackag(int packagId, int userId);
+ Task<bool> DelPackag(int packagId, int userId);
}
}
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 1c2411a..d1d05d1 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -28,6 +28,7 @@
[Route("api/[controller]/[action]")]
[ApiController]
[Authorize]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
public class BasisController : ControllerBase
{
/// <summary>
@@ -93,7 +94,6 @@
/// <param name="Status">鐘舵��</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<UserInfoDto>> GetUserRoleList(string UserName, string DepartmentNo, string RoleNo, string Status)
{
return await _userInforServer.GetUserRoleList(UserName, DepartmentNo, RoleNo, Status);
@@ -105,7 +105,6 @@
/// <param name="id">鐢ㄦ埛id</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SysUserInfor> GetUserinfoListById(int id)
{
return await _userInforServer.GetUserInfoById(id);
@@ -119,7 +118,6 @@
/// <returns></returns>
/// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task InsertUserinfo(UserInfoDto UserInfoDto)
{
@@ -142,7 +140,6 @@
/// <returns></returns>
/// <exception cref="System.Exception">寮傚父</exception>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task DeleteUserInfo(int userids)
{
@@ -167,7 +164,6 @@
/// <returns></returns>
/// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task UpdateUserinfo(UserInfoDto userdto)
{
@@ -197,7 +193,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task UptUserPassWord(string pwdOld, string pwdNew, string pwdNewTwo/*, int userId*/)
{
pwdOld = Md5Tools.CalcMd5(pwdOld);
@@ -219,7 +214,6 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<int> IsPassWordTime()
{
return await _userInforServer.IsPassWordTime(_userManager.UserId);
@@ -237,7 +231,6 @@
/// <param name="RoleName">瑙掕壊鍚嶇О</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<RoleDto>> GetRolesList(string RoleNo, string RoleName)
{
return await _rolesServer.GetRoleList(RoleNo, RoleName);
@@ -249,7 +242,6 @@
/// <param name="roleid">瑙掕壊id</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SysRoles> GetRolesListById(int roleid)
{
return await _rolesServer.GetRoleInfoById(roleid);
@@ -262,7 +254,6 @@
/// <returns></returns>
/// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task InsertRoleInfo(RoleDto roledto)
{
@@ -284,7 +275,6 @@
/// <returns></returns>
/// <exception cref="System.Exception"></exception>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task DeleteRoleInfo(int roleids)
{
@@ -308,7 +298,6 @@
/// <returns></returns>
/// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task UpdateRolesInfo(SysRoles role)
{
@@ -344,10 +333,9 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<FunctionMenuDto>> GetRoleRightRBAC(int id, string MenuNo)
{
- return await _rBACServer.GetRoleRightRBAC(MenuNo, UserId);
+ return await _rBACServer.GetRoleRightRBAC(MenuNo, _userManager.UserId.ToString());
}
/// <summary>
@@ -355,7 +343,6 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<RoleRightDto>> GetRoleRightLists(int id)
{
return await _rBACServer.GetRoleRightList(id);
@@ -367,7 +354,6 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<RoleRightDto>> GetRoleRightList()
{
return await _roleRightServer.GetRoleMenuList();
@@ -379,7 +365,6 @@
/// <param name="id">瑙掕壊鏉冮檺id</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<SysRoleRight>> GetRoleRightOneListById(int id)
{
return await _roleRightServer.GetRoleRightOneListById(id);
@@ -393,7 +378,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task InsertRoleRight(string MenuNo, int id)
{
@@ -422,7 +406,6 @@
/// <param name="DepartmentNo">閮ㄩ棬鍙�</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<DepartmentDto>> GetDepartmentList(string DepartmentName, string DepartmentNo)
{
return await _department.GetDepartmentList(DepartmentName, DepartmentNo);
@@ -434,7 +417,6 @@
/// <param name="id">閮ㄩ棬id</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SysDepartment> GetDepartmentById(int id)
{
return await _department.GetDepartmentById(id);
@@ -447,7 +429,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task AddDepartment(DepartmentDto departmentdto)
{
@@ -469,7 +450,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task DelDepartment(int Id)
{
@@ -492,7 +472,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task ExitDepartment(DepartmentDto departmentdto)
{
@@ -519,7 +498,6 @@
/// <param name="GroupNo">缁勫彿</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<FunSettingDto>> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo)
{
return await _setting.GetFunSettingList(FunSetName, IsEnable, GroupNo);
@@ -531,7 +509,6 @@
/// <param name="id">鍔熻兘id</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SysFunSetting> GetFunSettingById(int id)
{
return await _setting.GetFunSettingById(id);
@@ -543,7 +520,6 @@
/// <param name="funSetNo">鍔熻兘缂栧彿</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SysFunSetting> GetFunSettingByNo(string funSetNo)
{
return await _setting.GetFunSettingByNo(funSetNo);
@@ -555,7 +531,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task AddFunSettings(FunSettingDto settingdto)
{
@@ -577,7 +552,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task DelFunSettings(int id)
{
@@ -600,7 +574,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task ExitFunSettings(FunSettingDto settingdto)
{
@@ -636,7 +609,6 @@
/// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
return await _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
@@ -648,7 +620,6 @@
/// <param name="id">鐗╂枡id</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SysMaterials> GetMateById(int id)
{
return await _mate.GetMateById(id);
@@ -660,7 +631,6 @@
/// <param name="matedto">鐗╂枡dto</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task AddMate(MaterialsDto matedto)
{
await _mate.AddMate(matedto);
@@ -681,7 +651,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task DelMate(int id)
{
SysMaterials mate = await _mate.GetMateById(id);
@@ -703,7 +672,6 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task ExitMate(MaterialsDto matedto)
{
await _mate.ExitMate(matedto);
@@ -724,7 +692,6 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<SysUnit>> GetUnitList()
{
return await _mate.GetUnitList();
@@ -735,7 +702,6 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<SysPackag>> GetPackagList()
{
return await _mate.GetPackagList();
@@ -926,19 +892,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> GetCustomerList(GetCustomerVm model)
+ public async Task<SqlSugarPagedList<CustomerDto>> GetCustomerList(GetCustomerVm model)
{
- try
- {
- RefAsync<int> count = new RefAsync<int>();
- var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
-
- return Ok(new { code = 0, count, msg = "瀹㈡埛淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
+ return new SqlSugarPagedList<CustomerDto>() { Items = bolls, Total = bolls.Count };
}
/// <summary>
/// 鏌ヨ鍗曟潯瀹㈡埛淇℃伅
@@ -946,36 +904,18 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> GetCustomer(IdVm model)
+ public async Task<SysCustomer> GetCustomer(IdVm model)
{
- try
- {
- var bolls = await _customerSvc.GetCustomer(model.Id);
-
- return Ok(new { code = 0, count = 0, msg = "瀹㈡埛淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _customerSvc.GetCustomer(model.Id);
}
/// <summary>
/// 鏌ヨ鍏ㄩ儴瀹㈡埛淇℃伅
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetCustomerSelect()
+ public async Task<List<SysCustomer>> GetCustomerSelect()
{
- try
- {
- var bolls = await _customerSvc.GetCustomerSelect();
-
- return Ok(new { code = 0, count = 0, msg = "瀹㈡埛淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _customerSvc.GetCustomerSelect();
}
/// <summary>
/// 娣诲姞瀹㈡埛淇℃伅
@@ -983,38 +923,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> AddCustomer(AddCustomerVm model)
+ [UnitOfWork]
+ public async Task AddCustomer(AddCustomerVm 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 = await _customerSvc.AddCustomer(model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, int.Parse(userId));
-
- if (bolls)
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "瀹㈡埛绠＄悊", model.CustomerNo, "娣诲姞", "娣诲姞瀹㈡埛淇℃伅 瀹㈡埛鍙凤細" + model.CustomerNo, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "娣诲姞鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "娣诲姞澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _customerSvc.AddCustomer(model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, _userManager.UserId);
+ await _operation.InsertOperation("鍩虹淇℃伅", "瀹㈡埛绠＄悊", model.CustomerNo, "娣诲姞", "娣诲姞瀹㈡埛淇℃伅 瀹㈡埛鍙凤細" + model.CustomerNo, _userManager.UserId);
}
/// <summary>
/// 缂栬緫瀹㈡埛淇℃伅
@@ -1022,38 +935,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> EditCustomer(EditCustomerVm model)
+ [UnitOfWork]
+ public async Task EditCustomer(EditCustomerVm 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 = await _customerSvc.EditCustomer(model.Id, model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, int.Parse(userId));
-
- if (bolls)
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "瀹㈡埛绠＄悊", model.CustomerNo, "缂栬緫", "缂栬緫瀹㈡埛淇℃伅 瀹㈡埛鍙凤細" + model.CustomerNo, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "缂栬緫鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "缂栬緫澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _customerSvc.EditCustomer(model.Id, model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, _userManager.UserId);
+ await _operation.InsertOperation("鍩虹淇℃伅", "瀹㈡埛绠＄悊", model.CustomerNo, "缂栬緫", "缂栬緫瀹㈡埛淇℃伅 瀹㈡埛鍙凤細" + model.CustomerNo, _userManager.UserId);
}
/// <summary>
/// 鍒犻櫎瀹㈡埛淇℃伅
@@ -1061,38 +947,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> DelCustomer(IdVm model)
+ [UnitOfWork]
+ public async Task DelCustomer(IdVm model)
{
- try
- {
- SysCustomer customer = await _customerSvc.GetCustomer(model.Id);
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩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 = await _customerSvc.DelCustomer(model.Id, int.Parse(userId));
- if (bolls)
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "瀹㈡埛绠＄悊", customer.CustomerNo, "鍒犻櫎", "鍒犻櫎瀹㈡埛淇℃伅 瀹㈡埛鍙凤細" + customer.CustomerNo, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ SysCustomer customer = await _customerSvc.GetCustomer(model.Id);
+ var bolls = await _customerSvc.DelCustomer(model.Id, _userManager.UserId);
+ await _operation.InsertOperation("鍩虹淇℃伅", "瀹㈡埛绠＄悊", customer.CustomerNo, "鍒犻櫎", "鍒犻櫎瀹㈡埛淇℃伅 瀹㈡埛鍙凤細" + customer.CustomerNo, _userManager.UserId);
}
/// <summary>
/// 鍒犻櫎瀹㈡埛淇℃伅(澶氬垹闄�)
@@ -1100,36 +960,10 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> DelsCustomer(IdVm model)
+ [UnitOfWork]
+ public async Task DelsCustomer(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 = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
-
- var bolls = await _customerSvc.DelsCustomer(model.Ids, int.Parse(userId));
- if (bolls)
- {
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _customerSvc.DelsCustomer(model.Ids, _userManager.UserId);
}
#endregion
@@ -1140,19 +974,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> GetLogisticsInfoList(GetLogisticsInfoVm model)
+ public async Task<SqlSugarPagedList<LogisticsInfoDto>> GetLogisticsInfoList(GetLogisticsInfoVm model)
{
- try
- {
- RefAsync<int> count = new RefAsync<int>();
- var bolls = await _logisticsSvc.GetLogisticsInfoList(model.CarrierName, model.LinkMan, model.Phone, model.LicensePlate, model.Type, model.Page, model.Limit, count);
-
- return Ok(new { code = 0, count, msg = "鐗╂祦淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ RefAsync<int> count = new RefAsync<int>();
+ var list = await _logisticsSvc.GetLogisticsInfoList(model.CarrierName, model.LinkMan, model.Phone, model.LicensePlate, model.Type, model.Page, model.Limit, count);
+ return new SqlSugarPagedList<LogisticsInfoDto>() { Items = list, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯鐗╂祦淇℃伅
@@ -1160,36 +986,18 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> GetLogisticsInfo(IdVm model)
+ public async Task<SysLogisticsInfo> GetLogisticsInfo(IdVm model)
{
- try
- {
- var bolls = await _logisticsSvc.GetLogisticsInfo(model.Id);
-
- return Ok(new { code = 0, data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _logisticsSvc.GetLogisticsInfo(model.Id);
}
/// <summary>
/// 鏌ヨ鍏ㄩ儴鐗╂祦淇℃伅
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetLogisticsInfoSelect()
+ public async Task<List<SysLogisticsInfo>> GetLogisticsInfoSelect()
{
- try
- {
- var bolls = await _logisticsSvc.GetLogisticsInfoSelect();
-
- return Ok(new { code = 0, data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _logisticsSvc.GetLogisticsInfoSelect();
}
/// <summary>
@@ -1198,38 +1006,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> AddLogisticsInfo(AddLogisticsInfoVm model)
+ [UnitOfWork]
+ public async Task AddLogisticsInfo(AddLogisticsInfoVm 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 = await _logisticsSvc.AddLogisticsInfo(model, int.Parse(userId));
-
- if (bolls)
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", model.CarrierName, "娣诲姞", "娣诲姞鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + model.CarrierName, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "娣诲姞鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "娣诲姞澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _logisticsSvc.AddLogisticsInfo(model, _userManager.UserId);
+ await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", model.CarrierName, "娣诲姞", "娣诲姞鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + model.CarrierName, _userManager.UserId);
}
/// <summary>
/// 缂栬緫鐗╂祦淇℃伅
@@ -1237,38 +1018,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> EditLogisticsInfo(EditLogisticsInfoVm model)
+ [UnitOfWork]
+ public async Task EditLogisticsInfo(EditLogisticsInfoVm 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 = await _logisticsSvc.EditLogisticsInfo(model, int.Parse(userId));
-
- if (bolls)
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", model.CarrierName, "缂栬緫", "缂栬緫鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + model.CarrierName, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "缂栬緫鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "缂栬緫澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _logisticsSvc.EditLogisticsInfo(model, _userManager.UserId);
+ await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", model.CarrierName, "缂栬緫", "缂栬緫鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + model.CarrierName, _userManager.UserId);
}
/// <summary>
/// 鍒犻櫎鐗╂祦淇℃伅
@@ -1276,39 +1030,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> DelLogisticsInfo(IdVm model)
+ [UnitOfWork]
+ public async Task DelLogisticsInfo(IdVm model)
{
- try
- {
- SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩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 = await _logisticsSvc.DelLogisticsInfo(model.Id, int.Parse(userId));
- if (bolls)
- {
-
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", logisit.CarrierName, "鍒犻櫎", "鍒犻櫎鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + logisit.CarrierName, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _logisticsSvc.DelLogisticsInfo(model.Id, _userManager.UserId);
+ SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
+ await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", logisit.CarrierName, "鍒犻櫎", "鍒犻櫎鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + logisit.CarrierName, _userManager.UserId);
}
/// <summary>
/// 鍒犻櫎鐗╂祦淇℃伅(澶氭潯淇℃伅)
@@ -1316,36 +1043,10 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> DelsLogisticsInfo(IdVm model)
+ [UnitOfWork]
+ public async Task DelsLogisticsInfo(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 = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
-
- var bolls = await _logisticsSvc.DelsLogisticsInfo(model.Ids, int.Parse(userId));
- if (bolls)
- {
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _logisticsSvc.DelsLogisticsInfo(model.Ids, _userManager.UserId);
}
#endregion
@@ -1357,19 +1058,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> GetUnitList(GetUnitVm model)
+ public async Task<SqlSugarPagedList<UnitDto>> GetUnitList(GetUnitVm model)
{
- try
- {
- RefAsync<int> count = new RefAsync<int>();
- var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
-
- return Ok(new { code = 0, count, msg = "鐗╂祦淇℃伅", data = list });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ RefAsync<int> count = new RefAsync<int>();
+ var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
+ return new SqlSugarPagedList<UnitDto>() { Items = list, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯鍗曚綅淇℃伅
@@ -1377,24 +1070,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> GetUnit(IdVm model)
+ public async Task<SysUnit> GetUnit(IdVm model)
{
- try
- {
- var data = await _unitSvc.GetUnit(model.Id);
- if (data != null)
- {
- return Ok(new { code = 0, data });
- }
- else
- {
- return Ok(new { code = 1, data = "鏈煡璇㈠埌鐗╂祦淇℃伅" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _unitSvc.GetUnit(model.Id);
}
/// <summary>
/// 娣诲姞璁￠噺淇℃伅
@@ -1402,43 +1080,16 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> AddUnit(AddEditUnitVm model)
+ [UnitOfWork]
+ public async Task AddUnit(AddEditUnitVm model)
{
if (ModelState.IsValid)
{
- 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 = await _unitSvc.AddUnit(model.UnitName, model.Abbrev, int.Parse(userId));
-
- if (bolls)
- {
- return Ok(new { code = 0, msg = "娣诲姞鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "娣诲姞澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _unitSvc.AddUnit(model.UnitName, model.Abbrev, _userManager.UserId);
}
else
{
- return Ok(new { code = 1, msg = "鏁版嵁鏍煎紡閿欒" });
+ throw Oops.Bah("鏁版嵁鏍煎紡閿欒");
}
}
@@ -1448,45 +1099,18 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> EditUnit(AddEditUnitVm model)
+ [UnitOfWork]
+ public async Task EditUnit(AddEditUnitVm model)
{
if (ModelState.IsValid)
{
- 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 = await _unitSvc.EditUnit(model.Id, model.UnitName, model.Abbrev, int.Parse(userId));
-
- if (bolls)
- {
- SysUnit unit = await _unitSvc.GetUnit(model.Id);
- await _operation.InsertOperation("鍩虹淇℃伅", "璁￠噺鍗曚綅", unit.UnitNo, "缂栬緫", "缂栬緫璁￠噺鍗曚綅 鍗曚綅鍚嶇О锛�" + unit.UnitNo, Convert.ToInt32(userId));
- return Ok(new { code = 0, msg = "缂栬緫鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "缂栬緫澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _unitSvc.EditUnit(model.Id, model.UnitName, model.Abbrev, _userManager.UserId);
+ SysUnit unit = await _unitSvc.GetUnit(model.Id);
+ await _operation.InsertOperation("鍩虹淇℃伅", "璁￠噺鍗曚綅", unit.UnitNo, "缂栬緫", "缂栬緫璁￠噺鍗曚綅 鍗曚綅鍚嶇О锛�" + unit.UnitNo, _userManager.UserId);
}
else
{
- return Ok(new { code = 1, msg = "鏁版嵁鏍煎紡閿欒" });
+ throw Oops.Bah("鏁版嵁鏍煎紡閿欒");
}
}
@@ -1496,35 +1120,10 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> DelUnit(IdVm model)
+ [UnitOfWork]
+ public async Task DelUnit(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 = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var bolls = await _unitSvc.DelUnit(model.Id, int.Parse(userId));
- if (bolls)
- {
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _unitSvc.DelUnit(model.Id, _userManager.UserId);
}
/// <summary>
/// 鍒犻櫎璁￠噺鍗曚綅淇℃伅锛堝鍒犻櫎锛�
@@ -1532,53 +1131,14 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<IActionResult> DelsUnit(IdVm model)
+ [UnitOfWork]
+ public async Task DelsUnit(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 = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var bolls = await _unitSvc.DelsUnit(model.Ids, int.Parse(userId));
- if (bolls)
- {
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ var bolls = await _unitSvc.DelsUnit(model.Ids, _userManager.UserId);
}
#endregion
#region 鍖呰绠＄悊
- private string UserId;
- //public BasisController()
- //{
- // var claimsIdentity = this.User.Identity as ClaimsIdentity;
- // if (claimsIdentity == null)
- // {
- // throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- // }
- // UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- // if (string.IsNullOrWhiteSpace(UserId))
- // {
- // throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- // }
- //}
/// <summary>
/// 鏌ヨ鍖呰淇℃伅
@@ -1586,18 +1146,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetPackagList(GetPackagVm model)
+ public async Task<SqlSugarPagedList<PackagDto>> GetPackagList(GetPackagVm model)
{
- try
- {
- var list = _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, out int count);
-
- return Ok(new { code = 0, count, msg = "鐗╂祦淇℃伅", data = list });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ RefAsync<int> count = new RefAsync<int>();
+ var list = await _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, count);
+ return new SqlSugarPagedList<PackagDto> { Items = list, Total = count };
}
/// <summary>
@@ -1606,15 +1159,9 @@
/// <param name="id">鍖呰id</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetPackagById(int id)
+ public async Task<SysPackag> GetPackagById(int id)
{
- SysPackag packag = _packagSvc.GetPackagById(id);
- return Ok(new
- {
- data = packag,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _packagSvc.GetPackagById(id);
}
/// <summary>
@@ -1623,47 +1170,11 @@
/// <param name="model">鍖呰淇℃伅</param>
/// <returns></returns>
[HttpPost]
- public IActionResult AddPackag(AddEditPackagVm model)
+ [UnitOfWork]
+ public async Task AddPackag(AddEditPackagVm model)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- model.CreateUser = int.Parse(UserId);
- int i = _packagSvc.AddPackag(model);
-
- if (i == 1)
- {
- _operation.InsertOperation("鍩虹淇℃伅", "鍖呰绠＄悊", model.PackagNo, "娣诲姞", "娣诲姞鍖呰淇℃伅 鍖呰缂栧彿锛�" + model.PackagNo, Convert.ToInt32(UserId));
- return Ok(new { code = 0, msg = "娣诲姞鎴愬姛" });
- }
- else if (i > 1)
- {
- return Ok(new { code = i, msg = "鍖呰绛夌骇涓嶅彲瓒婄骇娣诲姞" });
- }
- else
- {
- return Ok(new { code = 1, msg = "娣诲姞澶辫触" });
- }
- }
-
- catch (Exception e)
- {
- return Ok(new
- {
- code = 1,
- msg = e.Message
- });
- }
+ await _packagSvc.AddPackag(model);
+ await _operation.InsertOperation("鍩虹淇℃伅", "鍖呰绠＄悊", model.PackagNo, "娣诲姞", "娣诲姞鍖呰淇℃伅 鍖呰缂栧彿锛�" + model.PackagNo, _userManager.UserId);
}
/// <summary>
@@ -1672,42 +1183,11 @@
/// <param name="model">鍖呰淇℃伅</param>
/// <returns></returns>
[HttpPost]
- public IActionResult EditPackag(AddEditPackagVm model)
+ [UnitOfWork]
+ public async Task EditPackag(AddEditPackagVm model)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- model.CreateUser = int.Parse(UserId);
- int i = _packagSvc.EditPackag(model);
-
- if (i == 1)
- {
- _operation.InsertOperation("鍩虹淇℃伅", "鍖呰绠＄悊", model.PackagNo, "缂栬緫", "缂栬緫鍖呰淇℃伅 鍖呰缂栧彿锛�" + model.PackagNo, Convert.ToInt32(UserId));
- return Ok(new { code = 0, msg = "缂栬緫鎴愬姛" });
- }
- if (i == 2)
- {
- return Ok(new { code = i, msg = "鍖呰绛夌骇涓嶅彲瓒婄骇淇敼 璇烽噸鏂拌緭鍏�" });
- }
- else
- {
- return Ok(new { code = 1, msg = "缂栬緫澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _packagSvc.EditPackag(model);
+ await _operation.InsertOperation("鍩虹淇℃伅", "鍖呰绠＄悊", model.PackagNo, "缂栬緫", "缂栬緫鍖呰淇℃伅 鍖呰缂栧彿锛�" + model.PackagNo, _userManager.UserId);
}
/// <summary>
@@ -1716,37 +1196,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult DelPackag(AddEditPackagVm model)
+ [UnitOfWork]
+ public async Task DelPackag(AddEditPackagVm model)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- var bolls = _packagSvc.DelPackag(model.Id, int.Parse(UserId));
-
- if (bolls)
- {
- _operation.InsertOperation("鍩虹淇℃伅", "鍖呰绠＄悊", model.PackagNo, "鍒犻櫎", "鍒犻櫎鍖呰淇℃伅 鍖呰缂栧彿锛�" + model.PackagNo, Convert.ToInt32(UserId));
- return Ok(new { code = 0, msg = "鍒犻櫎鎴愬姛" });
- }
- else
- {
- return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _packagSvc.DelPackag(model.Id, _userManager.UserId);
+ await _operation.InsertOperation("鍩虹淇℃伅", "鍖呰绠＄悊", model.PackagNo, "鍒犻櫎", "鍒犻櫎鍖呰淇℃伅 鍖呰缂栧彿锛�" + model.PackagNo, _userManager.UserId);
}
#endregion
@@ -1784,7 +1238,6 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model)
{
return await _interface.GetInterfaceList(model);
@@ -1796,7 +1249,6 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model)
{
return await _interface.GetInterfaceDetailList(model);
@@ -1808,7 +1260,6 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task AddInterface(InterfaceVm model)
{
@@ -1829,7 +1280,6 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task EditInterface(InterfaceVm model)
{
@@ -1850,7 +1300,6 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task DelInterface(InterfaceVm model)
{
@@ -1871,7 +1320,6 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
[UnitOfWork]
public async Task DelInterfaceDetail(InterfaceDetailVm model)
{
--
Gitblit v1.8.0