wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重写点位业务的导入模块，修改重写在线开发接口的bug

Browse Source
This commit is contained in:
FanLian
2023-08-10 10:00:59 +08:00
parent 943cd5a0b2
commit 831a469617
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs
View File

@@ -63,7 +63,6 @@ namespace Tnb.WarehouseMgr
x.is_lock = 0; x.is_lock = 0;
x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}行的载具规格有误", 500); x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}行的载具规格有误", 500);
x.create_id = _userManager.UserId; x.create_id = _userManager.UserId;
x.create_time = DateTime.Now;
x.modify_id = null; x.modify_id = null;
x.modify_time = null; x.modify_time = null;
x.is_mix = 1; x.is_mix = 1;

1
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs
View File

@@ -91,7 +91,6 @@ namespace Tnb.WarehouseMgr
x.out_status = ((int)EnumOutStatus.正常).ToString(); x.out_status = ((int)EnumOutStatus.正常).ToString();
x.is_check = 1; x.is_check = 1;
x.create_id = _userManager.UserId; x.create_id = _userManager.UserId;
x.create_time = DateTime.Now;
x.modify_id = null; x.modify_id = null;
x.modify_time = null; x.modify_time = null;
}); });

50
WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Security; using JNPF.Common.Security;
using JNPF.FriendlyException; using JNPF.FriendlyException;
using JNPF.VisualDev; using JNPF.VisualDev;
@@ -16,11 +17,11 @@ using Tnb.WarehouseMgr.Entities;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
[OverideVisualDev(ModuleConsts.MODULE_WMSPOINT_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSPOINT_ID)]
public class WmsPointService: BaseWareHouseService public class WmsPointService : BaseWareHouseService
{ {
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
public WmsPointService(ISqlSugarRepository<WmsPointH> repository, IUserManager userManager) public WmsPointService(ISqlSugarRepository<WmsPointH> repository, IUserManager userManager)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
@@ -35,34 +36,39 @@ namespace Tnb.WarehouseMgr
List<Dictionary<string, object>> dics = input.list; List<Dictionary<string, object>> dics = input.list;
List<WmsPointH> points = new List<WmsPointH>(); List<WmsPointH> points = new List<WmsPointH>();
WmsPointH pt = new WmsPointH(); WmsPointH pt = new WmsPointH();
List<string> cCodes = new List<string>(); List<string> aCodes = new List<string>();
foreach (var d in dics) foreach (var d in dics)
{ {
var cCode = d["carrystd_id"].ToString() ?? string.Empty; var pCode = d["point_code"].ToString() ?? string.Empty;
if (cCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行载具规格不可为空", 500); var pName = d["point_name"].ToString() ?? string.Empty;
cCodes.Add(cCode); var aCode = d["area_code"].ToString() ?? string.Empty;
var floor = d["floor"].ToString() ?? string.Empty;
if (pCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行点位编号不可为空", 500);
if (pName == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行点位名称不可为空", 500);
if (aCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行管理区编号不可为空", 500);
if (floor == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行楼层不可为空", 500);
aCodes.Add(aCode);
d["create_time"] = DateTime.Now; d["create_time"] = DateTime.Now;
d.Remove("modify_time"); d.Remove("modify_time");
pt = d.Adapt<WmsPointH>(); pt = d.Adapt<WmsPointH>();
points.Add(pt); points.Add(pt);
} }
var carryStdDic = await _db.Queryable<WmsCarrystd>().Where(it => cCodes.Contains(it.carrystd_code)).ToDictionaryAsync(x => x.carrystd_code, x => x.id); var areas = await _db.Queryable<WmsAreaH>().Where(it => aCodes.Contains(it.code)).ToDictionaryAsync(x => x.code, x => x.id);
if (carryStdDic?.Count > 0) points.ForEach(x =>
{ {
points.ForEach(x => if (!areas.Keys.Contains(x.area_code)) throw new AppFriendlyException($"第{points.IndexOf(x) + 1}行的管理区编号有误", 500);
{ x.id = SnowflakeIdHelper.NextId();
x.org_id = _userManager.User.OrganizeId;
x.id = SnowflakeIdHelper.NextId(); x.is_lock = 0;
x.org_id = _userManager.User.OrganizeId; x.status = 1;
x.is_lock = 0; x.point_x = 0;
x.point_y = 0;
x.create_id = _userManager.UserId; x.point_z = 0;
x.create_time = DateTime.Now; x.area_id = areas[x.area_code].ToString() ?? throw new AppFriendlyException($"第{points.IndexOf(x) + 1}行的管理区编号编号有误", 500);
x.modify_id = null; x.create_id = _userManager.UserId;
x.modify_time = null; x.modify_id = null;
x.modify_time = null;
}); });
}
row = await _db.Insertable(points).ExecuteCommandAsync(); row = await _db.Insertable(points).ExecuteCommandAsync();
} }
catch (Exception ex) catch (Exception ex)

2
visualdev/Tnb.VisualDev/VisualDevModelDataService.cs
View File

@@ -798,7 +798,7 @@ namespace JNPF.VisualDev
{ {
VisualDevImportDataOutput result = new VisualDevImportDataOutput(); VisualDevImportDataOutput result = new VisualDevImportDataOutput();
var overideSvc = OverideVisualDevManager.GetOrDefault(modelId); var overideSvc = OverideVisualDevManager.GetOrDefault(modelId);
if (overideSvc != null && overideSvc.OverideFuncs.CreateAsync != null) if (overideSvc != null && overideSvc.OverideFuncs.ImportDataAsync != null)
{ {
await overideSvc.OverideFuncs.ImportDataAsync(list); await overideSvc.OverideFuncs.ImportDataAsync(list);
} }