diff --git a/Infrastructure/Define.cs b/Infrastructure/Define.cs index 69ccbd05d6d0b4b532549a67227ef10da97ee77b..e4ca25781b0dddf9abf6ae379f4404c1a84c1040 100644 --- a/Infrastructure/Define.cs +++ b/Infrastructure/Define.cs @@ -8,7 +8,7 @@ /// /// 默认租户ID /// - public const string DEFAULT_TENANT_ID = "OpenAuthDBContext"; + public const string DEFAULT_TENANT_ID = "DBContext_102"; //Relevance关联KEY /// diff --git a/OpenAuth.App/BaseLocationApp/BaseLocationApp.cs b/OpenAuth.App/BaseLocationApp/BaseLocationApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..8b6abef9b0af4d8a3c61d4ff73860d29af2cd317 --- /dev/null +++ b/OpenAuth.App/BaseLocationApp/BaseLocationApp.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class BaseLocationApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querybase_locationListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("base_location"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置base_location表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Location_name.Contains(request.key) || u.Location_id.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatebase_locationReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + obj.Add_by = user.Account; + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatebase_locationReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new base_location + { + //todo: 根据业务需要调整字段 + Storagehigh = request.Storagehigh, + Storagewidth = request.Storagewidth, + Company_id = request.Company_id, + Warehouse_id = request.Warehouse_id, + //Add_by = request.Add_by, + Location_id = request.Location_id, + Is_active = request.Is_active, + Storagelength = request.Storagelength, + Last_userdate = request.Last_userdate, + Location_type = request.Location_type, + Location_name = request.Location_name, + Edit_by = user.Account, + Shelfnumber = request.Shelfnumber, + Size_class = request.Size_class, + //Add_dt = request.Add_dt, + Bfloor_id = request.Bfloor_id, + Group_id = request.Group_id, + Edit_dt = DateTime.Now, + + },u => u.Id == request.Id); + + } + + public BaseLocationApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseLocationApp/Request/AddOrUpdatebase_locationReq.cs b/OpenAuth.App/BaseLocationApp/Request/AddOrUpdatebase_locationReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..d8118cffebae7945a599f6d24873411a812e117a --- /dev/null +++ b/OpenAuth.App/BaseLocationApp/Request/AddOrUpdatebase_locationReq.cs @@ -0,0 +1,119 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatebase_locationReq + { + /// + ///唯一码 + /// + public string Id { get; set; } + + /// + ///储位高度 + /// + public string Storagehigh { get; set; } + + /// + ///储位宽度 + /// + public string Storagewidth { get; set; } + + /// + ///组织编码 + /// + public string Company_id { get; set; } + + /// + ///仓库编码 + /// + public string Warehouse_id { get; set; } + + /// + ///创建人 + /// + public string Add_by { get; set; } + + /// + ///库位编码 + /// + public string Location_id { get; set; } + + /// + ///是否启用 + /// + public string Is_active { get; set; } + + /// + ///储位长度 + /// + public string Storagelength { get; set; } + + /// + ///库位编码 + /// + public DateTime? Last_userdate { get; set; } + + /// + ///库位类型 + /// + public string Location_type { get; set; } + + /// + ///库位名称 + /// + public string Location_name { get; set; } + + /// + ///最后一次编辑人 + /// + public string Edit_by { get; set; } + + /// + ///库架编码 + /// + public string Shelfnumber { get; set; } + + /// + ///尺寸类型 + /// + public string Size_class { get; set; } + + /// + ///创建时间 + /// + public DateTime? Add_dt { get; set; } + + /// + ///车间编码 + /// + public string Bfloor_id { get; set; } + + /// + ///工站编码 + /// + public string Group_id { get; set; } + + /// + ///最后一次编辑时间 + /// + public DateTime? Edit_dt { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseLocationApp/Request/Querybase_locationListReq.cs b/OpenAuth.App/BaseLocationApp/Request/Querybase_locationListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..1ff85625ad8aeb06f32e854da84eeb82318fc1c1 --- /dev/null +++ b/OpenAuth.App/BaseLocationApp/Request/Querybase_locationListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querybase_locationListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/BasePartsApp/BasePartsApp.cs b/OpenAuth.App/BasePartsApp/BasePartsApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..4454e47d7956c64ba64069f25c5a199c19745964 --- /dev/null +++ b/OpenAuth.App/BasePartsApp/BasePartsApp.cs @@ -0,0 +1,186 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class BasePartsApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querybase_parts_masterListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("base_parts_master"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置base_parts_master表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Part_desc.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Part_desc); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatebase_parts_masterReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatebase_parts_masterReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new base_parts_master + { + //todo: 根据业务需要调整字段 + Cust_rev = request.Cust_rev, + Comunit_code = request.Comunit_code, + Pucomunit_code = request.Pucomunit_code, + Use_rate = request.Use_rate, + Low_sum = request.Low_sum, + Add_by = request.Add_by, + Upc_code = request.Upc_code, + Vendor_code = request.Vendor_code, + Add_dt = request.Add_dt, + Part_code = request.Part_code, + Fengxiang_check = request.Fengxiang_check, + Print_type = request.Print_type, + Conversion_coefficient = request.Conversion_coefficient, + Part_name = request.Part_name, + Route_id = request.Route_id, + Is_st = request.Is_st, + Use_flag = request.Use_flag, + Product_color = request.Product_color, + Expand_type = request.Expand_type, + Capacity_uom = request.Capacity_uom, + Pack_date_chk = request.Pack_date_chk, + Itf_code = request.Itf_code, + Imei_code = request.Imei_code, + Is_sp = request.Is_sp, + Std_small_carton_qty = request.Std_small_carton_qty, + Storage_condition = request.Storage_condition, + Start_date = request.Start_date, + Spec_id = request.Spec_id, + Sku_code = request.Sku_code, + Dtlevel = request.Dtlevel, + Temp_time = request.Temp_time, + Std_carton_qty = request.Std_carton_qty, + Ship_area = request.Ship_area, + Batch_generation_type = request.Batch_generation_type, + Capacity = request.Capacity, + Is_inv_quality = request.Is_inv_quality, + Instorage_time = request.Instorage_time, + Dtunit = request.Dtunit, + Fid_code = request.Fid_code, + Remark = request.Remark, + Expiry_date = request.Expiry_date, + Dtstyle = request.Dtstyle, + Uph = request.Uph, + Link_qty = request.Link_qty, + Process_code = request.Process_code, + Top_points = request.Top_points, + St_time = request.St_time, + Ean_code = request.Ean_code, + Safe_num = request.Safe_num, + Part_width = request.Part_width, + Massdate_days = request.Massdate_days, + Attribution_section = request.Attribution_section, + Bot_points = request.Bot_points, + Edit_by = request.Edit_by, + Jan_code = request.Jan_code, + Sp_time = request.Sp_time, + Uom = request.Uom, + Edit_dt = request.Edit_dt, + Group_code = request.Group_code, + Part_rev = request.Part_rev, + Std_lot_qty = request.Std_lot_qty, + Part_type = request.Part_type, + Std_pallet_qty = request.Std_pallet_qty, + Part_desc = request.Part_desc, + Cust_pn = request.Cust_pn, + Level_grade = request.Level_grade, + Scan_mode = request.Scan_mode, + Xing_hao = request.Xing_hao, + Part_weight = request.Part_weight, + Commercial_id = request.Commercial_id, + Is_purchase = request.Is_purchase, + Organize_id = request.Organize_id, + Cust_unit = request.Cust_unit, + Part_length = request.Part_length, + Dtaql = request.Dtaql, + Is_instorage = request.Is_instorage, + Product_code = request.Product_code, + Weight_uom = request.Weight_uom, + Eana_code = request.Eana_code, + Part_spec = request.Part_spec, + Part_height = request.Part_height, + Goods_type = request.Goods_type, + Kp_type_id = request.Kp_type_id, + Model_id = request.Model_id, + Stcomunit_code = request.Stcomunit_code, + Customer_id = request.Customer_id, + Test_style = request.Test_style, + Is_self = request.Is_self, + Part_type_id = request.Part_type_id, + Inv_ccode = request.Inv_ccode, + Alarm_flag = request.Alarm_flag, + Dtmethod = request.Dtmethod, + Cmei_code = request.Cmei_code, + Net_capacity = request.Net_capacity, + + },u => u.Id == request.Partno_id); + + } + + public BasePartsApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/BasePartsApp/Request/AddOrUpdatebase_parts_masterReq.cs b/OpenAuth.App/BasePartsApp/Request/AddOrUpdatebase_parts_masterReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..98cb90133eac697c972a94f3796e2e3d46f57aef --- /dev/null +++ b/OpenAuth.App/BasePartsApp/Request/AddOrUpdatebase_parts_masterReq.cs @@ -0,0 +1,499 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatebase_parts_masterReq + { + /// + ///客户料号版本 + /// + public string Cust_rev { get; set; } + + /// + ///通用单位编码 + /// + public string Comunit_code { get; set; } + + /// + ///采购单位编码 + /// + public string Pucomunit_code { get; set; } + + /// + ///使用率 + /// + public string Use_rate { get; set; } + + /// + ///下限总和 + /// + public int? Low_sum { get; set; } + + /// + ///创建人 + /// + public string Add_by { get; set; } + + /// + ///UPC编码 + /// + public string Upc_code { get; set; } + + /// + ///供应商编码 + /// + public string Vendor_code { get; set; } + + /// + ///创建时间 + /// + public DateTime? Add_dt { get; set; } + + /// + ///料号编码 + /// + public string Part_code { get; set; } + + /// + /// + /// + public string Fengxiang_check { get; set; } + + /// + ///打印类型 + /// + public string Print_type { get; set; } + + /// + ///转换系数 + /// + public int? Conversion_coefficient { get; set; } + + /// + ///料号名称 + /// + public string Part_name { get; set; } + + /// + ///路由编号 + /// + public int? Route_id { get; set; } + + /// + ///是否控制三级包装时间（0/1） + /// + public int? Is_st { get; set; } + + /// + ///是否启用（Y/N） + /// + public string Use_flag { get; set; } + + /// + ///产品颜色 + /// + public string Product_color { get; set; } + + /// + ///条码产生方式 + /// + public string Expand_type { get; set; } + + /// + ///容量单位 + /// + public string Capacity_uom { get; set; } + + /// + ///包装日期检查（Y/N） + /// + public string Pack_date_chk { get; set; } + + /// + ///ITF编码 + /// + public string Itf_code { get; set; } + + /// + ///IMEI编码 + /// + public string Imei_code { get; set; } + + /// + ///是否控制二级包装时间（0/1） + /// + public string Is_sp { get; set; } + + /// + ///标准小箱数 + /// + public int? Std_small_carton_qty { get; set; } + + /// + ///存储条件 + /// + public string Storage_condition { get; set; } + + /// + /// + /// + public DateTime? Start_date { get; set; } + + /// + ///规格编号 + /// + public string Spec_id { get; set; } + + /// + ///SKU编码 + /// + public string Sku_code { get; set; } + + /// + ///数据等级 + /// + public int? Dtlevel { get; set; } + + /// + ///回温时间 + /// + public string Temp_time { get; set; } + + /// + ///标准装箱数 + /// + public int? Std_carton_qty { get; set; } + + /// + ///发货区域 + /// + public string Ship_area { get; set; } + + /// + ///批次生成类型 + /// + public string Batch_generation_type { get; set; } + + /// + ///容量 + /// + public decimal? Capacity { get; set; } + + /// + ///是否库存质检（Y/N） + /// + public string Is_inv_quality { get; set; } + + /// + ///入库时间控制 + /// + public int? Instorage_time { get; set; } + + /// + ///数据单位 + /// + public string Dtunit { get; set; } + + /// + ///FID编码 + /// + public string Fid_code { get; set; } + + /// + ///备注 + /// + public string Remark { get; set; } + + /// + ///有效期 + /// + public string Expiry_date { get; set; } + + /// + ///数据样式 + /// + public int? Dtstyle { get; set; } + + /// + ///单位小时产量 + /// + public int? Uph { get; set; } + + /// + ///关联数量 + /// + public int? Link_qty { get; set; } + + /// + ///工艺编码 + /// + public string Process_code { get; set; } + + /// + ///上限点数 + /// + public int? Top_points { get; set; } + + /// + ///三级包装时间控制 + /// + public int? St_time { get; set; } + + /// + ///EAN编码 + /// + public string Ean_code { get; set; } + + /// + ///安全数量 + /// + public int? Safe_num { get; set; } + + /// + ///宽 + /// + public decimal? Part_width { get; set; } + + /// + ///保质期天数 + /// + public int? Massdate_days { get; set; } + + /// + ///归属区段 + /// + public string Attribution_section { get; set; } + + /// + ///下限点数 + /// + public int? Bot_points { get; set; } + + /// + ///修改人 + /// + public string Edit_by { get; set; } + + /// + ///JAN编码 + /// + public string Jan_code { get; set; } + + /// + ///二级包装时间控制 + /// + public int? Sp_time { get; set; } + + /// + ///计量单位 + /// + public string Uom { get; set; } + + /// + ///修改时间 + /// + public DateTime? Edit_dt { get; set; } + + /// + ///分组编码 + /// + public string Group_code { get; set; } + + /// + ///料号版本 + /// + public string Part_rev { get; set; } + + /// + ///标准批次数 + /// + public int? Std_lot_qty { get; set; } + + /// + ///物料类型 + /// + public string Part_type { get; set; } + + /// + ///标准装栈数 + /// + public int? Std_pallet_qty { get; set; } + + /// + ///料号描述 + /// + public string Part_desc { get; set; } + + /// + ///客户料号编号 + /// + public string Cust_pn { get; set; } + + /// + ///料号编号（主键） + /// + public string Partno_id { get; set; } + + /// + ///产品等级 + /// + public string Level_grade { get; set; } + + /// + ///扫描方式 + /// + public string Scan_mode { get; set; } + + /// + ///型号 + /// + public string Xing_hao { get; set; } + + /// + ///重量 + /// + public decimal? Part_weight { get; set; } + + /// + ///商务编号 + /// + public string Commercial_id { get; set; } + + /// + ///是否采购（Y/N） + /// + public string Is_purchase { get; set; } + + /// + ///组织编号 + /// + public string Organize_id { get; set; } + + /// + ///客户单位 + /// + public string Cust_unit { get; set; } + + /// + ///长 + /// + public decimal? Part_length { get; set; } + + /// + ///数据质量等级 + /// + public string Dtaql { get; set; } + + /// + ///是否控制入库时间（0/1） + /// + public int? Is_instorage { get; set; } + + /// + /// + /// + public string Product_code { get; set; } + + /// + ///重量单位 + /// + public string Weight_uom { get; set; } + + /// + ///EANA编码 + /// + public string Eana_code { get; set; } + + /// + ///料号规格 + /// + public string Part_spec { get; set; } + + /// + ///高 + /// + public decimal? Part_height { get; set; } + + /// + ///物料类型 + /// + public string Goods_type { get; set; } + + /// + ///物料群组 + /// + public string Kp_type_id { get; set; } + + /// + ///机型编号 + /// + public string Model_id { get; set; } + + /// + ///标准单位编码 + /// + public string Stcomunit_code { get; set; } + + /// + ///客户编号 + /// + public string Customer_id { get; set; } + + /// + ///测试样式 + /// + public int? Test_style { get; set; } + + /// + ///是否自产（Y/N） + /// + public string Is_self { get; set; } + + /// + ///料件类型编号 + /// + public string Part_type_id { get; set; } + + /// + ///库存科目编码 + /// + public string Inv_ccode { get; set; } + + /// + ///告警标志（Y/N） + /// + public string Alarm_flag { get; set; } + + /// + ///数据方法 + /// + public int? Dtmethod { get; set; } + + /// + ///CMEI编码 + /// + public string Cmei_code { get; set; } + + /// + ///标签净容量 + /// + public string Net_capacity { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/BasePartsApp/Request/Querybase_parts_masterListReq.cs b/OpenAuth.App/BasePartsApp/Request/Querybase_parts_masterListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..50e8ef4ce404b0aca1820a1c2f5d4a25ed372216 --- /dev/null +++ b/OpenAuth.App/BasePartsApp/Request/Querybase_parts_masterListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querybase_parts_masterListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/BaseSR/BaseSR.cs b/OpenAuth.App/BaseSR/BaseSR.cs new file mode 100644 index 0000000000000000000000000000000000000000..0eac52c3c601531ada9fae8b23ba24909d903917 --- /dev/null +++ b/OpenAuth.App/BaseSR/BaseSR.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class BaseSR : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querybase_sr_typeListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("base_sr_type"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置base_sr_type表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Name.Contains(request.key) || u.Code.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatebase_sr_typeReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatebase_sr_typeReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new base_sr_type + { + //todo: 根据业务需要调整字段 + Sr_type = request.Sr_type, + Name = request.Name, + Code = request.Code, + + },u => u.Id == request.Id); + + } + + public BaseSR(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseSR/Request/AddOrUpdatebase_sr_typeReq.cs b/OpenAuth.App/BaseSR/Request/AddOrUpdatebase_sr_typeReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..32379711c228f2d26ade93469fe30196583c49c1 --- /dev/null +++ b/OpenAuth.App/BaseSR/Request/AddOrUpdatebase_sr_typeReq.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatebase_sr_typeReq + { + /// + ///收发类型 + /// + public int? Sr_type { get; set; } + + /// + ///收发类别名称 + /// + public string Name { get; set; } + + /// + ///收发类别编码 + /// + public string Code { get; set; } + + /// + /// + /// + public string Id { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseSR/Request/Querybase_sr_typeListReq.cs b/OpenAuth.App/BaseSR/Request/Querybase_sr_typeListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..e51b1f23102dc20b36911173a729a3e5034d1156 --- /dev/null +++ b/OpenAuth.App/BaseSR/Request/Querybase_sr_typeListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querybase_sr_typeListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/BaseWarehouseApp/BaseWarehouseApp.cs b/OpenAuth.App/BaseWarehouseApp/BaseWarehouseApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..ce2023fcf9c62c57ae15a4b5079e85baa7cd6efb --- /dev/null +++ b/OpenAuth.App/BaseWarehouseApp/BaseWarehouseApp.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class BaseWarehouseApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querybase_warehouseListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("base_warehouse"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置base_warehouse表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Warehouse_name.Contains(request.key) || u.Warehouse_id.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatebase_warehouseReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + obj.Add_by = user.Account; + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatebase_warehouseReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new base_warehouse + { + //todo: 根据业务需要调整字段 + //Add_by = request.Add_by, + Warehouse_name = request.Warehouse_name, + Warehouse_id = request.Warehouse_id, + Company_id = request.Company_id, + //Add_dt = request.Add_dt, + Warehouse_type = request.Warehouse_type, + Edit_by = request.Edit_by, + Edit_dt = DateTime.Now, + + },u => u.Id == request.Id); + + } + + public BaseWarehouseApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseWarehouseApp/Request/AddOrUpdatebase_warehouseReq.cs b/OpenAuth.App/BaseWarehouseApp/Request/AddOrUpdatebase_warehouseReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..1c0c4320c184c3e28a48dc77362a2fad5f553608 --- /dev/null +++ b/OpenAuth.App/BaseWarehouseApp/Request/AddOrUpdatebase_warehouseReq.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatebase_warehouseReq + { + /// + ///最后一次编辑时间 + /// + public DateTime? Edit_dt { get; set; } + + /// + ///最后一次编辑人 + /// + public string Edit_by { get; set; } + + /// + ///组织编码 + /// + public string Company_id { get; set; } + + /// + ///创建时间 + /// + public DateTime? Add_dt { get; set; } + + /// + ///创建人 + /// + public string Add_by { get; set; } + + /// + ///仓库类型 + /// + public string Warehouse_type { get; set; } + + /// + ///仓库名称 + /// + public string Warehouse_name { get; set; } + + /// + ///仓库编码 + /// + public string Warehouse_id { get; set; } + + /// + ///唯一码 + /// + public string Id { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseWarehouseApp/Request/Querybase_warehouseListReq.cs b/OpenAuth.App/BaseWarehouseApp/Request/Querybase_warehouseListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..e65c207e834fc06e7c709ac95c236eabe568e4eb --- /dev/null +++ b/OpenAuth.App/BaseWarehouseApp/Request/Querybase_warehouseListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querybase_warehouseListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/Category/CategoryApp.cs b/OpenAuth.App/Category/CategoryApp.cs index b87b689db317f5182cadd04261b6ec9ef9105d95..3f2df8330b118856b7ae9da7745dc09cf25b0f08 100644 --- a/OpenAuth.App/Category/CategoryApp.cs +++ b/OpenAuth.App/Category/CategoryApp.cs @@ -55,10 +55,8 @@ namespace OpenAuth.App var propertyStr = string.Join(',', columnFields.Select(u =>u.ColumnName)); result.ColumnFields = columnFields; - result.Data = objs.OrderBy(u => u.DtCode) - .Skip((request.page - 1) * request.limit) - .Take(request.limit).Select($"{propertyStr}").ToList(); result.Count = await objs.CountAsync(); + result.Data = objs.OrderBy(u => u.DtCode).Skip((request.page - 1) * request.limit).Take(request.limit).Select($"{propertyStr}").ToList(); return result; } diff --git a/OpenAuth.App/CustomerApp/CustomerApp.cs b/OpenAuth.App/CustomerApp/CustomerApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..fa30ad9c5d548f5a8508c369ba8af39d0896cc5f --- /dev/null +++ b/OpenAuth.App/CustomerApp/CustomerApp.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class CustomerApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querybase_customerListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("base_customer"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置base_customer表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Cus_name.Contains(request.key) || u.Cus_code.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatebase_customerReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatebase_customerReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new base_customer + { + //todo: 根据业务需要调整字段 + Cus_code = request.Cus_code, + Cus_name = request.Cus_name, + Cus_abbname = request.Cus_abbname, + + },u => u.Id == request.Id); + + } + + public CustomerApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/CustomerApp/Request/AddOrUpdatebase_customerReq.cs b/OpenAuth.App/CustomerApp/Request/AddOrUpdatebase_customerReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..03d42389b94039e74c81945e77e126941514e025 --- /dev/null +++ b/OpenAuth.App/CustomerApp/Request/AddOrUpdatebase_customerReq.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatebase_customerReq + { + /// + ///客户简称 + /// + public string Cus_abbname { get; set; } + + /// + ///客户名称 + /// + public string Cus_name { get; set; } + + /// + ///客户编码 + /// + public string Cus_code { get; set; } + + /// + /// + /// + public string Id { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/CustomerApp/Request/Querybase_customerListReq.cs b/OpenAuth.App/CustomerApp/Request/Querybase_customerListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..d841f71db79f740bc4c19987db5ad384cead8c8c --- /dev/null +++ b/OpenAuth.App/CustomerApp/Request/Querybase_customerListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querybase_customerListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/DbExtension.cs b/OpenAuth.App/DbExtension.cs index 141c20537d7539fac4e219ccb1f9fef5c98829a5..aa981f50ba651c5c3a2d46f9f65dc8b1425b266e 100644 --- a/OpenAuth.App/DbExtension.cs +++ b/OpenAuth.App/DbExtension.cs @@ -117,7 +117,7 @@ namespace OpenAuth.App where utc.table_name = ucc.table_name and utc.column_name = ucc.column_name and utc.table_name = '{tableName}' - order by column_id; "; + order by column_id "; var columns = SugarClient.SqlQueryable(sql); var columnList = columns?.ToList(); @@ -406,6 +406,22 @@ namespace OpenAuth.App } } + /// + /// 处理外部数据库 - 使用外部数据源名称 + /// 该方法会修改默认的数据库连接，请谨慎使用 + /// + /// 代码生成器表ID + public void ProcessExternalDbByName(string dbName){ + + //如果代码生成器配置了外部数据库连接，则使用外部数据库连接 + var connection = SugarClient.Queryable().First(u => u.Name == dbName); + if (connection != null) + { + var dbType = connection.Dbtype; + SetConnection(connection.Connectionstring, dbType); + } + } + /// /// 设置数据库连接 /// diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index ffbdaa2d22515a936b7e194e30364a770fcf78b9..65efb7df80c00a56537d6a58e0b3a8aa2df00e4c 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -20,7 +20,7 @@ - + diff --git a/OpenAuth.App/OtherApplicationsApp/OtherApplicationsApp.cs b/OpenAuth.App/OtherApplicationsApp/OtherApplicationsApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..1ae519e9bb0eee47443efe18ea2f604c985a62f4 --- /dev/null +++ b/OpenAuth.App/OtherApplicationsApp/OtherApplicationsApp.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class OtherApplicationsApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querywms_rk_infoListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("wms_rk_info"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置wms_rk_info表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.M_code.Contains(request.key) || u.Cmemo.Contains(request.key) || u.Cinvcode.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatewms_rk_infoReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatewms_rk_infoReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new wms_rk_info + { + //todo: 根据业务需要调整字段 + M_type = request.M_type, + Crdname = request.Crdname, + Z_qty = request.Z_qty, + Cdepcode = request.Cdepcode, + Line_code = request.Line_code, + Type = request.Type, + Cmaker = request.Cmaker, + Iquantity = request.Iquantity, + Cwhname = request.Cwhname, + Add_dt = request.Add_dt, + Cinvcode = request.Cinvcode, + M_code = request.M_code, + Edit_dt = request.Edit_dt, + Ccustcode = request.Ccustcode, + Cust_name = request.Cust_name, + Cpersoncode = request.Cpersoncode, + Factory_code = request.Factory_code, + Person_name = request.Person_name, + Cwhcode = request.Cwhcode, + Edit_by = request.Edit_by, + Cmemo = request.Cmemo, + Crdcode = request.Crdcode, + Is_u8 = request.Is_u8, + Cbatch = request.Cbatch, + Add_by = request.Add_by, + + },u => u.Id == request.Id); + + } + + public OtherApplicationsApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/OtherApplicationsApp/Request/AddOrUpdatewms_rk_infoReq.cs b/OpenAuth.App/OtherApplicationsApp/Request/AddOrUpdatewms_rk_infoReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..e470e5604fb7b873f6d703140d831fc6aaf861d5 --- /dev/null +++ b/OpenAuth.App/OtherApplicationsApp/Request/AddOrUpdatewms_rk_infoReq.cs @@ -0,0 +1,154 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatewms_rk_infoReq + { + /// + ///出入类型 + /// + public string M_type { get; set; } + + /// + ///类别名称 + /// + public string Crdname { get; set; } + + /// + ///已扫描数 + /// + public int? Z_qty { get; set; } + + /// + ///部门编码 + /// + public string Cdepcode { get; set; } + + /// + ///行号 + /// + public string Line_code { get; set; } + + /// + ///是否红字类型 + /// + public string Type { get; set; } + + /// + ///创建人 + /// + public string Cmaker { get; set; } + + /// + ///数量 + /// + public int? Iquantity { get; set; } + + /// + ///仓库名称 + /// + public string Cwhname { get; set; } + + /// + ///添加时间 + /// + public DateTime? Add_dt { get; set; } + + /// + ///料号 + /// + public string Cinvcode { get; set; } + + /// + ///单号 + /// + public string M_code { get; set; } + + /// + ///修改时间 + /// + public DateTime? Edit_dt { get; set; } + + /// + ///客户编码 + /// + public string Ccustcode { get; set; } + + /// + ///客户名称 + /// + public string Cust_name { get; set; } + + /// + ///业务员工号 + /// + public string Cpersoncode { get; set; } + + /// + ///工厂 + /// + public string Factory_code { get; set; } + + /// + ///业务员名称 + /// + public string Person_name { get; set; } + + /// + ///仓库编码 + /// + public string Cwhcode { get; set; } + + /// + ///修改人 + /// + public string Edit_by { get; set; } + + /// + ///备注 + /// + public string Cmemo { get; set; } + + /// + ///唯一编码 + /// + public string Id { get; set; } + + /// + ///入库类别编码 + /// + public string Crdcode { get; set; } + + /// + ///是否提交U8 + /// + public string Is_u8 { get; set; } + + /// + ///批次 + /// + public string Cbatch { get; set; } + + /// + ///添加人 + /// + public string Add_by { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/OtherApplicationsApp/Request/Querywms_rk_infoListReq.cs b/OpenAuth.App/OtherApplicationsApp/Request/Querywms_rk_infoListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..70f303d43c03d5608bb46cbad5e9becbcb5ed5c8 --- /dev/null +++ b/OpenAuth.App/OtherApplicationsApp/Request/Querywms_rk_infoListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querywms_rk_infoListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/StockApp/Request/AddOrUpdateStockReq.cs b/OpenAuth.App/StockApp/Request/AddOrUpdateStockReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..8213d76b2bd7ec556b77f362fe9d5e74721ee260 --- /dev/null +++ b/OpenAuth.App/StockApp/Request/AddOrUpdateStockReq.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + ///请在自己的电脑测试，服务器是看不出效果的 + /// + + public class AddOrUpdateStockReq + { + /// + ///数据ID + /// + public string Id { get; set; } + + /// + ///产品单价 + /// + public decimal Price { get; set; } + + /// + ///产品名称 + /// + public string Name { get; set; } + + /// + ///操作人 + /// + public string Createuser { get; set; } + + /// + ///出库/入库 + /// + public int Status { get; set; } + + /// + ///操作时间 + /// + public DateTime Time { get; set; } + + /// + ///可见范围 + /// + public string Viewable { get; set; } + + /// + ///产品数量 + /// + public int Prodcnt { get; set; } + + /// + ///组织ID + /// + public string Orgid { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/StockApp/Request/QueryStockListReq.cs b/OpenAuth.App/StockApp/Request/QueryStockListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..5e0677b2d04aa35115b9376c5a6a6a491e34699e --- /dev/null +++ b/OpenAuth.App/StockApp/Request/QueryStockListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class QueryStockListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/StockApp/StockApp.cs b/OpenAuth.App/StockApp/StockApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..0c007e042b46e4d0b1cf13e94f2f168a07c467e9 --- /dev/null +++ b/OpenAuth.App/StockApp/StockApp.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class StockApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(QueryStockListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("Stock"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置Stock表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Name.Contains(request.key)); + } + + + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdateStockReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdateStockReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new Stock + { + //todo: 根据业务需要调整字段 + Price = request.Price, + Name = request.Name, + Createuser = request.Createuser, + Status = request.Status, + Time = request.Time, + Viewable = request.Viewable, + Prodcnt = request.Prodcnt, + Orgid = request.Orgid, + + },u => u.Id == request.Id); + + } + + public StockApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/U8DepApp/Request/AddOrUpdatebase_u8_depReq.cs b/OpenAuth.App/U8DepApp/Request/AddOrUpdatebase_u8_depReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..3b6a832fd62e90a328e10b03cbfe914da270f1c9 --- /dev/null +++ b/OpenAuth.App/U8DepApp/Request/AddOrUpdatebase_u8_depReq.cs @@ -0,0 +1,39 @@ +//------------------------------------------------------------------------------ +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +//------------------------------------------------------------------------------ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.App.Request +{ + /// + /// + /// + + public class AddOrUpdatebase_u8_depReq + { + /// + ///客户编码 + /// + public string Cdep_code { get; set; } + + /// + ///客户名称 + /// + public string Cdep_name { get; set; } + + /// + /// + /// + public string Id { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/U8DepApp/Request/Querybase_u8_depListReq.cs b/OpenAuth.App/U8DepApp/Request/Querybase_u8_depListReq.cs new file mode 100644 index 0000000000000000000000000000000000000000..d9aa5053865e082379c0161000192aa93c045a7d --- /dev/null +++ b/OpenAuth.App/U8DepApp/Request/Querybase_u8_depListReq.cs @@ -0,0 +1,7 @@ +namespace OpenAuth.App.Request +{ + public class Querybase_u8_depListReq : PageReq + { + + } +} diff --git a/OpenAuth.App/U8DepApp/U8DepApp.cs b/OpenAuth.App/U8DepApp/U8DepApp.cs new file mode 100644 index 0000000000000000000000000000000000000000..5ab954096defa8f64a8da5428d2c015c872755d3 --- /dev/null +++ b/OpenAuth.App/U8DepApp/U8DepApp.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Infrastructure; +using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using SqlSugar; + + +namespace OpenAuth.App +{ + public class U8DepApp : SqlSugarBaseApp + { + + /// + /// 加载列表 + /// + public async Task Load(Querybase_u8_depListReq request) + { + var loginContext = _auth.GetCurrentUser(); + if (loginContext == null) + { + throw new CommonException("登录已过期", Define.INVALID_TOKEN); + } + + var columnFields = loginContext.GetTableColumns("base_u8_dep"); + if (columnFields == null || columnFields.Count == 0) + { + throw new Exception("请在代码生成界面配置base_u8_dep表的字段属性"); + } + + var result = new PagedDynamicDataResp(); + var objs = GetDataPrivilege("u"); + if (!string.IsNullOrEmpty(request.key)) + { + //增加筛选条件,如： + objs = objs.Where(u => u.Cdep_name.Contains(request.key) || u.Cdep_code.Contains(request.key)); + } + + var columnnames = columnFields.Select(u => u.ColumnName); + var propertyStr = string.Join(',', columnnames); + result.ColumnFields = columnFields; + if (!string.IsNullOrEmpty(request.sort)) + { + var sortfields = request.sort.Split(','); + + objs = objs.OrderBy($"{sortfields[0]} {sortfields[1]}"); + }else{ + objs = objs.OrderBy(u => u.Id); + } + result.Data = objs + .Skip((request.page - 1) * request.limit) + .Take(request.limit).Select($"{propertyStr}").ToList(); + result.Count = await objs.CountAsync(); + return result; + } + + public void Add(AddOrUpdatebase_u8_depReq request) + { + var obj = request.MapTo(); + var user = _auth.GetCurrentUser().User; + //todo:补充或调整自己需要的字段 + + if(obj.KeyIsNull()) //如果主键为空，则生成默认值 + { + obj.GenerateDefaultKeyVal(); + } + Repository.Insert(obj); + } + + public void Update(AddOrUpdatebase_u8_depReq request) + { + var user = _auth.GetCurrentUser().User; + Repository.Update(u => new base_u8_dep + { + //todo: 根据业务需要调整字段 + Cdep_code = request.Cdep_code, + Cdep_name = request.Cdep_name, + + },u => u.Id == request.Id); + + } + + public U8DepApp(ISqlSugarClient client, IAuth auth) : base(client, auth) + { + } + } +} \ No newline at end of file diff --git a/OpenAuth.Identity/OpenAuth.IdentityServer.csproj b/OpenAuth.Identity/OpenAuth.IdentityServer.csproj index 0505b0f3195c0e62c7c791b160e7850b33aa8ba1..2a18e9d331ac2cf44d60ea427c5811d7ef04d53a 100644 --- a/OpenAuth.Identity/OpenAuth.IdentityServer.csproj +++ b/OpenAuth.Identity/OpenAuth.IdentityServer.csproj @@ -10,6 +10,7 @@ + diff --git a/OpenAuth.Repository/Domain/Stock.cs b/OpenAuth.Repository/Domain/Stock.cs new file mode 100644 index 0000000000000000000000000000000000000000..f0fa4a358441b7ef7eaa7e1eda4a42e78894b6da --- /dev/null +++ b/OpenAuth.Repository/Domain/Stock.cs @@ -0,0 +1,81 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + ///请在自己的电脑测试，服务器是看不出效果的 + /// + [Table("Stock")] + public class Stock : StringEntity + { + public Stock() + { + this.Price=0; + this.Name=""; + this.Createuser=""; + this.Status=0; + this.Time=DateTime.Now; + this.Viewable=""; + this.Prodcnt=0; + this.Orgid=""; + + } + /// + ///产品单价 + /// + [Description("产品单价")] + public decimal Price { get; set; } + + /// + ///产品名称 + /// + [Description("产品名称")] + public string Name { get; set; } + + /// + ///操作人 + /// + [Description("操作人")] + public string Createuser { get; set; } + + /// + ///出库/入库 + /// + [Description("出库/入库")] + public int Status { get; set; } + + /// + ///操作时间 + /// + [Description("操作时间")] + public DateTime Time { get; set; } + + /// + ///可见范围 + /// + [Description("可见范围")] + public string Viewable { get; set; } + + /// + ///产品数量 + /// + [Description("产品数量")] + public int Prodcnt { get; set; } + + /// + ///组织ID + /// + [Description("组织ID")] + public string Orgid { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/base_customer.cs b/OpenAuth.Repository/Domain/base_customer.cs new file mode 100644 index 0000000000000000000000000000000000000000..15e4303d34a14a56f975df2a5b895b03b6a1eff5 --- /dev/null +++ b/OpenAuth.Repository/Domain/base_customer.cs @@ -0,0 +1,46 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("base_customer")] + public class base_customer : StringEntity + { + public base_customer() + { + this.Cus_abbname=""; + this.Cus_name=""; + this.Cus_code=""; + + } + /// + ///客户简称 + /// + [Description("客户简称")] + public string Cus_abbname { get; set; } + + /// + ///客户名称 + /// + [Description("客户名称")] + public string Cus_name { get; set; } + + /// + ///客户编码 + /// + [Description("客户编码")] + public string Cus_code { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/base_location.cs b/OpenAuth.Repository/Domain/base_location.cs new file mode 100644 index 0000000000000000000000000000000000000000..c75a880e94159466f6cc52021cbc9604cf677654 --- /dev/null +++ b/OpenAuth.Repository/Domain/base_location.cs @@ -0,0 +1,151 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("base_location")] + public class base_location : StringEntity + { + public base_location() + { + this.Storagehigh=""; + this.Storagewidth=""; + this.Company_id=""; + this.Warehouse_id=""; + this.Add_by=""; + this.Location_id=""; + this.Is_active=""; + this.Storagelength=""; + this.Last_userdate=DateTime.Now; + this.Location_type=""; + this.Location_name=""; + this.Edit_by=""; + this.Shelfnumber=""; + this.Size_class=""; + this.Add_dt=DateTime.Now; + this.Bfloor_id=""; + this.Group_id=""; + this.Edit_dt=DateTime.Now; + + } + /// + ///储位高度 + /// + [Description("储位高度")] + public string Storagehigh { get; set; } + + /// + ///储位宽度 + /// + [Description("储位宽度")] + public string Storagewidth { get; set; } + + /// + ///组织编码 + /// + [Description("组织编码")] + public string Company_id { get; set; } + + /// + ///仓库编码 + /// + [Description("仓库编码")] + public string Warehouse_id { get; set; } + + /// + ///创建人 + /// + [Description("创建人")] + public string Add_by { get; set; } + + /// + ///库位编码 + /// + [Description("库位编码")] + public string Location_id { get; set; } + + /// + ///是否启用 + /// + [Description("是否启用")] + public string Is_active { get; set; } + + /// + ///储位长度 + /// + [Description("储位长度")] + public string Storagelength { get; set; } + + /// + ///库位编码 + /// + [Description("库位编码")] + public DateTime? Last_userdate { get; set; } + + /// + ///库位类型 + /// + [Description("库位类型")] + public string Location_type { get; set; } + + /// + ///库位名称 + /// + [Description("库位名称")] + public string Location_name { get; set; } + + /// + ///最后一次编辑人 + /// + [Description("最后一次编辑人")] + public string Edit_by { get; set; } + + /// + ///库架编码 + /// + [Description("库架编码")] + public string Shelfnumber { get; set; } + + /// + ///尺寸类型 + /// + [Description("尺寸类型")] + public string Size_class { get; set; } + + /// + ///创建时间 + /// + [Description("创建时间")] + public DateTime? Add_dt { get; set; } + + /// + ///车间编码 + /// + [Description("车间编码")] + public string Bfloor_id { get; set; } + + /// + ///工站编码 + /// + [Description("工站编码")] + public string Group_id { get; set; } + + /// + ///最后一次编辑时间 + /// + [Description("最后一次编辑时间")] + public DateTime? Edit_dt { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/base_parts_master.cs b/OpenAuth.Repository/Domain/base_parts_master.cs new file mode 100644 index 0000000000000000000000000000000000000000..7ef48c3b7482a21e53fe91419df12584d76b79db --- /dev/null +++ b/OpenAuth.Repository/Domain/base_parts_master.cs @@ -0,0 +1,683 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("base_parts_master")] + public class base_parts_master : StringEntity + { + public base_parts_master() + { + this.Cust_rev=""; + this.Comunit_code=""; + this.Pucomunit_code=""; + this.Use_rate=""; + this.Low_sum=0; + this.Add_by=""; + this.Upc_code=""; + this.Vendor_code=""; + this.Add_dt=DateTime.Now; + this.Part_code=""; + this.Fengxiang_check=""; + this.Print_type=""; + this.Conversion_coefficient=0; + this.Part_name=""; + this.Route_id=0; + this.Is_st=0; + this.Use_flag=""; + this.Product_color=""; + this.Expand_type=""; + this.Capacity_uom=""; + this.Pack_date_chk=""; + this.Itf_code=""; + this.Imei_code=""; + this.Is_sp=""; + this.Std_small_carton_qty=0; + this.Storage_condition=""; + this.Start_date=DateTime.Now; + this.Spec_id=""; + this.Sku_code=""; + this.Dtlevel=0; + this.Temp_time=""; + this.Std_carton_qty=0; + this.Ship_area=""; + this.Batch_generation_type=""; + this.Capacity=0; + this.Is_inv_quality=""; + this.Instorage_time=0; + this.Dtunit=""; + this.Fid_code=""; + this.Remark=""; + this.Expiry_date=""; + this.Dtstyle=0; + this.Uph=0; + this.Link_qty=0; + this.Process_code=""; + this.Top_points=0; + this.St_time=0; + this.Ean_code=""; + this.Safe_num=0; + this.Part_width=0; + this.Massdate_days=0; + this.Attribution_section=""; + this.Bot_points=0; + this.Edit_by=""; + this.Jan_code=""; + this.Sp_time=0; + this.Uom=""; + this.Edit_dt=DateTime.Now; + this.Group_code=""; + this.Part_rev=""; + this.Std_lot_qty=0; + this.Part_type=""; + this.Std_pallet_qty=0; + this.Part_desc=""; + this.Cust_pn=""; + this.Level_grade=""; + this.Scan_mode=""; + this.Xing_hao=""; + this.Part_weight=0; + this.Commercial_id=""; + this.Is_purchase=""; + this.Organize_id=""; + this.Cust_unit=""; + this.Part_length=0; + this.Dtaql=""; + this.Is_instorage=0; + this.Product_code=""; + this.Weight_uom=""; + this.Eana_code=""; + this.Part_spec=""; + this.Part_height=0; + this.Goods_type=""; + this.Kp_type_id=""; + this.Model_id=""; + this.Stcomunit_code=""; + this.Customer_id=""; + this.Test_style=0; + this.Is_self=""; + this.Part_type_id=""; + this.Inv_ccode=""; + this.Alarm_flag=""; + this.Dtmethod=0; + this.Cmei_code=""; + this.Net_capacity=""; + + } + /// + ///客户料号版本 + /// + [Description("客户料号版本")] + public string Cust_rev { get; set; } + + /// + ///通用单位编码 + /// + [Description("通用单位编码")] + public string Comunit_code { get; set; } + + /// + ///采购单位编码 + /// + [Description("采购单位编码")] + public string Pucomunit_code { get; set; } + + /// + ///使用率 + /// + [Description("使用率")] + public string Use_rate { get; set; } + + /// + ///下限总和 + /// + [Description("下限总和")] + public int? Low_sum { get; set; } + + /// + ///创建人 + /// + [Description("创建人")] + public string Add_by { get; set; } + + /// + ///UPC编码 + /// + [Description("UPC编码")] + public string Upc_code { get; set; } + + /// + ///供应商编码 + /// + [Description("供应商编码")] + public string Vendor_code { get; set; } + + /// + ///创建时间 + /// + [Description("创建时间")] + public DateTime? Add_dt { get; set; } + + /// + ///料号编码 + /// + [Description("料号编码")] + public string Part_code { get; set; } + + /// + /// + /// + [Description("")] + public string Fengxiang_check { get; set; } + + /// + ///打印类型 + /// + [Description("打印类型")] + public string Print_type { get; set; } + + /// + ///转换系数 + /// + [Description("转换系数")] + public int? Conversion_coefficient { get; set; } + + /// + ///料号名称 + /// + [Description("料号名称")] + public string Part_name { get; set; } + + /// + ///路由编号 + /// + [Description("路由编号")] + public int? Route_id { get; set; } + + /// + ///是否控制三级包装时间（0/1） + /// + [Description("是否控制三级包装时间（0/1）")] + public int? Is_st { get; set; } + + /// + ///是否启用（Y/N） + /// + [Description("是否启用（Y/N）")] + public string Use_flag { get; set; } + + /// + ///产品颜色 + /// + [Description("产品颜色")] + public string Product_color { get; set; } + + /// + ///条码产生方式 + /// + [Description("条码产生方式")] + public string Expand_type { get; set; } + + /// + ///容量单位 + /// + [Description("容量单位")] + public string Capacity_uom { get; set; } + + /// + ///包装日期检查（Y/N） + /// + [Description("包装日期检查（Y/N）")] + public string Pack_date_chk { get; set; } + + /// + ///ITF编码 + /// + [Description("ITF编码")] + public string Itf_code { get; set; } + + /// + ///IMEI编码 + /// + [Description("IMEI编码")] + public string Imei_code { get; set; } + + /// + ///是否控制二级包装时间（0/1） + /// + [Description("是否控制二级包装时间（0/1）")] + public string Is_sp { get; set; } + + /// + ///标准小箱数 + /// + [Description("标准小箱数")] + public int? Std_small_carton_qty { get; set; } + + /// + ///存储条件 + /// + [Description("存储条件")] + public string Storage_condition { get; set; } + + /// + /// + /// + [Description("")] + public DateTime? Start_date { get; set; } + + /// + ///规格编号 + /// + [Description("规格编号")] + public string Spec_id { get; set; } + + /// + ///SKU编码 + /// + [Description("SKU编码")] + public string Sku_code { get; set; } + + /// + ///数据等级 + /// + [Description("数据等级")] + public int? Dtlevel { get; set; } + + /// + ///回温时间 + /// + [Description("回温时间")] + public string Temp_time { get; set; } + + /// + ///标准装箱数 + /// + [Description("标准装箱数")] + public int? Std_carton_qty { get; set; } + + /// + ///发货区域 + /// + [Description("发货区域")] + public string Ship_area { get; set; } + + /// + ///批次生成类型 + /// + [Description("批次生成类型")] + public string Batch_generation_type { get; set; } + + /// + ///容量 + /// + [Description("容量")] + public decimal? Capacity { get; set; } + + /// + ///是否库存质检（Y/N） + /// + [Description("是否库存质检（Y/N）")] + public string Is_inv_quality { get; set; } + + /// + ///入库时间控制 + /// + [Description("入库时间控制")] + public int? Instorage_time { get; set; } + + /// + ///数据单位 + /// + [Description("数据单位")] + public string Dtunit { get; set; } + + /// + ///FID编码 + /// + [Description("FID编码")] + public string Fid_code { get; set; } + + /// + ///备注 + /// + [Description("备注")] + public string Remark { get; set; } + + /// + ///有效期 + /// + [Description("有效期")] + public string Expiry_date { get; set; } + + /// + ///数据样式 + /// + [Description("数据样式")] + public int? Dtstyle { get; set; } + + /// + ///单位小时产量 + /// + [Description("单位小时产量")] + public int? Uph { get; set; } + + /// + ///关联数量 + /// + [Description("关联数量")] + public int? Link_qty { get; set; } + + /// + ///工艺编码 + /// + [Description("工艺编码")] + public string Process_code { get; set; } + + /// + ///上限点数 + /// + [Description("上限点数")] + public int? Top_points { get; set; } + + /// + ///三级包装时间控制 + /// + [Description("三级包装时间控制")] + public int? St_time { get; set; } + + /// + ///EAN编码 + /// + [Description("EAN编码")] + public string Ean_code { get; set; } + + /// + ///安全数量 + /// + [Description("安全数量")] + public int? Safe_num { get; set; } + + /// + ///宽 + /// + [Description("宽")] + public decimal? Part_width { get; set; } + + /// + ///保质期天数 + /// + [Description("保质期天数")] + public int? Massdate_days { get; set; } + + /// + ///归属区段 + /// + [Description("归属区段")] + public string Attribution_section { get; set; } + + /// + ///下限点数 + /// + [Description("下限点数")] + public int? Bot_points { get; set; } + + /// + ///修改人 + /// + [Description("修改人")] + public string Edit_by { get; set; } + + /// + ///JAN编码 + /// + [Description("JAN编码")] + public string Jan_code { get; set; } + + /// + ///二级包装时间控制 + /// + [Description("二级包装时间控制")] + public int? Sp_time { get; set; } + + /// + ///计量单位 + /// + [Description("计量单位")] + public string Uom { get; set; } + + /// + ///修改时间 + /// + [Description("修改时间")] + public DateTime? Edit_dt { get; set; } + + /// + ///分组编码 + /// + [Description("分组编码")] + public string Group_code { get; set; } + + /// + ///料号版本 + /// + [Description("料号版本")] + public string Part_rev { get; set; } + + /// + ///标准批次数 + /// + [Description("标准批次数")] + public int? Std_lot_qty { get; set; } + + /// + ///物料类型 + /// + [Description("物料类型")] + public string Part_type { get; set; } + + /// + ///标准装栈数 + /// + [Description("标准装栈数")] + public int? Std_pallet_qty { get; set; } + + /// + ///料号描述 + /// + [Description("料号描述")] + public string Part_desc { get; set; } + + /// + ///客户料号编号 + /// + [Description("客户料号编号")] + public string Cust_pn { get; set; } + + /// + ///产品等级 + /// + [Description("产品等级")] + public string Level_grade { get; set; } + + /// + ///扫描方式 + /// + [Description("扫描方式")] + public string Scan_mode { get; set; } + + /// + ///型号 + /// + [Description("型号")] + public string Xing_hao { get; set; } + + /// + ///重量 + /// + [Description("重量")] + public decimal? Part_weight { get; set; } + + /// + ///商务编号 + /// + [Description("商务编号")] + public string Commercial_id { get; set; } + + /// + ///是否采购（Y/N） + /// + [Description("是否采购（Y/N）")] + public string Is_purchase { get; set; } + + /// + ///组织编号 + /// + [Description("组织编号")] + public string Organize_id { get; set; } + + /// + ///客户单位 + /// + [Description("客户单位")] + public string Cust_unit { get; set; } + + /// + ///长 + /// + [Description("长")] + public decimal? Part_length { get; set; } + + /// + ///数据质量等级 + /// + [Description("数据质量等级")] + public string Dtaql { get; set; } + + /// + ///是否控制入库时间（0/1） + /// + [Description("是否控制入库时间（0/1）")] + public int? Is_instorage { get; set; } + + /// + /// + /// + [Description("")] + public string Product_code { get; set; } + + /// + ///重量单位 + /// + [Description("重量单位")] + public string Weight_uom { get; set; } + + /// + ///EANA编码 + /// + [Description("EANA编码")] + public string Eana_code { get; set; } + + /// + ///料号规格 + /// + [Description("料号规格")] + public string Part_spec { get; set; } + + /// + ///高 + /// + [Description("高")] + public decimal? Part_height { get; set; } + + /// + ///物料类型 + /// + [Description("物料类型")] + public string Goods_type { get; set; } + + /// + ///物料群组 + /// + [Description("物料群组")] + public string Kp_type_id { get; set; } + + /// + ///机型编号 + /// + [Description("机型编号")] + public string Model_id { get; set; } + + /// + ///标准单位编码 + /// + [Description("标准单位编码")] + public string Stcomunit_code { get; set; } + + /// + ///客户编号 + /// + [Description("客户编号")] + public string Customer_id { get; set; } + + /// + ///测试样式 + /// + [Description("测试样式")] + public int? Test_style { get; set; } + + /// + ///是否自产（Y/N） + /// + [Description("是否自产（Y/N）")] + public string Is_self { get; set; } + + /// + ///料件类型编号 + /// + [Description("料件类型编号")] + public string Part_type_id { get; set; } + + /// + ///库存科目编码 + /// + [Description("库存科目编码")] + public string Inv_ccode { get; set; } + + /// + ///告警标志（Y/N） + /// + [Description("告警标志（Y/N）")] + public string Alarm_flag { get; set; } + + /// + ///数据方法 + /// + [Description("数据方法")] + public int? Dtmethod { get; set; } + + /// + ///CMEI编码 + /// + [Description("CMEI编码")] + public string Cmei_code { get; set; } + + /// + ///标签净容量 + /// + [Description("标签净容量")] + public string Net_capacity { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/base_sr_type.cs b/OpenAuth.Repository/Domain/base_sr_type.cs new file mode 100644 index 0000000000000000000000000000000000000000..3e1ba8a41ee5bc36a9c66ff0e776dc3304f4b505 --- /dev/null +++ b/OpenAuth.Repository/Domain/base_sr_type.cs @@ -0,0 +1,46 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("base_sr_type")] + public class base_sr_type : StringEntity + { + public base_sr_type() + { + this.Sr_type=0; + this.Name=""; + this.Code=""; + + } + /// + ///收发类型 + /// + [Description("收发类型")] + public int? Sr_type { get; set; } + + /// + ///收发类别名称 + /// + [Description("收发类别名称")] + public string Name { get; set; } + + /// + ///收发类别编码 + /// + [Description("收发类别编码")] + public string Code { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/base_u8_dep.cs b/OpenAuth.Repository/Domain/base_u8_dep.cs new file mode 100644 index 0000000000000000000000000000000000000000..3544a265e9e1a8907c04079cfba06dde9eeb1acf --- /dev/null +++ b/OpenAuth.Repository/Domain/base_u8_dep.cs @@ -0,0 +1,39 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("base_u8_dep")] + public class base_u8_dep : StringEntity + { + public base_u8_dep() + { + this.Cdep_code=""; + this.Cdep_name=""; + + } + /// + ///客户编码 + /// + [Description("客户编码")] + public string Cdep_code { get; set; } + + /// + ///客户名称 + /// + [Description("客户名称")] + public string Cdep_name { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/base_warehouse.cs b/OpenAuth.Repository/Domain/base_warehouse.cs new file mode 100644 index 0000000000000000000000000000000000000000..99367f720ec7c36b5123a305ca640a137b953c9b --- /dev/null +++ b/OpenAuth.Repository/Domain/base_warehouse.cs @@ -0,0 +1,81 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("base_warehouse")] + public class base_warehouse : StringEntity + { + public base_warehouse() + { + this.Edit_dt=DateTime.Now; + this.Edit_by=""; + this.Company_id=""; + this.Add_dt=DateTime.Now; + this.Add_by=""; + this.Warehouse_type=""; + this.Warehouse_name=""; + this.Warehouse_id=""; + + } + /// + ///最后一次编辑时间 + /// + [Description("最后一次编辑时间")] + public DateTime? Edit_dt { get; set; } + + /// + ///最后一次编辑人 + /// + [Description("最后一次编辑人")] + public string Edit_by { get; set; } + + /// + ///组织编码 + /// + [Description("组织编码")] + public string Company_id { get; set; } + + /// + ///创建时间 + /// + [Description("创建时间")] + public DateTime? Add_dt { get; set; } + + /// + ///创建人 + /// + [Description("创建人")] + public string Add_by { get; set; } + + /// + ///仓库类型 + /// + [Description("仓库类型")] + public string Warehouse_type { get; set; } + + /// + ///仓库名称 + /// + [Description("仓库名称")] + public string Warehouse_name { get; set; } + + /// + ///仓库编码 + /// + [Description("仓库编码")] + public string Warehouse_id { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/wms_rk_info.cs b/OpenAuth.Repository/Domain/wms_rk_info.cs new file mode 100644 index 0000000000000000000000000000000000000000..5e94878950110b1a1b1e3f857b8c625d68aa1c4f --- /dev/null +++ b/OpenAuth.Repository/Domain/wms_rk_info.cs @@ -0,0 +1,200 @@ +/* + * @Author: yubaolee | ahfu~ <954478625@qq.com> + * @Description: 实体类 + * Copyright (c) 2025 by yubaolee | ahfu~ , All Rights Reserved. +*/ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; +using OpenAuth.Repository.Core; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [Table("wms_rk_info")] + public class wms_rk_info : StringEntity + { + public wms_rk_info() + { + this.M_type=""; + this.Crdname=""; + this.Z_qty=0; + this.Cdepcode=""; + this.Line_code=""; + this.Type=""; + this.Cmaker=""; + this.Iquantity=0; + this.Cwhname=""; + this.Add_dt=DateTime.Now; + this.Cinvcode=""; + this.M_code=""; + this.Edit_dt=DateTime.Now; + this.Ccustcode=""; + this.Cust_name=""; + this.Cpersoncode=""; + this.Factory_code=""; + this.Person_name=""; + this.Cwhcode=""; + this.Edit_by=""; + this.Cmemo=""; + this.Crdcode=""; + this.Is_u8=""; + this.Cbatch=""; + this.Add_by=""; + + } + /// + ///出入类型 + /// + [Description("出入类型")] + public string M_type { get; set; } + + /// + ///类别名称 + /// + [Description("类别名称")] + public string Crdname { get; set; } + + /// + ///已扫描数 + /// + [Description("已扫描数")] + public int? Z_qty { get; set; } + + /// + ///部门编码 + /// + [Description("部门编码")] + public string Cdepcode { get; set; } + + /// + ///行号 + /// + [Description("行号")] + public string Line_code { get; set; } + + /// + ///是否红字类型 + /// + [Description("是否红字类型")] + public string Type { get; set; } + + /// + ///创建人 + /// + [Description("创建人")] + public string Cmaker { get; set; } + + /// + ///数量 + /// + [Description("数量")] + public int? Iquantity { get; set; } + + /// + ///仓库名称 + /// + [Description("仓库名称")] + public string Cwhname { get; set; } + + /// + ///添加时间 + /// + [Description("添加时间")] + public DateTime? Add_dt { get; set; } + + /// + ///料号 + /// + [Description("料号")] + public string Cinvcode { get; set; } + + /// + ///单号 + /// + [Description("单号")] + public string M_code { get; set; } + + /// + ///修改时间 + /// + [Description("修改时间")] + public DateTime? Edit_dt { get; set; } + + /// + ///客户编码 + /// + [Description("客户编码")] + public string Ccustcode { get; set; } + + /// + ///客户名称 + /// + [Description("客户名称")] + public string Cust_name { get; set; } + + /// + ///业务员工号 + /// + [Description("业务员工号")] + public string Cpersoncode { get; set; } + + /// + ///工厂 + /// + [Description("工厂")] + public string Factory_code { get; set; } + + /// + ///业务员名称 + /// + [Description("业务员名称")] + public string Person_name { get; set; } + + /// + ///仓库编码 + /// + [Description("仓库编码")] + public string Cwhcode { get; set; } + + /// + ///修改人 + /// + [Description("修改人")] + public string Edit_by { get; set; } + + /// + ///备注 + /// + [Description("备注")] + public string Cmemo { get; set; } + + /// + ///入库类别编码 + /// + [Description("入库类别编码")] + public string Crdcode { get; set; } + + /// + ///是否提交U8 + /// + [Description("是否提交U8")] + public string Is_u8 { get; set; } + + /// + ///批次 + /// + [Description("批次")] + public string Cbatch { get; set; } + + /// + ///添加人 + /// + [Description("添加人")] + public string Add_by { get; set; } + + + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/.config/dotnet-tools.json b/OpenAuth.WebApi/.config/dotnet-tools.json new file mode 100644 index 0000000000000000000000000000000000000000..ef95326cb8bc9cef98dc10269585cc484a8da30f --- /dev/null +++ b/OpenAuth.WebApi/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "9.0.9", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/Controllers/CheckController.cs b/OpenAuth.WebApi/Controllers/CheckController.cs index b4d18c73d8ae820970bcd8bf3fbfa68d028a2c77..75554c9b5f5e134f9fe58b418ed59102c1ac9e87 100644 --- a/OpenAuth.WebApi/Controllers/CheckController.cs +++ b/OpenAuth.WebApi/Controllers/CheckController.cs @@ -247,7 +247,38 @@ namespace OpenAuth.WebApi.Controllers var result = new Response>>(); try { - result.Data = _authStrategyContext.Modules.GenerateTree(u => u.Id, u => u.ParentId); + result.Data = _authStrategyContext.Modules.Where(u => !u.CascadeId.StartsWith(".0.23")).GenerateTree(u => u.Id, u => u.ParentId); + } + catch (CommonException ex) + { + if (ex.Code == Define.INVALID_TOKEN) + { + result.Code = ex.Code; + result.Message = ex.Message; + } + else + { + result.Code = 500; + result.Message = ex.InnerException != null + ? "OpenAuth.WebAPI数据库访问失败:" + ex.InnerException.Message + : "OpenAuth.WebAPI数据库访问失败:" + ex.Message; + } + + } + + return result; + } + + /// + /// 获取登录用户的所有可访问的 PDA 模块及菜单，以树状结构返回 + /// + [HttpGet] + public Response>> GetModulesPDATree() + { + var result = new Response>>(); + try + { + result.Data = _authStrategyContext.Modules.Where(u => u.CascadeId.StartsWith(".0.23")).GenerateTree(u => u.Id, u => u.ParentId); } catch (CommonException ex) { diff --git a/OpenAuth.WebApi/Controllers/StocksController.cs b/OpenAuth.WebApi/Controllers/StocksController.cs new file mode 100644 index 0000000000000000000000000000000000000000..7001e8466d94012be0043273123e8a1fc8834ac1 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/StocksController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 仓储接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "仓储接口_Stocks")] + public class StocksController : ControllerBase + { + private readonly StockApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdateStockReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdateStockReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]QueryStockListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public StocksController(StockApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/WmsInboundOrderDtblsController.cs b/OpenAuth.WebApi/Controllers/WmsInboundOrderDtblsController.cs index 9c1cca5bc6fbf69418c303b2e20e4ad2e8098c82..b820c131b89b3a2414751251b429815c8f810f2e 100644 --- a/OpenAuth.WebApi/Controllers/WmsInboundOrderDtblsController.cs +++ b/OpenAuth.WebApi/Controllers/WmsInboundOrderDtblsController.cs @@ -20,7 +20,7 @@ namespace OpenAuth.WebApi.Controllers { private readonly WmsInboundOrderDtblApp _app; - //获取详情 + //获取详情 CES [HttpGet] public Response Get(string id) { diff --git a/OpenAuth.WebApi/Controllers/base_customersController.cs b/OpenAuth.WebApi/Controllers/base_customersController.cs new file mode 100644 index 0000000000000000000000000000000000000000..f48b729a0b5f33a14f0ebd4780a572836c5cd566 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/base_customersController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 客户档案接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "客户档案接口_base_customers")] + public class base_customersController : ControllerBase + { + private readonly CustomerApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatebase_customerReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatebase_customerReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querybase_customerListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public base_customersController(CustomerApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/base_locationsController.cs b/OpenAuth.WebApi/Controllers/base_locationsController.cs new file mode 100644 index 0000000000000000000000000000000000000000..d01545503ef798ef2a868c9ef1223892057c6abc --- /dev/null +++ b/OpenAuth.WebApi/Controllers/base_locationsController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 库位档案接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "库位档案接口_base_locations")] + public class base_locationsController : ControllerBase + { + private readonly BaseLocationApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatebase_locationReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatebase_locationReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querybase_locationListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public base_locationsController(BaseLocationApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/base_parts_mastersController.cs b/OpenAuth.WebApi/Controllers/base_parts_mastersController.cs new file mode 100644 index 0000000000000000000000000000000000000000..13198a682772318efa447a0387bcb8aca5d96767 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/base_parts_mastersController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 存货档案接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "存货档案接口_base_parts_masters")] + public class base_parts_mastersController : ControllerBase + { + private readonly BasePartsApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatebase_parts_masterReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatebase_parts_masterReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querybase_parts_masterListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public base_parts_mastersController(BasePartsApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/base_sr_typesController.cs b/OpenAuth.WebApi/Controllers/base_sr_typesController.cs new file mode 100644 index 0000000000000000000000000000000000000000..6f2f7944fd5dbf05ac22329852bb49eab1bb24f9 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/base_sr_typesController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 收发类别接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "收发类别接口_base_sr_types")] + public class base_sr_typesController : ControllerBase + { + private readonly BaseSR _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatebase_sr_typeReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatebase_sr_typeReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querybase_sr_typeListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public base_sr_typesController(BaseSR app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/base_u8_depsController.cs b/OpenAuth.WebApi/Controllers/base_u8_depsController.cs new file mode 100644 index 0000000000000000000000000000000000000000..f5c02861347c22316e1ac749b01697a3a2dc4eaa --- /dev/null +++ b/OpenAuth.WebApi/Controllers/base_u8_depsController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// U8部门接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "U8部门接口_base_u8_deps")] + public class base_u8_depsController : ControllerBase + { + private readonly U8DepApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatebase_u8_depReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatebase_u8_depReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querybase_u8_depListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public base_u8_depsController(U8DepApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/base_warehousesController.cs b/OpenAuth.WebApi/Controllers/base_warehousesController.cs new file mode 100644 index 0000000000000000000000000000000000000000..5f82fac8fbf93e6cac3e44b818a51cefe27e3903 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/base_warehousesController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 仓库档案接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "仓库档案接口_base_warehouses")] + public class base_warehousesController : ControllerBase + { + private readonly BaseWarehouseApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatebase_warehouseReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatebase_warehouseReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querybase_warehouseListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public base_warehousesController(BaseWarehouseApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/wms_rk_infosController.cs b/OpenAuth.WebApi/Controllers/wms_rk_infosController.cs new file mode 100644 index 0000000000000000000000000000000000000000..b925a914324264a6bf5c15fcd4935ee0e9e13f00 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/wms_rk_infosController.cs @@ -0,0 +1,113 @@ +using System; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 其他出入库申请接口 + /// + [Route("api/[controller]/[action]")] + [ApiController] + [ApiExplorerSettings(GroupName = "其他出入库申请接口_wms_rk_infos")] + public class wms_rk_infosController : ControllerBase + { + private readonly OtherApplicationsApp _app; + + //获取详情 + [HttpGet] + public Response Get(string id) + { + var result = new Response(); + try + { + result.Data = _app.Get(id); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //添加 + [HttpPost] + public Response Add([FromBody]AddOrUpdatewms_rk_infoReq obj) + { + var result = new Response(); + try + { + _app.Add(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + //修改 + [HttpPost] + public Response Update([FromBody]AddOrUpdatewms_rk_infoReq obj) + { + var result = new Response(); + try + { + _app.Update(obj); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + /// + /// 加载列表 + /// + [HttpGet] + public async Task Load([FromQuery]Querywms_rk_infoListReq request) + { + return await _app.Load(request); + } + + /// + /// 批量删除 + /// + [HttpPost] + public Response Delete([FromBody]string[] ids) + { + var result = new Response(); + try + { + _app.Delete(ids); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + public wms_rk_infosController(OtherApplicationsApp app) + { + _app = app; + } + } +} diff --git a/OpenAuth.WebApi/OpenAuth.WebApi.csproj b/OpenAuth.WebApi/OpenAuth.WebApi.csproj index 264adb417555f41b2dec33536c8ba54e27535e82..e17c97a41f0dc9109a920da9337763b11b82658c 100644 --- a/OpenAuth.WebApi/OpenAuth.WebApi.csproj +++ b/OpenAuth.WebApi/OpenAuth.WebApi.csproj @@ -28,6 +28,7 @@ + diff --git a/OpenAuth.WebApi/appsettings.Production.json b/OpenAuth.WebApi/appsettings.Production.json index 92646a9f4599a91f8a14ab26847139e38ba7a689..e3fe7ebf0a6a4ae8b6827a6987d1b06ec93c998f 100644 --- a/OpenAuth.WebApi/appsettings.Production.json +++ b/OpenAuth.WebApi/appsettings.Production.json @@ -9,13 +9,16 @@ "AllowedHosts": "*", "DataProtection": "temp-keys/", "ConnectionStrings": { - "OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthpro;password=000000" //my sql + //"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthpro;password=000000", //my sql + "DBContext_102": "user id=MOM;password=mom$123456; data source=//172.16.103.248:1521/mes;Pooling=true;Min Pool Size=1" + //"DBContext_102": "server=127.0.0.1;user id=root;database=mom;password=123" //my sql + //"OpenAuthDBContext": "DATA SOURCE=172.16.103.248:1521/mes;PASSWORD=mom$123456;Validate Connection=true;PERSIST SECURITY INFO=True;USER ID=mom;" //Oracle }, "AppSetting": { - "IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 + "IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用 OAuth 认证 //"IdentityServerUrl": "http://demo.openauth.net.cn:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 "DbTypes": { - "OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL + "DBContext_102": "Oracle" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL }, "UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录 "RedisConf": "your_redis_server:6379,password=your_redis_password", //redis配置信息 diff --git a/OpenAuth.WebApi/appsettings.json b/OpenAuth.WebApi/appsettings.json index 68ed917d6e9787cb32bec4c97d5bd1f978059d18..238572d3c35c92a9c8fe9b4a7b7735ee36a2812e 100644 --- a/OpenAuth.WebApi/appsettings.json +++ b/OpenAuth.WebApi/appsettings.json @@ -7,7 +7,10 @@ "AllowedHosts": "*", "DataProtection": "temp-keys/", "ConnectionStrings": { - "OpenAuthDBContext": "Data Source=.;Encrypt=false;Initial Catalog=OpenAuthDB;User=sa;Password=000000" + + "DBContext_MariaDB_Test": "server=127.0.0.1;user id=root;database=mom;password=123", //my sql + "DBContext_102": "DATA SOURCE=172.16.103.248:1521/mes;PASSWORD=mom$123456;Validate Connection=true;PERSIST SECURITY INFO=True;USER ID=mom;" //Oracle + //"OpenAuthDBContext": "Data Source=.;Encrypt=false;Initial Catalog=OpenAuthDB;User=sa;Password=000000" //"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthdb;password=000000" //my sql //"OpenAuthDBContext": "Host=localhost;Port=5432;Database=OpenAuth;Username=postgres;Password=123;" //PostgreSQL //"OpenAuthDBContext2": "DATA SOURCE=192.168.0.118:1521/YUBAO;PASSWORD=000000;Validate Connection=true;PERSIST SECURITY INFO=True;USER ID=yubaolee;" //Oracle @@ -17,7 +20,8 @@ "IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 // "IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 "DbTypes": { - "OpenAuthDBContext": "SqlServer" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL + "DBContext_102": "Oracle", //数据库类型：SqlServer、MySql、Oracle、PostgreSQL + "DBContext_MariaDB_Test": "MySql" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL // "OpenAuthDBContext":"PostgreSQL" // ,"OpenAuthDBContext2":"Oracle" // ,"OpenAuthDBContext3":"MySql" diff --git a/Vue2/.env.dev b/Vue2/.env.dev index d20f133ecb2f6dca9aec979389102e37167879fa..c2cabdea9d06f080345abaf343fb0ce9465b8cdc 100644 --- a/Vue2/.env.dev +++ b/Vue2/.env.dev @@ -10,4 +10,6 @@ VUE_APP_OIDC_AUTOMATICSILENTRENEW = true VUE_APP_OIDC_SILENTREDIRECTURI = http://localhost:1803/silent-renew-oidc.html VUE_APP_BASE_API = http://localhost:52789/api -VUE_APP_BASE_IMG_URL = http://localhost:52789 \ No newline at end of file +VUE_APP_BASE_IMG_URL = http://localhost:52789 + +#VUE_APP_BASE_API = http://172.16.103.223:8010/api \ No newline at end of file diff --git a/Vue2/.env.prod b/Vue2/.env.prod index da66d5f3667cc93b7cde73e3c61031b2a5d03139..a66e3dde6092473921e4f5544de04d49debbfb73 100644 --- a/Vue2/.env.prod +++ b/Vue2/.env.prod @@ -9,5 +9,5 @@ VUE_APP_OIDC_SCOPE = openid profile openauthapi VUE_APP_OIDC_AUTOMATICSILENTRENEW = true VUE_APP_OIDC_SILENTREDIRECTURI = http://demo.openauth.net.cn:1803/silent-renew-oidc.html -VUE_APP_BASE_API = http://demo.openauth.net.cn:52789/api -VUE_APP_BASE_IMG_URL = demo.openauth.net.cn:52789 \ No newline at end of file +VUE_APP_BASE_API = http://172.16.103.223:8010/api +VUE_APP_BASE_IMG_URL = 172.16.103.223:52789 \ No newline at end of file diff --git a/Vue2/package.json b/Vue2/package.json index f3727547985ac13f5b0b08e9acee5b34099ec816..3cdcc4f94b037dd6bf53e5f17e51b923452ed263 100644 --- a/Vue2/package.json +++ b/Vue2/package.json @@ -12,12 +12,15 @@ "dependencies": { "@riophae/vue-treeselect": "0.0.36", "axios": "^0.19.0", + "chart.js": "^3.9.1", "core-js": "^3.6.4", "echarts": "3.8.5", "element-ui": "^2.10.1", + "font-awesome": "^4.7.0", "jquery": "^2.2.4", "js-cookie": "2.2.0", "jsplumb": "^2.12.8", + "moment": "^2.29.1", "normalize.css": "7.0.0", "nprogress": "0.2.0", "vue": "^2.6.11", @@ -33,8 +36,7 @@ "vue-router": "3.0.1", "vuedraggable": "^2.23.2", "vuex": "3.6.2", - "vuex-oidc": "^2.0.1", - "moment": "^2.29.1" + "vuex-oidc": "^2.0.1" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.3.0", diff --git a/Vue2/src/api/base_customers.js b/Vue2/src/api/base_customers.js new file mode 100644 index 0000000000000000000000000000000000000000..88c5eb11df80a0e442d4619a2c0ad4eb80114629 --- /dev/null +++ b/Vue2/src/api/base_customers.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/base_customers/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/base_customers/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/base_customers/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/base_customers/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/api/base_locations.js b/Vue2/src/api/base_locations.js new file mode 100644 index 0000000000000000000000000000000000000000..9a59106c36fb4f7567923eddcc4a7babd137554a --- /dev/null +++ b/Vue2/src/api/base_locations.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/base_locations/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/base_locations/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/base_locations/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/base_locations/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/api/base_parts_masters.js b/Vue2/src/api/base_parts_masters.js new file mode 100644 index 0000000000000000000000000000000000000000..907dd1063586bbd62073a01635a34bdc785d4365 --- /dev/null +++ b/Vue2/src/api/base_parts_masters.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/base_parts_masters/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/base_parts_masters/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/base_parts_masters/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/base_parts_masters/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/api/base_sr_types.js b/Vue2/src/api/base_sr_types.js new file mode 100644 index 0000000000000000000000000000000000000000..1512c73695dd5d93e56debd8ce11c4238c9c01d7 --- /dev/null +++ b/Vue2/src/api/base_sr_types.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/base_sr_types/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/base_sr_types/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/base_sr_types/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/base_sr_types/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/api/base_u8_deps.js b/Vue2/src/api/base_u8_deps.js new file mode 100644 index 0000000000000000000000000000000000000000..a5d975ed9219ede6a79b30fe6f5bcbe48fba5ddd --- /dev/null +++ b/Vue2/src/api/base_u8_deps.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/base_u8_deps/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/base_u8_deps/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/base_u8_deps/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/base_u8_deps/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/api/base_warehouses.js b/Vue2/src/api/base_warehouses.js new file mode 100644 index 0000000000000000000000000000000000000000..80a7f8e397a57e6fc9c820395b268d700849d163 --- /dev/null +++ b/Vue2/src/api/base_warehouses.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/base_warehouses/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/base_warehouses/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/base_warehouses/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/base_warehouses/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/api/dashboard.js b/Vue2/src/api/dashboard.js new file mode 100644 index 0000000000000000000000000000000000000000..ff1aafd0f0319366d614c901b08297cb9ea9d65f --- /dev/null +++ b/Vue2/src/api/dashboard.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' // 假设你的项目有封装好的axios + +// 获取生产统计数据 +export function getProductionStats(params) { + return request({ + url: '/api/mom/production/stats', + method: 'get', + params + }) +} + +// 获取设备状态 +export function getEquipmentStatus(params) { + return request({ + url: '/api/mom/equipment/status', + method: 'get', + params + }) +} + +// import { getProductionStats, getEquipmentStatus } from '@/api/mom' + +// export default { +// data() { +// return { +// stats: {}, // 初始化为空，后续接口填充 +// equipmentStatus: [], +// // ... 其他数据 +// } +// }, +// mounted() { +// // 调用接口获取数据 +// this.fetchData() +// // 初始化图表（保留） +// }, +// methods: { +// async fetchData() { +// const [statsRes, equipmentRes] = await Promise.all([ +// getProductionStats({ startDate: this.dateRange[0], endDate: this.dateRange[1] }), +// getEquipmentStatus() +// ]) +// this.stats = statsRes.data // 假设接口返回格式与静态数据一致 +// this.equipmentStatus = equipmentRes.data +// }, +// handleDateChange(val) { +// this.dateRange = val +// this.fetchData() // 日期变更时重新请求数据 +// } +// } +// } \ No newline at end of file diff --git a/Vue2/src/api/wms_rk_infos.js b/Vue2/src/api/wms_rk_infos.js new file mode 100644 index 0000000000000000000000000000000000000000..697a76e83098010019700e10c0ee1659a903cd98 --- /dev/null +++ b/Vue2/src/api/wms_rk_infos.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/wms_rk_infos/load', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: '/wms_rk_infos/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/wms_rk_infos/update', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/wms_rk_infos/delete', + method: 'post', + data + }) +} + diff --git a/Vue2/src/assets/logo.png b/Vue2/src/assets/logo.png index 6f6b5cda8ae43eac7017d340735ed1e6edbfbbd6..7aca5335813862bec3bc1f33222c7c80d5d37b7d 100644 Binary files a/Vue2/src/assets/logo.png and b/Vue2/src/assets/logo.png differ diff --git a/Vue2/src/components/Base/AuthTable.vue b/Vue2/src/components/Base/AuthTable.vue index 1e6a28093a5fcb037e456a345f38a370c2fb5032..7003731315dcff8b8cdb7583a0a7a2d5e31048b8 100644 --- a/Vue2/src/components/Base/AuthTable.vue +++ b/Vue2/src/components/Base/AuthTable.vue @@ -1,8 +1,25 @@ diff --git a/Vue2/src/views/dashboard/index.vue b/Vue2/src/views/dashboard/index.vue index 8fc6aa360249ef130b31e10923822a87aa8cff23..e2f6ece3e332e2603c3f5a6a9d25e65e08863387 100644 --- a/Vue2/src/views/dashboard/index.vue +++ b/Vue2/src/views/dashboard/index.vue @@ -1,19 +1,16 @@ + \ No newline at end of file diff --git a/Vue2/src/views/layout/components/Navbar.vue b/Vue2/src/views/layout/components/Navbar.vue index 8beb4675129971d3afc72ef76401f81de1eea8be..f154360a213f9a448ebb63481dff000cd3041949 100644 --- a/Vue2/src/views/layout/components/Navbar.vue +++ b/Vue2/src/views/layout/components/Navbar.vue @@ -9,7 +9,7 @@