diff --git a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
index 33962ac3..99a9001b 100644
--- a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
@@ -52,7 +52,7 @@ namespace WMS.Web.Api.Controllers
return result;
}
///
- /// 保存
+ /// 改箱保存-PDA
///
///
///
diff --git a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
index c254395b..cc0df698 100644
--- a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
@@ -50,7 +50,7 @@ namespace WMS.Web.Api.Controllers
return result;
}
///
- /// 保存
+ /// 移箱保存-PDA
///
///
///
diff --git a/src/WMS.Web.Api/Controllers/OutStockController.cs b/src/WMS.Web.Api/Controllers/OutStockController.cs
index b438b379..b9a86961 100644
--- a/src/WMS.Web.Api/Controllers/OutStockController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockController.cs
@@ -53,7 +53,7 @@ namespace WMS.Web.Api.Controllers
}
///
- /// 保存(出库)
+ /// 出库保存(出库)-PDA
///
///
///
diff --git a/src/WMS.Web.Api/Controllers/TakeStockController.cs b/src/WMS.Web.Api/Controllers/TakeStockController.cs
index a9b7d9c7..b34f45d2 100644
--- a/src/WMS.Web.Api/Controllers/TakeStockController.cs
+++ b/src/WMS.Web.Api/Controllers/TakeStockController.cs
@@ -53,7 +53,7 @@ namespace WMS.Web.Api.Controllers
}
///
- /// 保存
+ /// 盘点保存-PDA
///
///
///
diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
index 3ad53221..a2a99975 100644
--- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
@@ -9,5 +9,44 @@ namespace WMS.Web.Core.Dto
///
public class OpsBoxResponse
{
+ ///
+ /// 对应老OPS的箱ID
+ ///
+ public int OpsBoxId { get; set; }
+
+ ///
+ /// 箱编号(老OPS生成的箱号)
+ ///
+ public string BoxBillNo { get; set; }
+ ///
+ /// 供应商Id
+ ///
+ public int? SupplierId { get; set; }
+ ///
+ /// 组织Id
+ ///
+ public int? OrgId { get; set; }
+ ///
+ /// 创建时间(对应老OPS的创建时间)
+ ///
+ public DateTime CreateTime { get; set; } = DateTime.Now;
+ ///
+ /// 明细
+ ///
+ public List Details = new List();
+ }
+ public class OpsBoxDetailsResponse {
+ ///
+ /// 物料ID
+ ///
+ public int MaterialId { get; set; }
+ ///
+ /// 数量(装箱数量)
+ ///
+ public decimal Qty { get; set; }
+ ///
+ /// 序列号集
+ ///
+ public List SerialNumbers { get; set; } = new List();
}
}
diff --git a/src/WMS.Web.Domain/IService/IBoxService.cs b/src/WMS.Web.Domain/IService/IBoxService.cs
new file mode 100644
index 00000000..05eacc0c
--- /dev/null
+++ b/src/WMS.Web.Domain/IService/IBoxService.cs
@@ -0,0 +1,15 @@
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Web.Core.Internal.Results;
+
+namespace WMS.Web.Domain.IService
+{
+ public interface IBoxService
+ {
+ // 同步老Ops箱信息
+ Task Sync();
+ }
+}
diff --git a/src/WMS.Web.Domain/IService/Public/IOpsService.cs b/src/WMS.Web.Domain/IService/Public/IOpsService.cs
index 7d6c5c38..65fcb97d 100644
--- a/src/WMS.Web.Domain/IService/Public/IOpsService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IOpsService.cs
@@ -8,6 +8,6 @@ namespace WMS.Web.Domain.IService.Public
{
public interface IOpsService
{
- Task GetBox(OpsBoxRequest request);
+ Task> GetBox(OpsBoxRequest request);
}
}
diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs
new file mode 100644
index 00000000..8972d03e
--- /dev/null
+++ b/src/WMS.Web.Domain/Services/BoxService.cs
@@ -0,0 +1,39 @@
+using AutoMapper;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Web.Core.Internal.Results;
+using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService;
+using WMS.Web.Domain.IService.Public;
+
+namespace WMS.Web.Domain.Services
+{
+ ///
+ /// 箱服务信息
+ ///
+ public class BoxService: IBoxService
+ {
+ private readonly IMapper _mapper;
+ private readonly ILoginService _loginService;
+ public readonly IBasicsRepositories _transactionRepositories;
+ private readonly IBoxRepositories _boxRepositories;
+ private readonly IOpsService _opsService;
+ public BoxService(IMapper mapper, ILoginService loginService,
+ IBasicsRepositories transactionRepositories,
+ IBoxRepositories boxRepositories, IOpsService opsService)
+ {
+ _mapper = mapper;
+ _loginService = loginService;
+ _transactionRepositories = transactionRepositories;
+ _boxRepositories = boxRepositories;
+ _opsService = opsService;
+ }
+
+ public Task Sync()
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/src/WMS.Web.Domain/Services/Public/OpsService.cs b/src/WMS.Web.Domain/Services/Public/OpsService.cs
index 22f77fd8..b213308a 100644
--- a/src/WMS.Web.Domain/Services/Public/OpsService.cs
+++ b/src/WMS.Web.Domain/Services/Public/OpsService.cs
@@ -32,13 +32,15 @@ namespace WMS.Web.Domain.Services.Public
_option = option?.Value;
}
- public async Task GetBox(OpsBoxRequest request)
+ public async Task> GetBox(OpsBoxRequest request)
{
var token = await GetToken();
Dictionary dicHeaders = new Dictionary();
dicHeaders.Add("Authorization", "Bearer " + token);
//_httpClientService.BuildHttpClient(contentHeaders);
- var res= await _httpClientService.PostAsync(_option.Url + "BarCode/carton-box_api/carton-box", JsonConvert.SerializeObject(request), dicHeaders);
+ var res = await _httpClientService.PostAsync(_option.Url + "BarCode/carton-box_api/carton-box", JsonConvert.SerializeObject(request), dicHeaders);
+ if (!res.succeeded) return new List();
+ return JsonConvert.DeserializeObject>(res.data.date);
}
private async Task GetToken()
diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
index e37c0187..9fc35771 100644
--- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
+++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
@@ -211,7 +211,7 @@ namespace WMS.Web.Repositories.DependencyInjection
x.UseJsonSerializer();
});
//用于注入
- q.UseMicrosoftDependencyInjectionJobFactory();
+ q.UseMicrosoftDependencyInjectionJobFactory();
});
//.net core核心托管-添加Quartz服务器
Services.AddQuartzServer(options =>
@@ -237,19 +237,19 @@ namespace WMS.Web.Repositories.DependencyInjection
Services.AddTransient();
Services.AddTransient();
Services.AddTransient();
-
+
Services.AddTransient();
-
+ Services.AddTransient();
Services.AddTransient();
Services.AddTransient();
Services.AddTransient();
Services.AddTransient();
Services.AddTransient();
Services.AddTransient();
-
+
}
}