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
usertest
zhangxiaofeng 4 months ago
parent 390d919ce0 59787eb658
commit 21e5f9b7a6
6 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -141,7 +141,25 @@ namespace DS.WMS.Core.Op.Method
stream.Position = 0;
//将内存流转成List集合
var list = await stream.QueryAsync<BookingStatusConfigExcelReq>();
var configs = list.Adapt<BookingGoodsStatusConfig>();
var configs = new List<BookingGoodsStatusConfig>();
foreach (var item in list)
{
var config = new BookingGoodsStatusConfig()
{
SystemCode = item.SystemCode,
StatusName = item.StatusName,
StatusColor = item.StatusColor,
Note = item.Note,
OrderNo = item.OrderNo,
};
configs.Add(config);
}
var codes = configs.Select(c => c.SystemCode).ToList();
if (tenantDb.Queryable<BookingGoodsStatusConfig>().Where(x=> codes.Contains(x.SystemCode)).Any()) {
return DataResult<string>.Failed("存在已有的系统编码,请检查");
}
//var configs = list.Adapt<BookingGoodsStatusConfig>();
await tenantDb.Insertable(configs).ExecuteCommandAsync();
return await Task.FromResult(DataResult<string>.Failed("导入成功!", MultiLanguageConst.DataImportSuccess));

5
ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
Unescape Escape View File

@ -867,7 +867,8 @@ namespace DS.WMS.Core.Op.Method
DataObj = new BookingSlotBaseApiSaveDto
{
CarrierId = carrierInfo?.LinkId,
CarrierCode = carrierInfo?.Code,
CarrierCode = carrierInfo?.MapCode,
Carrier = carrierInfo?.MapName,
SlotBookingNo = taskBCInfoDto.MBLNo,
BookingParty = taskBCInfoDto.BookingParty,
BookingSlotType = taskBCInfoDto.BookingSlotType,
@ -893,7 +894,7 @@ namespace DS.WMS.Core.Op.Method
PortDischarge = taskBCInfoDto.PortDischarge,
PortLoad = taskBCInfoDto.Portload,
SICutDate = taskBCInfoDto.SICutDate,
//CustomSICutDate = taskBCInfoDto.CustomSICutDate,
CustomSICutDate = taskBCInfoDto.CustomSICutDate,
TransferPort1 = taskBCInfoDto.TransferPort1,
TransferPort2 = taskBCInfoDto.TransferPort2,
PriceCalculationDate = taskBCInfoDto.PriceCalculationDate,

5
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderBCInfo.cs
Unescape Escape View File

@ -396,6 +396,11 @@ namespace DS.WMS.Core.TaskPlat.Dtos
/// 货物标志
/// </summary>
public string CARGOID { get; set; }
/// <summary>
/// 客户样单截止日期
/// </summary>
public Nullable<DateTime> CustomSICutDate { get; set; }
}

6
ds-wms-service/DS.WMS.OpApi/Controllers/DjyServiceStatusController.cs
Unescape Escape View File

@ -100,10 +100,10 @@ namespace DS.WMS.OpApi.Controllers
}
/// <summary>
/// 取消服务状态
/// 获取可用的服务项目字典列表
/// </summary>
/// <param name="req"></param>
/// <returns>返回回执</returns>
/// <param name="isAvoidCache">是否重新加载缓存</param>
/// <returns></returns>
[HttpGet]
[Route("GetEnableProjectDictTreeList")]
public async Task<DjyResult> GetEnableProjectDictTreeList([FromQuery] bool isAvoidCache = false)

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

@ -6,7 +6,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi</_PublishTargetUrl>
<History>True|2024-07-24T10:28:12.1752469Z||;True|2024-07-24T18:11:54.2105215+08:00||;True|2024-07-24T18:10:14.9409342+08:00||;True|2024-07-24T17:52:10.3966338+08:00||;True|2024-07-24T16:01:13.8217949+08:00||;True|2024-07-24T15:56:15.7589616+08:00||;True|2024-07-24T15:38:29.2442086+08:00||;True|2024-07-24T14:48:12.2303919+08:00||;True|2024-07-24T14:18:05.5309704+08:00||;True|2024-07-24T12:56:48.1663545+08:00||;True|2024-07-24T08:47:26.1616069+08:00||;True|2024-07-24T08:42:02.7606608+08:00||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
<History>True|2024-07-24T11:25:58.0077671Z||;True|2024-07-24T18:28:12.1752469+08:00||;True|2024-07-24T18:11:54.2105215+08:00||;True|2024-07-24T18:10:14.9409342+08:00||;True|2024-07-24T17:52:10.3966338+08:00||;True|2024-07-24T16:01:13.8217949+08:00||;True|2024-07-24T15:56:15.7589616+08:00||;True|2024-07-24T15:38:29.2442086+08:00||;True|2024-07-24T14:48:12.2303919+08:00||;True|2024-07-24T14:18:05.5309704+08:00||;True|2024-07-24T12:56:48.1663545+08:00||;True|2024-07-24T08:47:26.1616069+08:00||;True|2024-07-24T08:42:02.7606608+08:00||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

6
ds-wms-service/DS.WMS.PrintApi/Model/PrintDataResult.cs
Unescape Escape View File

@ -5,7 +5,7 @@
/// <summary>
/// 是否成功
/// </summary>
public bool Successed { get; set; }
public bool Succeeded { get; set; }
/// <summary>
/// 返回消息
@ -26,7 +26,7 @@
{
return new PrintDataResult()
{
Successed = false,
Succeeded = false,
Message = message
};
}
@ -35,7 +35,7 @@
{
return new PrintDataResult()
{
Successed = true,
Succeeded = true,
Data = data
};
}

Write Preview
Loading…
Cancel
Save