From 34bfa7df61921f7d1798fc08db0b8d81828da96b Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 02 七月 2024 08:07:57 +0800
Subject: [PATCH] 物料、部门、功能设定
---
HTML/js/public.js | 4
HTML/views/BaseSetting/Department.html | 8
HTML/views/BaseSetting/DepartmentForm.html | 2
HTML/views/QualityControl/QualityInspectionFrom.html | 6
HTML/views/SystemSettings/FunSetting.html | 8
HTML/views/SystemSettings/FunSettingForm.html | 2
HTML/views/ASNSetting/ArrivalLogTask.html | 2
Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs | 24 -
Wms/WMS.BLL/SysServer/DepartmentServer.cs | 106 ++---
HTML/views/BaseSetting/Materials.html | 6
HTML/views/BaseSetting/Packag.html | 2
Wms/WMS.BLL/SysServer/FunSettingServer.cs | 119 ++----
Wms/WMS.IBLL/ISysServer/IDepartmentServer.cs | 6
Wms/WMS.IBLL/ISysServer/IFunSettingServer.cs | 6
HTML/views/BaseSetting/MaterialsForm.html | 6
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 219 +++--------
HTML/views/QualityControl/QualityInspection.html | 2
Wms/Wms/Controllers/BasisController.cs | 593 ++++++------------------------
18 files changed, 315 insertions(+), 806 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index 03fbba5..b1ca696 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -13,7 +13,7 @@
{
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun013", {}, 'get', function (res) {
console.log(res.data.SetValue)
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
pageCnt = parseInt(res.data.SetValue);
@@ -244,7 +244,7 @@
function GetIsSetColW()
{
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun014", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
isSetColW=true;
diff --git a/HTML/views/ASNSetting/ArrivalLogTask.html b/HTML/views/ASNSetting/ArrivalLogTask.html
index 881a045..acaaaee 100644
--- a/HTML/views/ASNSetting/ArrivalLogTask.html
+++ b/HTML/views/ASNSetting/ArrivalLogTask.html
@@ -604,7 +604,7 @@
$(".shenqingClass").hide(); //鐢宠鍌ㄤ綅
});
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun012", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
$(function () {
diff --git a/HTML/views/BaseSetting/Department.html b/HTML/views/BaseSetting/Department.html
index f451c9b..8b257af 100644
--- a/HTML/views/BaseSetting/Department.html
+++ b/HTML/views/BaseSetting/Department.html
@@ -95,7 +95,7 @@
sendData(IP + "/Basis/GetDepartmentList?DepartmentName=" + DepartmentName + "&&DepartmentNo=" + DepartmentNo, {}, "get", function (res) {
console.log(res.data);
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
var list = res.data;
@@ -253,7 +253,7 @@
Demo: field.Demo,
};
sendData( IP + "/Basis/AddDepartment", param, "post", function (res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
layer.msg(
res.msg,
@@ -343,7 +343,7 @@
msg: cusid,
};
sendData( IP + "/Basis/DelDepartment?Id="+cusid+"",{},"get",function (res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
layer.msg(
res.msg,
@@ -410,7 +410,7 @@
Demo: field.Demo,
};
sendData( IP + "/Basis/ExitDepartment", param, "post", function (res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
layer.msg("淇敼鎴愬姛",
{
diff --git a/HTML/views/BaseSetting/DepartmentForm.html b/HTML/views/BaseSetting/DepartmentForm.html
index 467ff6c..8751c40 100644
--- a/HTML/views/BaseSetting/DepartmentForm.html
+++ b/HTML/views/BaseSetting/DepartmentForm.html
@@ -57,7 +57,7 @@
};
sendData(IP + "/Basis/GetDepartmentById?Id="+param.id+"", {}, 'get', function(res) {
console.log(res);
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
//閮ㄩ棬鍙风紪杈戜笉鏄剧ず
if(res.data.DepartmentNo != "")
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index dfbbea7..4b67082 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -459,7 +459,7 @@
doing = false;
sendData(IP + "/Basis/AddMate", 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绉掞級
@@ -559,7 +559,7 @@
doing = false;
sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -641,7 +641,7 @@
doing = false;
sendData(IP + "/Basis/ExitMate", param, 'post',
function(res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
layer.msg("淇敼鎴愬姛", {
icon: 1,
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index a2ee30a..e73933f 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -279,7 +279,7 @@
var sel1 = false;
//鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
@@ -299,7 +299,7 @@
var sel2 = false;
//鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
@@ -328,7 +328,7 @@
UserId: id,
};
synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
// console.log(res.data.CategoryNo)
//瀹℃壒鐘舵�佺紪杈戞樉绀�
diff --git a/HTML/views/BaseSetting/Packag.html b/HTML/views/BaseSetting/Packag.html
index de43d13..2335d89 100644
--- a/HTML/views/BaseSetting/Packag.html
+++ b/HTML/views/BaseSetting/Packag.html
@@ -334,7 +334,7 @@
doing = false;
sendData(IP + "/Basis/GetPackagList", 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/QualityControl/QualityInspection.html b/HTML/views/QualityControl/QualityInspection.html
index fd71631..72fa725 100644
--- a/HTML/views/QualityControl/QualityInspection.html
+++ b/HTML/views/QualityControl/QualityInspection.html
@@ -377,7 +377,7 @@
doing = false;
sendData(IP + "/Basis/AddMate", 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/QualityControl/QualityInspectionFrom.html b/HTML/views/QualityControl/QualityInspectionFrom.html
index cf0db7a..34f566f 100644
--- a/HTML/views/QualityControl/QualityInspectionFrom.html
+++ b/HTML/views/QualityControl/QualityInspectionFrom.html
@@ -67,7 +67,7 @@
//鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
sendData(IP + "/Basis/GetUnitList",{},'get',function(res){
- if(res.code == 0) //鎴愬姛
+ if(res.code == 200) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++)
{
@@ -86,7 +86,7 @@
//鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
sendData(IP + "/Basis/GetPackagList",{},'get',function(res){
- if(res.code == 0) //鎴愬姛
+ if(res.code == 200) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++)
{
@@ -115,7 +115,7 @@
UserId: id,
};
sendData(IP + "/Basis/GetMateById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
//瀹℃壒鐘舵�佺紪杈戞樉绀�
if(res.data.AuditStatusNo != "")
diff --git a/HTML/views/SystemSettings/FunSetting.html b/HTML/views/SystemSettings/FunSetting.html
index b826016..e631df5 100644
--- a/HTML/views/SystemSettings/FunSetting.html
+++ b/HTML/views/SystemSettings/FunSetting.html
@@ -104,7 +104,7 @@
GroupNo: GroupNo
};
sendData(IP + "/Basis/GetFunSettingList?FunSetName="+FunSetName+"&&IsEnable="+IsEnable+"&&GroupNo="+GroupNo, {}, 'get', function(res) {
- if (res.code == 0)
+ if (res.code == 200)
{ //鎴愬姛
var list = res.data;
$.extend(infoOptions, {
@@ -256,7 +256,7 @@
doing = false;
sendData(IP + "/basis/AddFunSettings", param, 'post',function(res) {
console.log(res);
- if (res.code == 0)
+ if (res.code == 200)
{ //鎴愬姛
layer.msg(res.msg, {
icon: 1,
@@ -340,7 +340,7 @@
doing = false;
sendData(IP + "/Basis/DelFunSettings?Id="+data.Id+"", {} , 'get', function(res) {
console.log(res);
- if (res.code == 0)
+ if (res.code == 200)
{ //鎴愬姛
layer.msg(res.msg, {
icon: 1,
@@ -400,7 +400,7 @@
doing = false;
sendData(IP + "/basis/ExitFunSettings", param, 'post',
function(res) {
- if (res.code == 0)
+ if (res.code == 200)
{ //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
diff --git a/HTML/views/SystemSettings/FunSettingForm.html b/HTML/views/SystemSettings/FunSettingForm.html
index 6b21256..f8eebea 100644
--- a/HTML/views/SystemSettings/FunSettingForm.html
+++ b/HTML/views/SystemSettings/FunSettingForm.html
@@ -87,7 +87,7 @@
UserId: id,
};
sendData(IP + "/basis/GetFunSettingById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
- if (res.code == 0)
+ if (res.code == 200)
{ //鎴愬姛
//椤甸潰璧嬪��
if(res.data.FunSetNo != "")
diff --git a/Wms/WMS.BLL/SysServer/DepartmentServer.cs b/Wms/WMS.BLL/SysServer/DepartmentServer.cs
index b7d1a9c..e9129e5 100644
--- a/Wms/WMS.BLL/SysServer/DepartmentServer.cs
+++ b/Wms/WMS.BLL/SysServer/DepartmentServer.cs
@@ -7,6 +7,11 @@
using WMS.Entity.SysEntity;
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
+using SqlSugar;
+using WMS.Entity.Context;
+using Utility;
+using Microsoft.AspNetCore.Identity;
+using System.Data;
namespace WMS.BLL.SysServer
{
@@ -20,15 +25,18 @@
/// </summary>
private readonly IDepartmentRepository _department;
readonly IMapper _mapper;
+ private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="server">閮ㄩ棬浠撳偍鎺ュ彛</param>
/// <param name="mapper">automapper</param>
- public DepartmentServer(IDepartmentRepository department, IMapper mapper)
+ public DepartmentServer(IDepartmentRepository department, IMapper mapper, UserManager userManager)
{
_department = department;//閮ㄩ棬
_mapper = mapper;//automapper
+ _userManager = userManager;
}
/// <summary>
@@ -37,10 +45,15 @@
/// <param name="DepartmentName">閮ㄩ棬鍚嶇О</param>
/// <param name="DepartmentNo">閮ㄩ棬鍙�</param>
/// <returns></returns>
- public List<DepartmentDto> GetDepartmentList(string DepartmentName, string DepartmentNo)
+ public async Task<List<DepartmentDto>> GetDepartmentList(string DepartmentName, string DepartmentNo)
{
- List<DepartmentDto> departmentlist = _department.GetDepartmentList(DepartmentName, DepartmentNo);
- return departmentlist;
+ return await Db.Queryable<SysDepartment>()
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .WhereIF(!string.IsNullOrEmpty(DepartmentNo), a => a.DepartmentNo.Contains(DepartmentNo))
+ .WhereIF(!string.IsNullOrEmpty(DepartmentName), a => a.DepartmentName.Contains(DepartmentName))
+ .Where(a => a.IsDel == "0")
+ .Select<DepartmentDto>((a, b) => new DepartmentDto() { CreateUserName = b.RealName }, true)
+ .ToListAsync();
}
/// <summary>
@@ -48,22 +61,20 @@
/// </summary>
/// <param name="id">閮ㄩ棬id</param>
/// <returns></returns>
- public SysDepartment GetDepartmentById(int id)
+ public async Task<SysDepartment> GetDepartmentById(int id)
{
- SysDepartment department = _department.GetDepartmentById(id);
- return department;
+ return await Db.Queryable<SysDepartment>().FirstAsync(s => s.Id == id);
}
/// <summary>
/// 鏍规嵁閮ㄩ棬鍙疯幏鍙栭儴闂ㄤ俊鎭�
/// </summary>
/// <returns></returns>
- public int GetDepartmentByNo(string DepartmentNo)
+ public async Task<int> GetDepartmentByNo(string DepartmentNo)
{
- List<SysDepartment> department = _department.GetDepartmentByNo(DepartmentNo);
- return department.Count;
+ return await Db.Queryable<SysDepartment>().CountAsync(s => s.DepartmentNo == DepartmentNo && s.IsDel == "0");
}
-
+
/// <summary>
/// 鏂板閮ㄩ棬淇℃伅
/// </summary>
@@ -72,30 +83,18 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> AddDepartment(DepartmentDto departmentdto)
{
- //鎹曡幏寮傚父
- try
+ //妯″瀷鏄犲皠
+ SysDepartment department = _mapper.Map<SysDepartment>(departmentdto);
+ //鍒ゆ柇閮ㄩ棬鍙锋槸鍚﹀敮涓�
+ int count = await GetDepartmentByNo(department.DepartmentNo);
+ if (count > 0)
{
- //妯″瀷鏄犲皠
- SysDepartment department = _mapper.Map<SysDepartment>(departmentdto);
- //鍒ゆ柇閮ㄩ棬鍙锋槸鍚﹀敮涓�
- int count = GetDepartmentByNo(department.DepartmentNo);
- int i = 0;
- if (count > 0)
- {
- i = 3;
- }
- else if (count == 0)
- {
- i = await _department.AddDepartment(department);
- }
- return i;
-
+ throw Oops.Bah("閮ㄩ棬鍙峰繀椤诲敮涓�");
}
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鏂板閮ㄩ棬寮傚父", ex);
- }
+ department.CreateTime = DateTime.Now;
+ department.CreateUser = _userManager.UserId;
+ return await Db.Insertable(department).ExecuteCommandAsync();
+
}
/// <summary>
@@ -106,18 +105,12 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> DelDepartment(SysDepartment department)
{
- //鎹曡幏寮傚父
- try
- {
- //鍒犻櫎
- int i = await _department.DelDepartment(department);
- return i;
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎閮ㄩ棬寮傚父", ex);
- }
+ return await Db.Updateable<SysDepartment>()
+ .Where(s => s.Id == department.Id)
+ .SetColumns(s => s.IsDel == "1")
+ .SetColumns(s => s.UpdateTime == DateTime.Now)
+ .SetColumns(s => s.UpdateUser == _userManager.UserId)
+ .ExecuteCommandAsync();
}
/// <summary>
@@ -128,20 +121,15 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> ExitDepartment(DepartmentDto departmentdto)
{
- //鎹曡幏寮傚父
- try
- {
- //妯″瀷鏄犲皠
- SysDepartment department = _mapper.Map<SysDepartment>(departmentdto);
- //缂栬緫
- int i = await _department.ExitDepartment(department);
- return i;
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("缂栬緫閮ㄩ棬寮傚父", ex);
- }
+ SysDepartment department = _mapper.Map<SysDepartment>(departmentdto);
+ int count = await Db.Queryable<SysDepartment>().CountAsync(s => s.DepartmentNo == departmentdto.DepartmentNo && s.Id != departmentdto.Id && s.IsDel == "0");
+ if (count > 0)
+ throw Oops.Bah("閮ㄩ棬鍙峰繀椤诲敮涓�");
+ department.UpdateUser = _userManager.UserId;
+ department.UpdateTime = DateTime.Now;
+ return await Db.Updateable(department)
+ .UpdateColumns(s => new { s.DepartmentNo, s.DepartmentName, s.Demo, s.UpdateUser, s.UpdateTime })
+ .ExecuteCommandAsync();
}
}
}
diff --git a/Wms/WMS.BLL/SysServer/FunSettingServer.cs b/Wms/WMS.BLL/SysServer/FunSettingServer.cs
index dca6393..8f0606c 100644
--- a/Wms/WMS.BLL/SysServer/FunSettingServer.cs
+++ b/Wms/WMS.BLL/SysServer/FunSettingServer.cs
@@ -12,6 +12,8 @@
using WMS.Entity.SysEntity;
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
+using Utility;
+using Microsoft.AspNetCore.Identity;
namespace WMS.BLL.SysServer
{
@@ -24,15 +26,17 @@
/// </summary>
private readonly IFunSettingRepository _setting;
private readonly IMapper _mapper;
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="setting">鍔熻兘璁惧畾</param>
/// <param name="mapper">automapper</param>
- public FunSettingServer(IFunSettingRepository setting, IMapper mapper) : base(Db)
+ public FunSettingServer(IFunSettingRepository setting, IMapper mapper, UserManager userManager) : base(Db)
{
_setting = setting;//鍔熻兘璁惧畾
_mapper = mapper;//automapper
+ _userManager = userManager;
}
@@ -43,11 +47,16 @@
/// <param name="IsEnable">寮�鍚姸鎬�</param>
/// <param name="GroupNo">缁勫彿</param>
/// <returns></returns>
- public List<FunSettingDto> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo)
+ public async Task<List<FunSettingDto>> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo)
{
-
- List<FunSettingDto> settinglist = _setting.GetFunSettingList(FunSetName, IsEnable, GroupNo);
- return settinglist;
+ return await Db.Queryable<SysFunSetting>()
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .WhereIF(!string.IsNullOrEmpty(FunSetName), a => a.FunSetName.Contains(FunSetName))
+ .WhereIF(!string.IsNullOrEmpty(GroupNo), a => a.GroupNo.Contains(GroupNo))
+ .WhereIF(!string.IsNullOrEmpty(IsEnable), a => a.IsEnable == IsEnable)
+ .Where(a => a.IsDel == "0")
+ .Select<FunSettingDto>((a, b) => new FunSettingDto() { CreateName = b.RealName }, true)
+ .ToListAsync();
}
/// <summary>
@@ -55,10 +64,9 @@
/// </summary>
/// <param name="id">鍔熻兘id</param>
/// <returns></returns>
- public SysFunSetting GetFunSettingById(int id)
+ public async Task<SysFunSetting> GetFunSettingById(int id)
{
- SysFunSetting settinglist = _setting.GetFunSettingById(id);
- return settinglist;
+ return await Db.Queryable<SysFunSetting>().FirstAsync(s => s.Id == id);
}
/// <summary>
@@ -66,18 +74,9 @@
/// </summary>
/// <param name="funSetNo">鍔熻兘缂栧彿</param>
/// <returns></returns>
- public SysFunSetting GetFunSettingByNo(string funSetNo)
+ public async Task<SysFunSetting> GetFunSettingByNo(string funSetNo)
{
- try
- {
- var list = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == funSetNo);
- return list;
- }
- catch (Exception ex)
- {
-
- throw ex;
- }
+ return await Db.Queryable<SysFunSetting>().FirstAsync(a => a.IsDel == "0" && a.FunSetNo == funSetNo);
}
///// <summary>
@@ -99,36 +98,16 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> AddFunSettings(FunSettingDto settingdto)
{
- //鎹曡幏寮傚父
- try
+ //鏄犲皠妯″瀷
+ SysFunSetting setting = _mapper.Map<SysFunSetting>(settingdto);
+ var setData = await Db.Queryable<SysFunSetting>().FirstAsync(m => m.IsDel == "0" && m.GroupNo == settingdto.GroupNo && m.SetValue == settingdto.SetValue);
+ if (setData != null)
{
- //鏄犲皠妯″瀷
- SysFunSetting setting = _mapper.Map<SysFunSetting>(settingdto);
- //鍒ゆ柇鍔熻兘缂栧彿鏄惁鍞竴
- var set = GetFunSettingByNo(setting.FunSetNo);
- int i = 0;
- if (set != null)
- {
- i = 3;
- }
- else if (set == null)
- {
- var setData = Db.Queryable<SysFunSetting>()
- .First(m => m.IsDel == "0" && m.GroupNo == settingdto.GroupNo && m.SetValue==settingdto.SetValue);
- if (setData!=null)
- {
- throw new Exception("鍚岀粍鍐呰瀹氬�奸噸澶�");
- }
- //鏂板
- i = await _setting.AddFunSettings(setting);
- }
- return i;
+ throw Oops.Bah("鍚岀粍鍐呰瀹氬�奸噸澶�");
}
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception(ex.Message);
- }
+ setting.CreateTime = DateTime.Now;
+ setting.CreateUser = _userManager.UserId;
+ return await Db.Insertable(setting).ExecuteCommandAsync();
}
/// <summary>
@@ -139,18 +118,12 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> DelFunSettings(SysFunSetting funSetting)
{
- //鎹曡幏寮傚父
- try
- {
- //鍒犻櫎
- int i = await _setting.DelFunSettings(funSetting);
- return i;
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎鍔熻兘寮傚父", ex);
- }
+ return await Db.Updateable<SysFunSetting>()
+ .Where(s => s.Id == funSetting.Id)
+ .SetColumns(s => s.IsDel == "1")
+ .SetColumns(s => s.UpdateTime == DateTime.Now)
+ .SetColumns(s => s.UpdateUser == _userManager.UserId)
+ .ExecuteCommandAsync();
}
/// <summary>
@@ -161,27 +134,19 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> ExitFunSettings(FunSettingDto settingdto)
{
- //鎹曡幏寮傚父
- try
- {
- //鏄犲皠妯″瀷
- SysFunSetting setting = _mapper.Map<SysFunSetting>(settingdto);
+ SysFunSetting setting = _mapper.Map<SysFunSetting>(settingdto);
- var setData = Db.Queryable<SysFunSetting>()
- .First(m => m.IsDel == "0" && m.GroupNo == settingdto.GroupNo && m.SetValue == settingdto.SetValue && m.Id!=settingdto.Id);
- if (setData != null)
- {
- throw new Exception("鍚岀粍鍐呰瀹氬�奸噸澶�");
- }
- //缂栬緫
- int i = await _setting.ExitFunSettings(setting);
- return i;
- }
- catch (Exception ex)
+ var setData = await Db.Queryable<SysFunSetting>()
+ .FirstAsync(m => m.IsDel == "0" && m.GroupNo == settingdto.GroupNo && m.SetValue == settingdto.SetValue && m.Id != settingdto.Id);
+ if (setData != null)
{
- //鎶涘嚭寮傚父
- throw new Exception(ex.Message);
+ throw Oops.Bah("鍚岀粍鍐呰瀹氬�奸噸澶�");
}
+ setting.UpdateUser = _userManager.UserId;
+ setting.UpdateTime = DateTime.Now;
+ return await Db.Updateable(setting)
+ .UpdateColumns(s => new { s.FunSetName, s.SetValue, s.FunText, s.IsEnable, s.Ord, s.GroupNo, s.UpdateUser, s.UpdateTime })
+ .ExecuteCommandAsync();
}
}
}
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index 2e80823..6b0d9c7 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -9,6 +9,7 @@
using AutoMapper;
using Model.ModelDto.SysDto;
using SqlSugar;
+using Utility;
using WMS.DAL;
using WMS.Entity.Context;
using WMS.Entity.SysEntity;
@@ -25,75 +26,20 @@
public IMaterialsRepository _mate { get; set; }
private readonly IMapper _mapper;
private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="mate">鐗╂枡缂栫爜</param>
/// <param name="mapper">automapper</param>
- public MaterialsServer(IMaterialsRepository mate, IMapper mapper) : base(Db)
+ public MaterialsServer(IMaterialsRepository mate, IMapper mapper, UserManager userManager) : base(Db)
{
_mate = mate; //鐗╂枡缂栫爜
_mapper = mapper; //automapper
+ _userManager = userManager;
}
#region wms
-
- //public List<MaterialsDto> GetMaterialsList(string skuNo, string skuName, string type, string isInspect, int page, int limit, out int count)
- //{
- // try
- // {
- // Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
- // .AndIF(!string.IsNullOrWhiteSpace(skuNo), it => it.SkuNo.Contains(skuNo.Trim()))
- // .AndIF(!string.IsNullOrWhiteSpace(skuName), it => it.SkuName.Contains(skuName.Trim()))
- // .AndIF(!string.IsNullOrWhiteSpace(type), it => it.Type == type)
- // .AndIF(!string.IsNullOrWhiteSpace(isInspect), it => it.IsInspect == isInspect)
- // .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
-
- // var data = _mate.GetAllByOrderPageAsync(item, limit, page, out int counts)
- // .Includes(x => x.TypeInfo)
- // .Includes(x => x.EnvironmentInfo)
- // .Includes(x => x.UnitInfo)
- // .Includes(x => x.PackagInfo)
- // .Includes(x => x.CreateUserInfo)
- // .Includes(x => x.UpdateUserInfo)
- // .ToList();
- // count = counts;
-
- // return data.Select(m => new MaterialsDto()
- // {
- // Id = m.Id,
- // SkuNo = m.SkuNo,
- // SkuName = m.SkuName,
- // Standard = m.Standard,
- // AuditStatusNo = m.AuditStatusNo,
- // Type = m.Type,
- // TypeName = m.TypeInfo == null ? "" : m.TypeInfo.DictName,
- // IsControlled = m.IsControlled,
- // IsInspect = m.IsInspect,
- // Origin = m.Origin,
- // UnitNo = m.UnitNo,
- // UnitName = m.UnitInfo == null ? "" : m.UnitInfo.UnitName,
- // PackagNo = m.PackagNo,
- // PackagName = m.PackagInfo == null ? "" : m.PackagInfo.PackagName,
- // Environment = m.Environment,
- // EnvironmentName = m.EnvironmentInfo == null ? "" : m.EnvironmentInfo.DictName,
- // Weight = m.Weight,
- // Warranty = m.Warranty,
- // Price = m.Price,
- // Demo = m.Demo,
-
- // CreateUserName = m.CreateUserInfo == null ? "" : m.CreateUserInfo.UserName,
- // UpdateUserName = m.UpdateUserInfo == null ? "" : m.UpdateUserInfo.UserName,
- // CreateTime = m.CreateTime,
- // UpdateTime = m.UpdateTime
- // }).ToList();
- // }
- // catch (Exception e)
- // {
- // throw new Exception(e.Message);
- // }
- //}
-
/// <summary>
/// 鑾峰彇鐗╂枡淇℃伅鍒楄〃
@@ -107,10 +53,21 @@
/// <param name="environment">瀛樺偍鐜</param>
/// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
- public List<MaterialsDto> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
+ public Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
- List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
- return matedto;
+ return Db.Queryable<SysMaterials>()
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
+ .WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuNo.Contains(skuName))
+ .WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
+ .WhereIF(!string.IsNullOrEmpty(type), a => a.Type == type)
+ .WhereIF(!string.IsNullOrEmpty(isControlled), a => a.IsControlled == isControlled)
+ .WhereIF(!string.IsNullOrEmpty(isInspect), a => a.IsInspect == isInspect)
+ .WhereIF(!string.IsNullOrEmpty(environment), a => a.Environment == environment)
+ .WhereIF(!string.IsNullOrEmpty(categoryNo), a => a.CategoryNo == categoryNo)
+ .Where(a => a.IsDel == "0")
+ .Select<MaterialsDto>((a, b) => new MaterialsDto() { CreateUserName = b.RealName }, true)
+ .ToListAsync();
}
/// <summary>
@@ -118,10 +75,9 @@
/// </summary>
/// <param name="id">鐗╂枡id</param>
/// <returns></returns>
- public SysMaterials GetMateById(int id)
+ public async Task<SysMaterials> GetMateById(int id)
{
- SysMaterials mate = _mate.GetMateById(id);
- return mate;
+ return await Db.Queryable<SysMaterials>().FirstAsync(s => s.Id == id);
}
/// <summary>
@@ -129,10 +85,9 @@
/// </summary>
/// <param name="SkuNo">鐗╂枡缂栧彿</param>
/// <returns></returns>
- public int GetMateByNo(string SkuNo)
+ public async Task<int> GetMateByNo(string SkuNo)
{
- List<SysMaterials> mate = _mate.GetMateByNo(SkuNo);
- return mate.Count;
+ return await Db.Queryable<SysMaterials>().CountAsync(s => s.SkuNo == SkuNo && s.IsDel == "0");
}
/// <summary>
@@ -143,42 +98,22 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> AddMate(MaterialsDto matedto)
{
- //鎹曡幏寮傚父
- try
- {
- int count = GetMateByNo(matedto.SkuNo);
-
- if (count > 0)
- {
- throw new Exception("绯荤粺涓凡瀛樺湪璇ョ墿鏂�");
- }
- if (string.IsNullOrWhiteSpace(matedto.PackagNo))
- {
- throw new Exception("鍖呰淇℃伅涓嶈兘涓虹┖");
- }
-
-
- //鏄犲皠妯″瀷
- SysMaterials mate = _mapper.Map<SysMaterials>(matedto);
- mate.AuditStatusNo = "9"; //瀹℃牳鐘舵��
- mate.Type = mate.Type; //绫诲瀷
- mate.IsControlled = string.IsNullOrWhiteSpace(mate.IsControlled) ? "0" : mate.IsControlled; //鏄惁鍙楁帶
- mate.IsInspect = string.IsNullOrWhiteSpace(mate.IsInspect) ? "0" : mate.IsInspect; //鏄惁鍏嶆
- mate.IsPasteCode = string.IsNullOrWhiteSpace(mate.IsPasteCode) ? "0" : mate.IsPasteCode; //鏄惁鍏嶆
- mate.Origin = "WMS"; //鏉ユ簮
- mate.IsDel = "0";
- mate.CreateTime = Db.GetDate();
- Db.BeginTran();
- Db.Insertable(mate).ExecuteCommand();
- Db.CommitTran();
- return 1;
- }
- catch (Exception ex)
- {
- Db.RollbackTran();
- //鎶涘嚭寮傚父
- throw new Exception(ex.Message);
- }
+ if (string.IsNullOrWhiteSpace(matedto.PackagNo))
+ throw Oops.Bah("鍖呰淇℃伅涓嶈兘涓虹┖");
+ if (await GetMateByNo(matedto.SkuNo) > 0)
+ throw Oops.Bah("绯荤粺涓凡瀛樺湪璇ョ墿鏂�");
+ //鏄犲皠妯″瀷
+ SysMaterials mate = _mapper.Map<SysMaterials>(matedto);
+ mate.AuditStatusNo = "9"; //瀹℃牳鐘舵��
+ mate.Type = mate.Type; //绫诲瀷
+ mate.IsControlled = string.IsNullOrWhiteSpace(mate.IsControlled) ? "0" : mate.IsControlled; //鏄惁鍙楁帶
+ mate.IsInspect = string.IsNullOrWhiteSpace(mate.IsInspect) ? "0" : mate.IsInspect; //鏄惁鍏嶆
+ mate.IsPasteCode = string.IsNullOrWhiteSpace(mate.IsPasteCode) ? "0" : mate.IsPasteCode; //鏄惁鍏嶆
+ mate.Origin = "WMS"; //鏉ユ簮
+ mate.IsDel = "0";
+ mate.CreateTime = DateTime.Now;
+ mate.CreateUser = _userManager.UserId;
+ return await Db.Insertable(mate).ExecuteCommandAsync();
}
/// <summary>
@@ -189,18 +124,12 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> DelMate(SysMaterials mate)
{
- //鎹曡幏寮傚父
- try
- {
- //鍒犻櫎
- int i = await _mate.DelMate(mate);
- return i;
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎鐗╂枡寮傚父", ex);
- }
+ return await Db.Updateable<SysMaterials>()
+ .Where(s => s.Id == mate.Id)
+ .SetColumns(s => s.IsDel == "1")
+ .SetColumns(s => s.UpdateTime == DateTime.Now)
+ .SetColumns(s => s.UpdateUser == _userManager.UserId)
+ .ExecuteCommandAsync();
}
/// <summary>
@@ -211,43 +140,27 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> ExitMate(MaterialsDto matedto)
{
- //鎹曡幏寮傚父
- try
+ if (matedto.AdventTime > 365 && matedto.AdventTime < 30)
{
- if (matedto.AdventTime > 365 && matedto.AdventTime < 30)
- {
- return 2;
- }
- else if (string.IsNullOrWhiteSpace(matedto.PackagNo))
- {
- throw new Exception("鍖呰涓嶈兘涓虹┖");
- }
- //else if (matedto.LowInventory > 1000)
- //{
- // return 4;
- //}
- else
- {
- //鏄犲皠妯″瀷
- SysMaterials mate = _mapper.Map<SysMaterials>(matedto);
- //缂栬緫
- //鏍规嵁id鑾峰彇鐗╂枡淇℃伅
- var list = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.Id == mate.Id);
- //mate.CategoryNo = list.CategoryNo;
- mate.Origin = list.Origin;
- mate.CreateUser = list.CreateUser;
- mate.UpdateTime = Db.GetDate();
- mate.CreateTime = list.CreateTime;
-
- int i = Db.Updateable(mate).ExecuteCommand();
- return i;
- }
+ throw Oops.Bah("涓存湡澶╂暟涓嶅彲澶т簬365鍙婂皬浜�30");
}
- catch (Exception ex)
+ else if (string.IsNullOrWhiteSpace(matedto.PackagNo))
{
- //鎶涘嚭寮傚父
- throw new Exception(ex.Message);
+ throw Oops.Bah("鍖呰涓嶈兘涓虹┖");
}
+ //鏄犲皠妯″瀷
+ SysMaterials mate = _mapper.Map<SysMaterials>(matedto);
+ //缂栬緫
+ //鏍规嵁id鑾峰彇鐗╂枡淇℃伅
+ var modMaterial = await Db.Queryable<SysMaterials>().FirstAsync(a => a.IsDel == "0" && a.Id == mate.Id);
+ //mate.CategoryNo = list.CategoryNo;
+ mate.Origin = modMaterial.Origin;
+ mate.CreateUser = modMaterial.CreateUser;
+ mate.UpdateTime = DateTime.Now;
+ mate.UpdateUser = _userManager.UserId;
+ mate.CreateTime = modMaterial.CreateTime;
+ int i = Db.Updateable(mate).ExecuteCommand();
+ return i;
}
#region 鍖呰 鍗曚綅
@@ -256,20 +169,18 @@
/// 鑾峰彇璁￠噺鍗曚綅淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- public List<SysUnit> GetUnitList()
+ public async Task<List<SysUnit>> GetUnitList()
{
- List<SysUnit> unitlist = _mate.GetUnitList();
- return unitlist;
+ return await Db.Queryable<SysUnit>().Where(s => s.IsDel == "0").ToListAsync();
}
/// <summary>
/// 鑾峰彇鍖呰淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- public List<SysPackag> GetPackagList()
+ public async Task<List<SysPackag>> GetPackagList()
{
- List<SysPackag> packlist = _mate.GetPackagList();
- return packlist;
+ return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToListAsync();
}
#endregion
diff --git a/Wms/WMS.IBLL/ISysServer/IDepartmentServer.cs b/Wms/WMS.IBLL/ISysServer/IDepartmentServer.cs
index 6dc4b87..c11593b 100644
--- a/Wms/WMS.IBLL/ISysServer/IDepartmentServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IDepartmentServer.cs
@@ -18,20 +18,20 @@
/// <param name="DepartmentName">閮ㄩ棬鍚嶇О</param>
/// <param name="DepartmentNo">閮ㄩ棬鍙�</param>
/// <returns></returns>
- List<DepartmentDto> GetDepartmentList(string DepartmentName, string DepartmentNo);
+ Task<List<DepartmentDto>> GetDepartmentList(string DepartmentName, string DepartmentNo);
/// <summary>
/// 鏍规嵁id鑾峰彇閮ㄩ棬淇℃伅
/// </summary>
/// <param name="id">閮ㄩ棬id</param>
/// <returns></returns>
- SysDepartment GetDepartmentById(int id);
+ Task<SysDepartment> GetDepartmentById(int id);
/// <summary>
/// 鏍规嵁閮ㄩ棬鍙疯幏鍙栭儴闂ㄤ俊鎭�
/// </summary>
/// <returns></returns>
- int GetDepartmentByNo(string DepartmentNo);
+ Task<int> GetDepartmentByNo(string DepartmentNo);
/// <summary>
/// 鏂板閮ㄩ棬淇℃伅
diff --git a/Wms/WMS.IBLL/ISysServer/IFunSettingServer.cs b/Wms/WMS.IBLL/ISysServer/IFunSettingServer.cs
index 2b33324..aa6fb66 100644
--- a/Wms/WMS.IBLL/ISysServer/IFunSettingServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IFunSettingServer.cs
@@ -19,21 +19,21 @@
/// <param name="IsEnable">寮�鍚姸鎬�</param>
/// <param name="GroupNo">缁勫彿</param>
/// <returns></returns>
- List<FunSettingDto> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo);
+ Task<List<FunSettingDto>> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo);
/// <summary>
/// 鏍规嵁id鏌ヨ鍔熻兘璁惧畾淇℃伅
/// </summary>
/// <param name="id">鍔熻兘id</param>
/// <returns></returns>
- SysFunSetting GetFunSettingById(int id);
+ Task<SysFunSetting> GetFunSettingById(int id);
/// <summary>
/// 鏍规嵁缂栧彿鏌ヨ鍔熻兘璁惧畾娑堟伅
/// </summary>
/// <param name="funSetNo">鍔熻兘缂栧彿</param>
/// <returns></returns>
- SysFunSetting GetFunSettingByNo(string funSetNo);
+ Task<SysFunSetting> GetFunSettingByNo(string funSetNo);
/// <summary>
/// 鏂板鍔熻兘淇℃伅
diff --git a/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs b/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs
index fa1d6b9..72ace42 100644
--- a/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs
@@ -11,20 +11,6 @@
{
#region wms
- ///// <summary>
- ///// 鏌ヨ鐗╂枡淇℃伅
- ///// </summary>
- ///// <param name="skuNo">鐗╂枡鍙�</param>
- ///// <param name="skuName">鐗╂枡鍚嶇О</param>
- ///// <param name="type">鐗╂枡绫诲瀷</param>
- ///// <param name="isInspect">鏄惁鍏嶆</param>
- ///// <param name="page"></param>
- ///// <param name="limit"></param>
- ///// <param name="count"></param>
- ///// <returns></returns>
- //List<MaterialsDto> GetMaterialsList(string skuNo, string skuName, string type, string isInspect, int page, int limit, out int count);
-
-
/// <summary>
/// 鑾峰彇鐗╂枡淇℃伅鍒楄〃
/// </summary>
@@ -37,21 +23,21 @@
/// <param name="environment">瀛樺偍鐜</param>
/// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
- List<MaterialsDto> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment,string categoryNo);
+ Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment,string categoryNo);
/// <summary>
/// 鏍规嵁id鏌ヨ鐗╂枡淇℃伅
/// </summary>
/// <param name="id">鐗╂枡id</param>
/// <returns></returns>
- SysMaterials GetMateById(int id);
+ Task<SysMaterials> GetMateById(int id);
/// <summary>
/// 鏍规嵁缂栧彿鏌ヨ鐗╂枡淇℃伅
/// </summary>
/// <param name="SkuNo">鐗╂枡缂栧彿</param>
/// <returns></returns>
- int GetMateByNo(string SkuNo);
+ Task<int> GetMateByNo(string SkuNo);
/// <summary>
/// 鏂板鐗╂枡淇℃伅
@@ -81,13 +67,13 @@
/// 鑾峰彇璁￠噺鍗曚綅淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- List<SysUnit> GetUnitList();
+ Task<List<SysUnit>> GetUnitList();
/// <summary>
/// 鑾峰彇鍖呰淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- List<SysPackag> GetPackagList();
+ Task<List<SysPackag>> GetPackagList();
#endregion
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index fb0997a..90ab56b 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -422,15 +422,10 @@
/// <param name="DepartmentNo">閮ㄩ棬鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetDepartmentList(string DepartmentName, string DepartmentNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<DepartmentDto>> GetDepartmentList(string DepartmentName, string DepartmentNo)
{
- List<DepartmentDto> departmentlist = _department.GetDepartmentList(DepartmentName, DepartmentNo);
- return Ok(new
- {
- data = departmentlist,
- code = 0,
- msg = "鑾峰彇閮ㄩ棬淇℃伅鍒楄〃鎴愬姛"
- });
+ return await _department.GetDepartmentList(DepartmentName, DepartmentNo);
}
/// <summary>
@@ -439,15 +434,10 @@
/// <param name="id">閮ㄩ棬id</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetDepartmentById(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SysDepartment> GetDepartmentById(int id)
{
- SysDepartment department = _department.GetDepartmentById(id);
- return Ok(new
- {
- data = department,
- msg = "鎴愬姛",
- code = 0
- });
+ return await _department.GetDepartmentById(id);
}
/// <summary>
@@ -457,56 +447,19 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> AddDepartment(DepartmentDto departmentdto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task AddDepartment(DepartmentDto departmentdto)
{
- //鎹曡幏寮傚父
- try
+ await _department.AddDepartment(departmentdto);
+ await _operation.InsertOperation(new OperationInputVm()
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
-
- int uid = Convert.ToInt32(userId);
- //鏇存敼浜�
- departmentdto.CreateUser = uid;
-
- int i = await _department.AddDepartment(departmentdto);
- //鍒ゆ柇鏄惁鏂板鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "鏂板澶辫触"
- });
- }
- else if (i == 3)
- {
- return Ok(new
- {
- data = i,
- code = 3,
- msg = "閮ㄩ棬鍙峰繀椤诲敮涓�"
- });
- }
- else
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "閮ㄩ棬绠＄悊", departmentdto.DepartmentNo, "娣诲姞", "娣诲姞閮ㄩ棬淇℃伅 閮ㄩ棬鍙凤細" + departmentdto.DepartmentNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鏂板鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鏂板閮ㄩ棬寮傚父", ex);
- }
-
+ ParentName = "鍩虹淇℃伅",
+ MenuName = "閮ㄩ棬绠＄悊",
+ FkNo = departmentdto.DepartmentNo,
+ TypeName = "娣诲姞",
+ Msg = "娣诲姞閮ㄩ棬淇℃伅 閮ㄩ棬鍙凤細" + departmentdto.DepartmentNo
+ });
}
/// <summary>
@@ -516,46 +469,20 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- public async Task<IActionResult> DelDepartment(int Id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task DelDepartment(int Id)
{
- //鎹曡幏寮傚父
- try
+ SysDepartment department = await _department.GetDepartmentById(Id);
+ await _department.DelDepartment(department);
+ await _operation.InsertOperation(new OperationInputVm()
{
- SysDepartment department = _department.GetDepartmentById(Id);
-
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鏇存敼浜�
- department.UpdateUser = uid;
- int i = await _department.DelDepartment(department);
- //鍒ゆ柇鏄惁鍒犻櫎鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "鍒犻櫎澶辫触"
- });
- }
- else
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "閮ㄩ棬绠＄悊", department.DepartmentNo, "鍒犻櫎", "鍒犻櫎閮ㄩ棬淇℃伅 閮ㄩ棬鍙凤細" + department.DepartmentNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鍒犻櫎鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎閮ㄩ棬寮傚父", ex);
- }
+ ParentName = "鍩虹淇℃伅",
+ MenuName = "閮ㄩ棬绠＄悊",
+ FkNo = department.DepartmentNo,
+ TypeName = "鍒犻櫎",
+ Msg = "鍒犻櫎閮ㄩ棬淇℃伅 閮ㄩ棬鍙凤細" + department.DepartmentNo
+ });
}
/// <summary>
@@ -565,44 +492,19 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> ExitDepartment(DepartmentDto departmentdto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task ExitDepartment(DepartmentDto departmentdto)
{
- //鎹曡幏寮傚父
- try
+ await _department.ExitDepartment(departmentdto);
+ await _operation.InsertOperation(new OperationInputVm()
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鏇存敼浜�
- departmentdto.UpdateUser = uid;
- int i = await _department.ExitDepartment(departmentdto);
- //鍒ゆ柇鏄惁缂栬緫鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "缂栬緫澶辫触"
- });
- }
- else
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "閮ㄩ棬绠＄悊", departmentdto.DepartmentNo, "淇敼", "缂栬緫閮ㄩ棬淇℃伅 閮ㄩ棬鍙凤細" + departmentdto.DepartmentNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "缂栬緫鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("缂栬緫閮ㄩ棬寮傚父", ex);
- }
+ ParentName = "鍩虹淇℃伅",
+ MenuName = "閮ㄩ棬绠＄悊",
+ FkNo = departmentdto.DepartmentNo,
+ TypeName = "缂栬緫",
+ Msg = "缂栬緫閮ㄩ棬淇℃伅 閮ㄩ棬鍙凤細" + departmentdto.DepartmentNo
+ });
}
#endregion
@@ -617,15 +519,10 @@
/// <param name="GroupNo">缁勫彿</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetFunSettingList(string FunSetName, string IsEnable, string GroupNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<FunSettingDto>> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo)
{
- List<FunSettingDto> settinglist = _setting.GetFunSettingList(FunSetName, IsEnable, GroupNo);
- return Ok(new
- {
- data = settinglist,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _setting.GetFunSettingList(FunSetName, IsEnable, GroupNo);
}
/// <summary>
@@ -634,15 +531,10 @@
/// <param name="id">鍔熻兘id</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetFunSettingById(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SysFunSetting> GetFunSettingById(int id)
{
- SysFunSetting settinglist = _setting.GetFunSettingById(id);
- return Ok(new
- {
- data = settinglist,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _setting.GetFunSettingById(id);
}
/// <summary>
@@ -651,18 +543,10 @@
/// <param name="funSetNo">鍔熻兘缂栧彿</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetFunSettingByNo(string funSetNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SysFunSetting> GetFunSettingByNo(string funSetNo)
{
- try
- {
- var models = _setting.GetFunSettingByNo(funSetNo);
-
- return Ok(new { code = 0, msg = "鍔熻兘璁惧畾淇℃伅", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _setting.GetFunSettingByNo(funSetNo);
}
/// <summary>
/// 鏂板鍔熻兘淇℃伅
@@ -671,80 +555,19 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> AddFunSettings(FunSettingDto settingdto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task AddFunSettings(FunSettingDto settingdto)
{
- //鎹曡幏寮傚父
- try
+ await _setting.AddFunSettings(settingdto);
+ await _operation.InsertOperation(new OperationInputVm()
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鍒涘缓浜�
- settingdto.CreateUser = uid;
- //鏂板
- int i = await _setting.AddFunSettings(settingdto);
- //鍒ゆ柇鏄惁鏂板鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "澶辫触"
- });
- }
- else if (i == 3)
- {
- return Ok(new
- {
- data = i,
- code = 3,
- msg = "鍔熻兘鍙峰繀椤诲敮涓�"
- });
- }
- else if (i == 4)
- {
- return Ok(new
- {
- data = i,
- code = 4,
- msg = "鏄剧ず椤哄簭鑼冨洿涓�1---5"
- });
- }
- else if (i == 5)
- {
- return Ok(new
- {
- data = i,
- code = 5,
- msg = "璇疯緭鍏ユ纭粍鍙�"
- });
- }
- else if (i == 6)
- {
- return Ok(new
- {
- data = i,
- code = 6,
- msg = "姣忎竴缁勫彧鑳藉紑鍚竴涓姛鑳�"
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "鍔熻兘璁惧畾", settingdto.FunSetNo, "娣诲姞", "娣诲姞鍔熻兘璁惧畾 鍔熻兘鍙凤細" + settingdto.FunSetNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- return Ok(new { data = "", code = 1, msg = "鏂板鍔熻兘寮傚父锛�" + ex.Message });
- }
+ ParentName = "绯荤粺璁剧疆",
+ MenuName = "鍔熻兘璁惧畾",
+ FkNo = settingdto.FunSetNo,
+ TypeName = "娣诲姞",
+ Msg = "娣诲姞鍔熻兘璁惧畾 鍔熻兘鍙凤細" + settingdto.FunSetNo
+ });
}
/// <summary>
@@ -754,46 +577,20 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- public async Task<IActionResult> DelFunSettings(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task DelFunSettings(int id)
{
- //鎹曡幏寮傚父
- try
+ SysFunSetting funSetting = await _setting.GetFunSettingById(id);
+ await _setting.DelFunSettings(funSetting);
+ await _operation.InsertOperation(new OperationInputVm()
{
- SysFunSetting funSetting = _setting.GetFunSettingById(id);
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鏇存敼浜�
- funSetting.UpdateUser = uid;
- //鍒犻櫎
- int i = await _setting.DelFunSettings(funSetting);
- //鍒ゆ柇鏄惁鍒犻櫎鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "澶辫触"
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "鍔熻兘璁惧畾", funSetting.FunSetNo, "鍒犻櫎", "鍒犻櫎鍔熻兘璁惧畾 鍔熻兘鍙凤細" + funSetting.FunSetNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎鍔熻兘寮傚父", ex);
- }
+ ParentName = "绯荤粺璁剧疆",
+ MenuName = "鍔熻兘璁惧畾",
+ FkNo = funSetting.FunSetNo,
+ TypeName = "鍒犻櫎",
+ Msg = "鍒犻櫎鍔熻兘璁惧畾 鍔熻兘鍙凤細" + funSetting.FunSetNo
+ });
}
/// <summary>
@@ -803,79 +600,24 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> ExitFunSettings(FunSettingDto settingdto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task ExitFunSettings(FunSettingDto settingdto)
{
- //鎹曡幏寮傚父
- try
+ await _setting.ExitFunSettings(settingdto);
+ await _operation.InsertOperation(new OperationInputVm()
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鏇存敼浜�
- settingdto.UpdateUser = uid;
- //缂栬緫
- int i = await _setting.ExitFunSettings(settingdto);
- //鍒ゆ柇鏄惁缂栬緫鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "澶辫触"
- });
- }
- else if (i == 6)
- {
- return Ok(new
- {
- data = i,
- code = 6,
- msg = "姣忎竴缁勫彧鑳藉紑鍚竴涓姛鑳�"
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "鍔熻兘璁惧畾", settingdto.FunSetNo, "淇敼", "淇敼鍔熻兘璁惧畾 鍔熻兘鍙凤細" + settingdto.FunSetNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- return Ok(new { data = "", code = 1, msg = "缂栬緫鍔熻兘寮傚父锛�" + ex.Message });
- }
+ ParentName = "绯荤粺璁剧疆",
+ MenuName = "鍔熻兘璁惧畾",
+ FkNo = settingdto.FunSetNo,
+ TypeName = "缂栬緫",
+ Msg = "淇敼鍔熻兘璁惧畾 鍔熻兘鍙凤細" + settingdto.FunSetNo
+ });
}
#endregion
#region 鐗╂枡绠＄悊
-
- ///// <summary>
- ///// 鏌ヨ鐗╂枡淇℃伅
- ///// </summary>
- ///// <param name="matevm">鐗╂枡缂栫爜瑙嗗浘妯″瀷</param>
- ///// <returns></returns>
- //[HttpPost]
- //public IActionResult GetMaterialsList(GetMaterialsVm matevm)
- //{
- // try
- // {
- // var bolls = _mate.GetMaterialsList(matevm.SkuNo, matevm.SkuName, matevm.Type, matevm.IsInspect, matevm.Page, matevm.Limit, out int count);
-
- // return Ok(new { code = 0, count, msg = "鐗╂枡淇℃伅", data = bolls });
- // }
- // catch (Exception e)
- // {
- // return Ok(new { code = 1, msg = e.Message });
- // }
- //}
-
#region yyk
@@ -894,15 +636,10 @@
/// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
+ [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)
{
- List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
- return Ok(new
- {
- data = matedto,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
}
/// <summary>
@@ -911,15 +648,10 @@
/// <param name="id">鐗╂枡id</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetMateById(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SysMaterials> GetMateById(int id)
{
- SysMaterials mate = _mate.GetMateById(id);
- return Ok(new
- {
- data = mate,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _mate.GetMateById(id);
}
/// <summary>
@@ -927,31 +659,19 @@
/// </summary>
/// <param name="matedto">鐗╂枡dto</param>
/// <returns></returns>
- /// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> AddMate(MaterialsDto matedto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task AddMate(MaterialsDto matedto)
{
- //鎹曡幏寮傚父
- try
+ await _mate.AddMate(matedto);
+ await _operation.InsertOperation(new OperationInputVm()
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鍒涘缓浜�
- matedto.CreateUser = uid;
- //鏂板
- int i = await _mate.AddMate(matedto);
-
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "娣诲姞", "娣诲姞鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
- return Ok(new { data = i, code = 0, msg = "鎴愬姛" });
-
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- return Ok(new { code = 1, msg = "鏂板鐗╂枡寮傚父" + ex.Message });
- }
+ ParentName = "鍩虹淇℃伅",
+ MenuName = "鐗╂枡绠＄悊",
+ FkNo = matedto.SkuNo,
+ TypeName = "娣诲姞",
+ Msg = "娣诲姞鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo
+ });
}
/// <summary>
@@ -961,45 +681,19 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpGet]
- public async Task<IActionResult> DelMate(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task DelMate(int id)
{
- //鎹曡幏寮傚父
- try
+ SysMaterials mate = await _mate.GetMateById(id);
+ await _mate.DelMate(mate);
+ await _operation.InsertOperation(new OperationInputVm()
{
- SysMaterials mate = _mate.GetMateById(id);
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- mate.UpdateUser = uid;
- //鍒犻櫎
- int i = await _mate.DelMate(mate);
- //鍒ゆ柇鏄惁鍒犻櫎鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "澶辫触"
- });
- }
- else
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", mate.SkuNo, "鍒犻櫎", "鍒犻櫎鐗╂枡淇℃伅 鐗╂枡鍙凤細" + mate.SkuNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鎴愬姛"
- });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎鐗╂枡寮傚父", ex);
- }
+ ParentName = "鍩虹淇℃伅",
+ MenuName = "鐗╂枡绠＄悊",
+ FkNo = mate.SkuNo,
+ TypeName = "鍒犻櫎",
+ Msg = "鍒犻櫎鐗╂枡淇℃伅 鐗╂枡鍙凤細" + mate.SkuNo
+ });
}
/// <summary>
@@ -1009,43 +703,18 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> ExitMate(MaterialsDto matedto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task ExitMate(MaterialsDto matedto)
{
- //鎹曡幏寮傚父
- try
+ await _mate.ExitMate(matedto);
+ await _operation.InsertOperation(new OperationInputVm()
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鏇存柊浜�
- matedto.UpdateUser = uid;
- //缂栬緫
- int i = await _mate.ExitMate(matedto);
- //鍒ゆ柇鏄惁缂栬緫鎴愬姛
- if (i == 0)
- {
- return Ok(new { data = i, code = 1, msg = "淇敼澶辫触" });
- }
- else if (i == 2)
- {
- return Ok(new { data = i, code = 2, msg = "涓存湡澶╂暟涓嶅彲澶т簬365鍙婂皬浜�30" });
- }
- //else if (i == 4)
- //{
- // return Ok(new { data = i, code = 4, msg = "浣庡簱瀛樹笉鍙珮浜�1000" });
- //}
- else
- {
- await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "淇敼", "缂栬緫鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
- return Ok(new { data = i, code = 0, msg = "淇敼鎴愬姛" });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮�
- return Ok(new { code = 1, msg = "缂栬緫鐗╂枡寮傚父" + ex.Message });
- }
+ ParentName = "鍩虹淇℃伅",
+ MenuName = "鐗╂枡绠＄悊",
+ FkNo = matedto.SkuNo,
+ TypeName = "缂栬緫",
+ Msg = "缂栬緫鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo
+ });
}
#region 鍖呰 鍗曚綅
@@ -1055,15 +724,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetUnitList()
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<SysUnit>> GetUnitList()
{
- List<SysUnit> unitlist = _mate.GetUnitList();
- return Ok(new
- {
- data = unitlist,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _mate.GetUnitList();
}
/// <summary>
@@ -1071,15 +735,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetPackagList()
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<SysPackag>> GetPackagList()
{
- List<SysPackag> packlist = _mate.GetPackagList();
- return Ok(new
- {
- data = packlist,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _mate.GetPackagList();
}
#endregion
--
Gitblit v1.8.0