From a2c4fc8a6bf0fec79ef7e44592dfdf93ffc1d422 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Mon, 9 Jan 2023 15:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Myshipping.Application/Myshipping.Application.xml | 7 ++++++-
.../BookingPrintTemplateService.cs | 5 ++++-
.../Service/DataSync/DataSyncService.cs | 12 ++++++------
.../Service/DataSync/Dto/DjyCustomerDto.cs | 5 ++++-
Myshipping.Core/Entity/DJY/DjyCustomer.cs | 5 +++++
Myshipping.Core/Entity/DJY/DjyVesselInfo.cs | 10 ++++++++++
Myshipping.Core/Myshipping.Core.xml | 15 +++++++++++++++
7 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index df5addbe..274d6c85 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -9646,7 +9646,7 @@
-
+
获取打印模板权限
@@ -9998,6 +9998,11 @@
主键
+
+
+ 东胜id
+
+
代码
diff --git a/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs b/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs
index 680eecb2..2f61728b 100644
--- a/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs
+++ b/Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs
@@ -396,7 +396,7 @@ namespace Myshipping.Application
///
///
[HttpGet("/BookingPrintTemplate/GetPrinttemplateRightList")]
- public async Task GetPrinttemplateRightList(long userId)
+ public async Task GetPrinttemplateRightList(long userId,string cateCode,string type)
{
var userlist = await _repUser.AsQueryable().Filter(null, true).ToListAsync();
var list = await _repRight.AsQueryable().InnerJoin((d, t) => d.PrintTemplateId == t.Id && t.TenantId == UserManager.TENANT_ID).
@@ -417,6 +417,9 @@ namespace Myshipping.Application
Type = t.Type,
UserName = "",
}).ToListAsync();
+
+ list = list.WhereIF(!string.IsNullOrWhiteSpace(cateCode), x => x.CateCode == cateCode).
+ WhereIF(!string.IsNullOrWhiteSpace(type), x => x.Type == type).ToList();
foreach (var item in list)
{
var username = userlist.Where(x => x.Id == item.SysUserId).Select(x => x.Name).FirstOrDefault();
diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs
index f32b1b2e..adf31687 100644
--- a/Myshipping.Application/Service/DataSync/DataSyncService.cs
+++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs
@@ -76,10 +76,10 @@ namespace Myshipping.Application
public async Task SyncCustomer(DjyCustomerSyncDto model)
{
- if (string.IsNullOrWhiteSpace(model.CodeName)) {
- throw Oops.Bah("请上传正确数据,Code未录入");
+ if (string.IsNullOrWhiteSpace(model.BSNO)) {
+ throw Oops.Bah("BSNO未录入");
}
- var m = await _djycustomer.Where(x => x.CodeName == model.CodeName).FirstAsync();
+ var m = await _djycustomer.Where(x => x.BSNO == model.BSNO).FirstAsync();
var entity = model.Adapt();
if (m == null)
{
@@ -115,11 +115,11 @@ namespace Myshipping.Application
public async Task SyncVesselDate(DjyVesselInfoDto model)
{
- if (string.IsNullOrWhiteSpace(model.Vessel)|| string.IsNullOrWhiteSpace(model.CARRIERID))
+ if (string.IsNullOrWhiteSpace(model.BSNO))
{
- throw Oops.Bah("请上传正确数据,船公司或船名未录入");
+ throw Oops.Bah("BSNO未录入");
}
- var m = await _vesselinfo.Where(x => x.Vessel==model.Vessel.ToUpper().Trim()&&x.CARRIERID==model.CARRIERID).FirstAsync();
+ var m = await _vesselinfo.Where(x => x.BSNO==model.BSNO).FirstAsync();
var entity = model.Adapt();
entity.Vessel = model.Vessel.ToUpper().Trim();
if (m == null)
diff --git a/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs b/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs
index 38ddd492..5836b419 100644
--- a/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs
+++ b/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs
@@ -13,7 +13,10 @@ namespace Myshipping.Application
/// 主键
///
public long? Id { get; set; }
-
+ ///
+ /// 东胜id
+ ///
+ public string BSNO { get; set; }
///
/// 代码
///
diff --git a/Myshipping.Core/Entity/DJY/DjyCustomer.cs b/Myshipping.Core/Entity/DJY/DjyCustomer.cs
index 6680aada..9ff90c17 100644
--- a/Myshipping.Core/Entity/DJY/DjyCustomer.cs
+++ b/Myshipping.Core/Entity/DJY/DjyCustomer.cs
@@ -136,5 +136,10 @@ namespace Myshipping.Core.Entity
/// 提单信息
///
public string TIDANINFO { get; set; }
+
+ ///
+ /// 东胜id
+ ///
+ public string BSNO { get; set; }
}
}
\ No newline at end of file
diff --git a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
index f2fb7bb4..13ed3dbc 100644
--- a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
+++ b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
@@ -84,6 +84,12 @@ namespace Myshipping.Application.Entity
/// 内部航次
///
public string VoynoInside { get; set; }
+
+
+ ///
+ /// 东胜id
+ ///
+ public string BSNO { get; set; }
}
@@ -91,6 +97,10 @@ namespace Myshipping.Application.Entity
public class DjyVesselInfoDto {
+ ///
+ /// 东胜id
+ ///
+ public string BSNO { get; set; }
public virtual long Id { get; set; }
///
/// 船名
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 8ea43033..2af87591 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -1809,6 +1809,11 @@
提单信息
+
+
+ 东胜id
+
+
@@ -17348,6 +17353,16 @@
内部航次
+
+
+ 东胜id
+
+
+
+
+ 东胜id
+
+
船名