chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

Browse Source
dev
cjy 2 months ago
parent 1d38ef6489 4266377560
commit 3ee59e2a29
12 changed files with 128 additions and 175 deletions
Show Stats Download Patch File Download Diff File

4
ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs
Unescape Escape View File

@ -1505,10 +1505,14 @@ public static class MultiLanguageConst
#region 关联任务 #region 关联任务
[Description("此任务已存在，请勿重复提交")] [Description("此任务已存在，请勿重复提交")]
public const string TaskExists = "Task_Exists"; public const string TaskExists = "Task_Exists";
[Description("未能找到任务")]
public const string TaskNotExists = "Task_Not_Exists";
[Description("此任务已完成")] [Description("此任务已完成")]
public const string TaskCompleted = "Task_Completed"; public const string TaskCompleted = "Task_Completed";
[Description("此任务已取消")] [Description("此任务已取消")]
public const string TaskCancelled = "Task_Cancelled"; public const string TaskCancelled = "Task_Cancelled";
[Description("任务数据与已提交数据条数不匹配")]
public const string TaskCountNotMatch = "Task_Count_Not_Match";
[Description("当前任务状态不支持此操作")] [Description("当前任务状态不支持此操作")]
public const string TaskStatusNotSupported = "Task_Status_Not_Supported"; public const string TaskStatusNotSupported = "Task_Status_Not_Supported";
[Description("当前任务状态不正确，无法提交审核")] [Description("当前任务状态不正确，无法提交审核")]

4
ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs
Unescape Escape View File

@ -563,7 +563,7 @@ namespace DS.WMS.Core.Fee.Method
}); });
if (!result.Succeeded) if (!result.Succeeded)
list.AddRange(fees.Where(x => ids.Contains(x.Id)).Select(x => x.FeeName)); list.Add(result.Message);
} }
else else
{ {
@ -583,7 +583,7 @@ namespace DS.WMS.Core.Fee.Method
} }
if (list.Count > 0) if (list.Count > 0)
return DataResult.Failed($"{MultiLanguageConst.Operation_Failed}：{string.Join("、", list)}"); return DataResult.Failed(string.Join("、", list));
} }
return DataResult.Success; return DataResult.Success;

177
ds-wms-service/DS.WMS.Core/Flow/Method/FlowRuntime.cs
Unescape Escape View File

@ -209,8 +209,6 @@ public class FlowRuntime
{ {
return ChildNodes.Where(x => x.Id == "end").First().Id; return ChildNodes.Where(x => x.Id == "end").First().Id;
} }
// return ChildNodes.Where(x => x.Pid == nodeId).First().Id; // return ChildNodes.Where(x => x.Pid == nodeId).First().Id;
} }
} }
@ -233,155 +231,66 @@ public class FlowRuntime
} }
else else
{ {
var conditions = conditionNodes[i].Conditions; var nodeSection = conditionNodes[i].Conditions;
var conditionalCollections = new List<ConditionalCollections>(); var list = new List<ConditionalCollections>();
if (conditions.LogicalOperator == "and") var conditionList = new List<KeyValuePair<WhereType, ConditionalModel>>(nodeSection.Conditions.Count);
{
var conditionList = new List<KeyValuePair<WhereType, ConditionalModel>>();
foreach (var item in conditions.Conditions)
{
conditionList.Add(new KeyValuePair<WhereType, ConditionalModel>
(WhereType.And,
new ConditionalModel
{
FieldName = item.Field,
ConditionalType = GetConditionalType(item.Operator),
FieldValue = item.Value
})
);
}
if (conditionList.Count > 0) var whereType = Enum.Parse<WhereType>(nodeSection.LogicalOperator, true);
{ foreach (var item in nodeSection.Conditions)
conditionalCollections.Add(new ConditionalCollections {
{ conditionList.Add(new KeyValuePair<WhereType, ConditionalModel>
ConditionalList = conditionList (whereType,
} new ConditionalModel
)
;
}
var groupList = new List<KeyValuePair<WhereType, ConditionalModel>>();
foreach (var group in conditions.Groups)
{
if (group.LogicalOperator == "and")
{
foreach (var item1 in group.Conditions)
{
groupList.Add(new KeyValuePair<WhereType, ConditionalModel>
(WhereType.And,
new ConditionalModel
{
FieldName = item1.Field,
ConditionalType = GetConditionalType(item1.Operator),
FieldValue = item1.Value
})
);
}
}
else
{
foreach (var item1 in group.Conditions)
{ {
groupList.Add(new KeyValuePair<WhereType, ConditionalModel> FieldName = item.Field,
(WhereType.Or, ConditionalType = GetConditionalType(item.Operator),
new ConditionalModel FieldValue = item.Value
{ })
FieldName = item1.Field, );
ConditionalType = GetConditionalType(item1.Operator), }
FieldValue = item1.Value
})
);
}
}
}
if (groupList.Count > 0) if (conditionList.Count > 0)
{
list.Add(new ConditionalCollections
{ {
conditionalCollections.Add(new ConditionalCollections ConditionalList = conditionList
{ });
ConditionalList = groupList
}
)
;
}
} }
else
var groupList = new List<KeyValuePair<WhereType, ConditionalModel>>();
foreach (var group in nodeSection.Groups)
{ {
var conditionList = new List<KeyValuePair<WhereType, ConditionalModel>>(); WhereType whereType2 = Enum.Parse<WhereType>(group.LogicalOperator, true);
foreach (var item in conditions.Conditions) for (int j = 0; j < group.Conditions.Count; j++)
{ {
conditionList.Add(new KeyValuePair<WhereType, ConditionalModel> var item1 = group.Conditions[j];
(WhereType.Or, groupList.Add(new KeyValuePair<WhereType, ConditionalModel>
(j == 0 ? whereType : whereType2,
new ConditionalModel new ConditionalModel
{ {
FieldName = item.Field, FieldName = item1.Field,
ConditionalType = GetConditionalType(item.Operator), ConditionalType = GetConditionalType(item1.Operator),
FieldValue = item.Value FieldValue = item1.Value
}) })
); );
} }
}
if (conditionList.Count > 0) if (groupList.Count > 0)
{ {
conditionalCollections.Add(new ConditionalCollections list.Add(new ConditionalCollections
{
ConditionalList = conditionList
}
)
;
}
var groupList = new List<KeyValuePair<WhereType, ConditionalModel>>();
foreach (var group in conditions.Groups)
{
if (group.LogicalOperator == "and")
{
foreach (var item1 in group.Conditions)
{
groupList.Add(new KeyValuePair<WhereType, ConditionalModel>
(WhereType.And,
new ConditionalModel
{
FieldName = item1.Field,
ConditionalType = GetConditionalType(item1.Operator),
FieldValue = item1.Value
})
);
}
}
else
{
foreach (var item1 in group.Conditions)
{
groupList.Add(new KeyValuePair<WhereType, ConditionalModel>
(WhereType.Or,
new ConditionalModel
{
FieldName = item1.Field,
ConditionalType = GetConditionalType(item1.Operator),
FieldValue = item1.Value
})
);
}
}
}
if (groupList.Count > 0)
{ {
conditionalCollections.Add(new ConditionalCollections ConditionalList = groupList
{ });
ConditionalList = groupList
}
)
;
}
} }
var conditionalModels = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(JsonConvert.SerializeObject(conditionalCollections)); if (list.Count == 0) //跳过默认条件
if (conditionalModels.Count == 0) //跳过默认条件
continue; continue;
//string json = JsonConvert.SerializeObject(list);
//db.Utilities.JsonToConditionalModels(json);
List<IConditionalModel> conditionalModels = [.. list];
ISqlSugarClient sugarClient = tenantDb ?? db; ISqlSugarClient sugarClient = tenantDb ?? db;
var exists = sugarClient.Queryable<object>().AS(ColumnView).Where("Id=@Id", new { Id = BusinessId }).Where(conditionalModels).Any(); var exists = sugarClient.Queryable<object>().AS(ColumnView).Where("Id=@Id", new { Id = BusinessId }).Where(conditionalModels).Any();
if (exists) if (exists)
@ -414,7 +323,7 @@ public class FlowRuntime
return ChildNodes.Where(x => x.Id == childId).First(); //下一个节点 return ChildNodes.Where(x => x.Id == childId).First(); //下一个节点
} }
//todo:前端组织JSON结构有误，加入临时修复代码，待前端改正后移除 //todo:前端组织JSON结构有误，加入临时修复代码，待前端改正后移除
else if (nextChild.Type == null) else if (nextChild.Type == null)
{ {
nextChild.Id = nextChild.Type = FlowChild.END; nextChild.Id = nextChild.Type = FlowChild.END;
nextChild.Name = "结束"; nextChild.Name = "结束";

2
ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs
Unescape Escape View File

@ -197,7 +197,7 @@ public class ClientInfoRes
/// <summary> /// <summary>
/// 审批意见 /// 审批意见
/// </summary> /// </summary>
public string AuditNote { get; set; } public string? AuditNote { get; set; }
/// <summary> /// <summary>
/// Desc:默认付费方式 /// Desc:默认付费方式

6
ds-wms-service/DS.WMS.Core/Info/Interface/IClientInfoService.cs
Unescape Escape View File

@ -58,14 +58,14 @@ public interface IClientInfoService
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
Task<DataResult> EditClientInfoAsync(ClientInfoReq model); Task<DataResult> EditAsync(ClientInfoReq model);
/// <summary> /// <summary>
/// 获取详情 /// 获取详情
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
DataResult<ClientInfoRes> GetClientInfo(string id); Task<DataResult<ClientInfoRes>> GetAsync(string id);
/// <summary> /// <summary>
/// 批量删除发票抬头 /// 批量删除发票抬头

20
ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs
Unescape Escape View File

@ -275,13 +275,15 @@ public class ClientInfoService : ServiceBase, IClientInfoService
if (request.OtherQueryCondition?.ClientTag != null) if (request.OtherQueryCondition?.ClientTag != null)
{ {
//合并到主查询条件
var props = Array.FindAll(request.OtherQueryCondition.ClientTag.GetType().GetProperties(), x => x.Name.StartsWith("Is") && x.PropertyType == typeof(bool)); var props = Array.FindAll(request.OtherQueryCondition.ClientTag.GetType().GetProperties(), x => x.Name.StartsWith("Is") && x.PropertyType == typeof(bool));
List<IConditionalModel> list = [];
foreach (var prop in props) foreach (var prop in props)
{ {
object val = prop.Get(request.OtherQueryCondition.ClientTag); object val = prop.Get(request.OtherQueryCondition.ClientTag);
if (val != null && val is bool value && value) if (val != null && val is bool value && value)
{ {
whereList.Add(new ConditionalModel list.Add(new ConditionalModel
{ {
ConditionalType = ConditionalType.Equal, ConditionalType = ConditionalType.Equal,
FieldName = "ct." + prop.Name, FieldName = "ct." + prop.Name,
@ -289,6 +291,8 @@ public class ClientInfoService : ServiceBase, IClientInfoService
}); });
} }
} }
query = query.Where(list);
} }
var result = await query.Select((c, c1, c2, ct) => new ClientInfoRes var result = await query.Select((c, c1, c2, ct) => new ClientInfoRes
@ -357,7 +361,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
/// </summary> /// </summary>
/// <param name="req"></param> /// <param name="req"></param>
/// <returns></returns> /// <returns></returns>
public async Task<DataResult> EditClientInfoAsync(ClientInfoReq req) public async Task<DataResult> EditAsync(ClientInfoReq req)
{ {
var data = req.Adapt<InfoClient>(); var data = req.Adapt<InfoClient>();
data.Status = (int)StatusEnum.Disable; data.Status = (int)StatusEnum.Disable;
@ -417,22 +421,22 @@ public class ClientInfoService : ServiceBase, IClientInfoService
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
public DataResult<ClientInfoRes> GetClientInfo(string id) public async Task<DataResult<ClientInfoRes>> GetAsync(string id)
{ {
var entity = TenantDb.Queryable<InfoClient>() var entity = await TenantDb.Queryable<InfoClient>()
.Where(a => a.Id == long.Parse(id)) .Where(a => a.Id == long.Parse(id))
.First(); .FirstAsync();
if (entity == null) if (entity == null)
return DataResult<ClientInfoRes>.Success(null); return DataResult<ClientInfoRes>.Success(null);
var data = entity.Adapt<ClientInfoRes>(); var data = entity.Adapt<ClientInfoRes>();
data.ServiceItemCodes = entity.ServiceItem?.Split(',', StringSplitOptions.RemoveEmptyEntries); data.ServiceItemCodes = entity.ServiceItem?.Split(',', StringSplitOptions.RemoveEmptyEntries);
var tag = TenantDb.Queryable<InfoClientTag>().Select<ClientTagRes>() var tag = await TenantDb.Queryable<InfoClientTag>().Select<ClientTagRes>()
.First(a => a.ClientId == long.Parse(id)); .FirstAsync(a => a.ClientId == long.Parse(id));
data.ClientTag = tag; data.ClientTag = tag;
data.InvoiceHeaders ??= TenantDb.Queryable<InvoiceHeader>().Where(x => x.RelativeId == data.Id).ToList(); data.InvoiceHeaders ??= await TenantDb.Queryable<InvoiceHeader>().Where(x => x.RelativeId == data.Id).ToListAsync();
return DataResult<ClientInfoRes>.Success(data, MultiLanguageConst.DataQuerySuccess); return DataResult<ClientInfoRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
} }

43
ds-wms-service/DS.WMS.Core/Op/EDI/YTEdiHelper.cs
Unescape Escape View File

@ -854,8 +854,9 @@ namespace DS.WMS.Core.Op.EDI
r.WriteLine("03:" + ISSUETYPE + ":" + bill.ISSUEPLACEID.Trim() + ":" + bill.ISSUEPLACE.Trim() + ":" + GetDateStr(bill.ISSUEDATE, "yyyyMMdd") + ":" + GetBillNum2(bill.NOBILL) + ":" + bill.PREPARDAT + ":" + bill.PAYABLEAT + "'"); r.WriteLine("03:" + ISSUETYPE + ":" + bill.ISSUEPLACEID.Trim() + ":" + bill.ISSUEPLACE.Trim() + ":" + GetDateStr(bill.ISSUEDATE, "yyyyMMdd") + ":" + GetBillNum2(bill.NOBILL) + ":" + bill.PREPARDAT + ":" + bill.PAYABLEAT + "'");
icount++; icount++;
//2024-09-13 参考韩工东胜7去掉ETD
r.WriteLine("11:" + bill.VESSELID + ":" + bill.VESSEL + ":" + bill.VOYNO + ":::::" + GetDateStr(bill.ETD, "yyyyMMdd") + ":::::'"); //r.WriteLine("11:" + bill.VESSELID + ":" + bill.VESSEL + ":" + bill.VOYNO + ":::::" + GetDateStr(bill.ETD, "yyyyMMdd") + ":::::'");
r.WriteLine("11:" + bill.VESSELID + ":" + bill.VESSEL + ":" + bill.VOYNO + "::::::::::'");
icount++; icount++;
var DESTINATIONID = bill.DESTINATIONID; var DESTINATIONID = bill.DESTINATIONID;
@ -917,7 +918,8 @@ namespace DS.WMS.Core.Op.EDI
if (ShippingList.Count != 0 && Shipping.Length > 0) if (ShippingList.Count != 0 && Shipping.Length > 0)
{ {
r.WriteLine("20::" + formatListStr(ShippingList, 6) + "'"); //2024-09-13 韩工确认最大行数6改为9
r.WriteLine("20::" + formatListStr(ShippingList, 9) + "'");
icount = icount + 1; icount = icount + 1;
} }
@ -929,7 +931,8 @@ namespace DS.WMS.Core.Op.EDI
if (ShippingList.Count != 0 && Shipping.Length > 0) if (ShippingList.Count != 0 && Shipping.Length > 0)
{ {
r.WriteLine("21::" + formatListStr(ShippingList, 6) + "'"); //2024-09-13 韩工确认最大行数6改为9
r.WriteLine("21::" + formatListStr(ShippingList, 9) + "'");
icount = icount + 1; icount = icount + 1;
} }
@ -940,7 +943,8 @@ namespace DS.WMS.Core.Op.EDI
if (ShippingList.Count != 0 && Shipping.Length > 0) if (ShippingList.Count != 0 && Shipping.Length > 0)
{ {
r.WriteLine("22::" + formatListStr(ShippingList, 6) + "'"); //2024-09-13 韩工确认最大行数6改为9
r.WriteLine("22::" + formatListStr(ShippingList, 9) + "'");
icount = icount + 1; icount = icount + 1;
} }
@ -989,17 +993,23 @@ namespace DS.WMS.Core.Op.EDI
if (kingweight == 0) if (kingweight == 0)
kingweight = 100; kingweight = 100;
r.WriteLine("41:1:" + bill.HSCODE + ":" + cargoid + ":" + bill.PKGS.ToString() + ":" + bill.KINDPKGS_EDI_CODE + ":" + bill.KINDPKGS + ":" + kingweight.ToString("0.###") + ":" r.WriteLine("41:1:" + bill.HSCODE + ":" + cargoid + ":" + bill.PKGS.ToString() + ":" + bill.KINDPKGS_EDI_CODE + ":" + bill.KINDPKGS + ":" + kingweight.ToString() + ":"
+ bill.CBM.ToString("0.###") + "::::::" + bill.KGS.ToString("0.###") + ":::'"); + bill.CBM.ToString() + "::::::" + bill.KGS.ToString() + ":::'");
icount = icount + 1; icount = icount + 1;
if (cargoid == "R") if (cargoid == "R")
{
r.WriteLine("43::::::::::" + bill.REEFERF + ":C:" + bill.TEMPSET + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'"); r.WriteLine("43::::::::::" + bill.REEFERF + ":C:" + bill.TEMPSET + ":" + bill.TEMPMIN + ":" + bill.TEMPMAX + ":::::'");
icount = icount + 1;
}
else if (cargoid == "D") else if (cargoid == "D")
{
r.WriteLine("43:" + bill.DCLASS + ":" + bill.DPAGE + ":" + bill.DUNNO + ":" + bill.DLABEL + "::::::::::::'"); r.WriteLine("43:" + bill.DCLASS + ":" + bill.DPAGE + ":" + bill.DUNNO + ":" + bill.DLABEL + "::::::::::::'");
icount = icount + 1; icount = icount + 1;
}
Shipping = formatEdiStr("txt", bill.MARKS); Shipping = formatEdiStr("txt", bill.MARKS);
ShippingList = formatlengthStr(Shipping, 35); ShippingList = formatlengthStr(Shipping, 35);
@ -1131,7 +1141,7 @@ namespace DS.WMS.Core.Op.EDI
if (InttrEdi.filetype == "E") if (InttrEdi.filetype == "E")
{ {
r.WriteLine("51:" + ctn.CNTRNO + ":" + ctn.CTNALLCODE + ":" r.WriteLine("51:" + ctn.CNTRNO + ":" + ctn.CTNALLCODE + ":"
+ ctn.SEALNO + ":" + ctn.PKGS.ToString() + ":" + ctn.KGS.ToString("0.###") + "::" + ctn.CBM.ToString("0.###") + ":" + bill.EDIATTNEMAIL + "'"); + ctn.SEALNO + ":" + ctn.PKGS.ToString() + ":" + ctn.KGS.ToString() + "::" + ctn.CBM.ToString() + ":" + bill.EDIATTNEMAIL + "'");
icount = icount + 1; icount = icount + 1;
if (bill.CTNGOODSLIST != null && bill.CTNGOODSLIST.Count != 0) if (bill.CTNGOODSLIST != null && bill.CTNGOODSLIST.Count != 0)
@ -1139,7 +1149,7 @@ namespace DS.WMS.Core.Op.EDI
foreach (var ctnhs in bill.CTNGOODSLIST) foreach (var ctnhs in bill.CTNGOODSLIST)
{ {
r.WriteLine("53:" + ctnhs.HSCODE + ":" + ctnhs.PKGS.ToString() + ":" r.WriteLine("53:" + ctnhs.HSCODE + ":" + ctnhs.PKGS.ToString() + ":"
+ ctnhs.KGS.ToString("0.###") + ":" + ctnhs.CBM.ToString("0.###") + ":" + ctnhs.KINDPKGS_EDI_CODE + ":" + ctnhs.KINDPKGS + "'"); + ctnhs.KGS.ToString() + ":" + ctnhs.CBM.ToString() + ":" + ctnhs.KINDPKGS_EDI_CODE + ":" + ctnhs.KINDPKGS + "'");
icount = icount + 1; icount = icount + 1;
Shipping = formatEdiStr("txt", ctnhs.DESCRIPTION); Shipping = formatEdiStr("txt", ctnhs.DESCRIPTION);
ShippingList = formatlengthStr(Shipping, 70); ShippingList = formatlengthStr(Shipping, 70);
@ -1183,13 +1193,20 @@ namespace DS.WMS.Core.Op.EDI
} }
} }
else
{
r.WriteLine("53:" + bill.HSCODE + ":" + ctn.PKGS.ToString() + ":"
+ ctn.KGS.ToString() + ":" + ctn.CBM.ToString() + ":" + ctn.KINDPKGS_EDI_CODE + ":" + ctn.KINDPKGS + "'");
icount = icount + 1;
}
} }
else else
{ {
if (!string.IsNullOrEmpty(ctn.CNTRNO)) if (!string.IsNullOrEmpty(ctn.CNTRNO))
{ {
r.WriteLine("51:" + ctn.CNTRNO + ":" + ctn.CTNALLCODE + ":" r.WriteLine("51:" + ctn.CNTRNO + ":" + ctn.CTNALLCODE + ":"
+ ctn.SEALNO + ":" + ctn.PKGS.ToString() + ":" + ctn.KGS.ToString("0.###") + ":'"); + ctn.SEALNO + ":" + ctn.PKGS.ToString() + ":" + ctn.KGS.ToString() + ":'");
icount = icount + 1; icount = icount + 1;
} }
} }
@ -1198,7 +1215,7 @@ namespace DS.WMS.Core.Op.EDI
} }
icount = icount + 1; //icount = icount + 1;
r.WriteLine("99:" + icount.ToString() + "'"); r.WriteLine("99:" + icount.ToString() + "'");
r.Close(); r.Close();
f.Close(); f.Close();

27
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs
Unescape Escape View File

@ -1517,7 +1517,7 @@ namespace DS.WMS.Core.Op.Method
primaryModel.EDIATTNEMAIL = ediExtModel.EDIAttnMail; primaryModel.EDIATTNEMAIL = ediExtModel.EDIAttnMail;
if (string.IsNullOrWhiteSpace(primaryModel.EDIATTNEMAIL) && ediRouteEnum != EDIRouteEnum.YT) if (string.IsNullOrWhiteSpace(primaryModel.EDIATTNEMAIL))
{ {
primaryModel.EDIATTNEMAIL = ftpSet.SendEmail; primaryModel.EDIATTNEMAIL = ftpSet.SendEmail;
} }
@ -1599,7 +1599,7 @@ namespace DS.WMS.Core.Op.Method
//TODO 转换 //TODO 转换
var contaModel = conta.Adapt<SeaExportCtnEDIBaseModel>(); var contaModel = conta.Adapt<SeaExportCtnEDIBaseModel>();
var mapCtnRlt = GetCtnEDICode(conta.CtnCode, codeCtnList, mapCtnList, order.CarrierId, CONST_MAPPING_MODULE, conta.CtnAll); var mapCtnRlt = GetCtnEDICode(conta.CtnCode, codeCtnList, mapCtnList, order.CarrierId, CONST_MAPPING_MODULE, conta.CtnAll, ediRouteEnum);
if (mapCtnRlt.Succeeded) if (mapCtnRlt.Succeeded)
{ {
@ -2576,7 +2576,8 @@ namespace DS.WMS.Core.Op.Method
/// <param name="moduleName">模块代码</param> /// <param name="moduleName">模块代码</param>
/// <param name="ctnName">集装箱名称</param> /// <param name="ctnName">集装箱名称</param>
/// <returns></returns> /// <returns></returns>
private DataResult<string> GetCtnEDICode(string ctnCode, List<CodeCtn> codeCtnList, List<MappingCtn> mapCtnList, long carrierId, string moduleName, string ctnName) private DataResult<string> GetCtnEDICode(string ctnCode, List<CodeCtn> codeCtnList, List<MappingCtn> mapCtnList, long carrierId, string moduleName
, string ctnName, EDIRouteEnum ediRouteEnum)
{ {
CodeCtn codeCtnInfo = null; CodeCtn codeCtnInfo = null;
@ -2612,9 +2613,25 @@ namespace DS.WMS.Core.Op.Method
return DataResult<string>.FailedData(edi); return DataResult<string>.FailedData(edi);
} }
var mapCtnInfo = tenantDb.Queryable<MappingCtn>() MappingCtn mapCtnInfo = null;
.First(a => a.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) && a.CarrierId == carrierId && a.LinkId == codeCtnInfo.Id);
//如果是亿通需要读映射表，如果映射表没配置则提示错误
if(ediRouteEnum == EDIRouteEnum.YT)
{
mapCtnInfo = tenantDb.Queryable<MappingCtn>()
.First(a => a.Module.Equals("BOOK_OR_CLOSING_YT", StringComparison.OrdinalIgnoreCase) && a.CarrierId == carrierId && a.LinkId == codeCtnInfo.Id);
if (mapCtnInfo == null)
{
throw new Exception($"集装箱型 {ctnName} 未配置订舱或截单EDT（亿通）的映射代码未找到");
}
}
else
{
mapCtnInfo = tenantDb.Queryable<MappingCtn>()
.First(a => a.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase) && a.CarrierId == carrierId && a.LinkId == codeCtnInfo.Id);
}
if (mapCtnInfo != null) if (mapCtnInfo != null)
{ {
mapCtnList.Add(mapCtnInfo); mapCtnList.Add(mapCtnInfo);

9
ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs
Unescape Escape View File

@ -163,8 +163,9 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
if (strList.Count == 0) if (strList.Count == 0)
return DataResult.Success; return DataResult.Success;
return DataResult.Failed(string.Format(MultiLanguageConst.OrderTaskSubmitted, string.Join("、", strList))); return DataResult.Failed(string.Format(
MultiLanguageConst.GetDescription(MultiLanguageConst.OrderTaskSubmitted), string.Join("、", strList)));
} }
/// <summary> /// <summary>
@ -737,7 +738,9 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
var tasks = await TenantDb.Queryable<BusinessTask>().Where(x => x.TaskType == request.TaskType && request.Ids.Contains(x.BusinessId)) var tasks = await TenantDb.Queryable<BusinessTask>().Where(x => x.TaskType == request.TaskType && request.Ids.Contains(x.BusinessId))
.WhereIF(request.BusinessType.HasValue, x => x.BusinessType == request.BusinessType.Value).ToListAsync(); .WhereIF(request.BusinessType.HasValue, x => x.BusinessType == request.BusinessType.Value).ToListAsync();
if (tasks.Count == 0) if (tasks.Count == 0)
return DataResult.FailedWithDesc(nameof(MultiLanguageConst.EmptyData)); return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskNotExists));
if (tasks.Count != request.Ids.Length)
return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskCountNotMatch));
if (tasks.Exists(x => x.TaskStatus == TaskStatusEnum.Complete)) if (tasks.Exists(x => x.TaskStatus == TaskStatusEnum.Complete))
{ {

2
ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
Unescape Escape View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl> <_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl>
<History>True|2024-09-13T02:44:56.1241214Z||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;</History> <History>True|2024-09-13T06:31:12.4598160Z||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

7
ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs
Unescape Escape View File

@ -110,7 +110,7 @@ public class ClientInfoController : ApiController
[HttpPost, Route("EditClientInfo")] [HttpPost, Route("EditClientInfo")]
public async Task<DataResult> EditClientInfoAsync([FromBody] ClientInfoReq req) public async Task<DataResult> EditClientInfoAsync([FromBody] ClientInfoReq req)
{ {
var res = await _invokeService.EditClientInfoAsync(req); var res = await _invokeService.EditAsync(req);
return res; return res;
} }
@ -121,10 +121,9 @@ public class ClientInfoController : ApiController
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("GetClientInfo")] [Route("GetClientInfo")]
public DataResult<ClientInfoRes> GetClientInfo([FromQuery] string id) public async Task<DataResult<ClientInfoRes>> GetClientInfoAsync([FromQuery] string id)
{ {
var res = _invokeService.GetClientInfo(id); return await _invokeService.GetAsync(id);
return res;
} }
/// <summary> /// <summary>

2
ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<NameOfLastUsedPublishProfile>D:\Code\ds8-solution-pro\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup> </PropertyGroup>

Write Preview
Loading…
Cancel
Save