From 98a7f3f68a4b06f59221f10c4e7821826ddc2be0 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 8 Nov 2023 15:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4ops=E7=AE=B1=E7=BB=93?=
=?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 30 ++++++++++++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 8 +++
src/WMS.Web.Core/Dto/OpsBoxResponse.cs | 49 +++++++++++++++++--
.../Services/Public/OpsService.cs | 23 +++++++++
4 files changed, 107 insertions(+), 3 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index ee22b771..c7466844 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2345,6 +2345,21 @@
组织Id
+
+
+ 完成装箱时间
+
+
+
+
+ 箱子的创建时间
+
+
+
+
+ 箱子创建用户
+
+
创建时间（对应老OPS的创建时间）
@@ -2355,6 +2370,21 @@
明细
+
+
+ 序列号
+
+
+
+
+ 条码生成时间
+
+
+
+
+ 条码生成用户
+
+
物料ID
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index a1684cf9..30a6bd65 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1196,6 +1196,14 @@
老ops箱信息
+
+
+ 批量添加
+
+
+
+
+
wms入库单-仓储接口
diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
index a2a99975..6e861dba 100644
--- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,41 +13,83 @@ namespace WMS.Web.Core.Dto
///
/// 对应老OPS的箱ID
///
+ [JsonProperty("CartonId")]
public int OpsBoxId { get; set; }
-
///
/// 箱编号（老OPS生成的箱号）
///
+ [JsonProperty("CartonNo")]
public string BoxBillNo { get; set; }
///
/// 供应商Id
///
+ [JsonProperty("GysNo")]
public int? SupplierId { get; set; }
///
/// 组织Id
///
+ [JsonProperty("orgId")]
public int? OrgId { get; set; }
///
+ /// 完成装箱时间
+ ///
+ [JsonProperty("CompleteCartonTime")]
+ public string CompleteCartonTime { get; set; }
+ ///
+ /// 箱子的创建时间
+ ///
+ [JsonProperty("cartonCreateTime")]
+ public string cartonCreateTime { get; set; }
+ ///
+ /// 箱子创建用户
+ ///
+ [JsonProperty("BoxUser")]
+ public string BoxUser { get; set; }
+ ///
/// 创建时间（对应老OPS的创建时间）
///
+ [JsonProperty("CreateTime")]
public DateTime CreateTime { get; set; } = DateTime.Now;
///
/// 明细
///
+ [JsonProperty("BoxReturnDetails")]
public List Details = new List();
}
+ public class SerialNumbersResponse
+ {
+ ///
+ /// 序列号
+ ///
+ [JsonProperty("sn")]
+ public string SerialNumber { get; set; }
+ ///
+ /// 条码生成时间
+ ///
+ [JsonProperty("barCreateTime")]
+ public string barCreateTime { get; set; }
+ ///
+ /// 条码生成用户
+ ///
+ [JsonProperty("barCereateUser")]
+ public string barCereateUser { get; set; }
+
+ }
public class OpsBoxDetailsResponse {
///
/// 物料ID
///
+ [JsonProperty("FMaterialId")]
public int MaterialId { get; set; }
///
/// 数量（装箱数量）
///
+ [JsonProperty("Qty")]
public decimal Qty { get; set; }
///
/// 序列号集
///
- public List SerialNumbers { get; set; } = new List();
+ [JsonProperty("SerialNumbers")]
+ public List SerialNumbers { get; set; } = new List();
}
}
diff --git a/src/WMS.Web.Domain/Services/Public/OpsService.cs b/src/WMS.Web.Domain/Services/Public/OpsService.cs
index b213308a..5f12c9d5 100644
--- a/src/WMS.Web.Domain/Services/Public/OpsService.cs
+++ b/src/WMS.Web.Domain/Services/Public/OpsService.cs
@@ -34,6 +34,29 @@ namespace WMS.Web.Domain.Services.Public
public async Task> GetBox(OpsBoxRequest request)
{
+ OpsBoxResponse respnose = new OpsBoxResponse();
+ List details = new List();
+ List ss = new List();
+ ss.Add(new SerialNumbersResponse() {
+ SerialNumber="sss",
+ barCereateUser="sdf",
+ barCreateTime="20-20-20"
+ });
+ ss.Add(new SerialNumbersResponse()
+ {
+ SerialNumber = "sss2",
+ barCereateUser = "sdf2",
+ barCreateTime = "20-20-20"
+ });
+ details.Add(new OpsBoxDetailsResponse()
+ {
+ MaterialId = 1,
+ Qty = 1,
+ SerialNumbers = ss
+ });
+ respnose.Details = details;
+ var str = JsonConvert.SerializeObject(respnose);
+
var token = await GetToken();
Dictionary dicHeaders = new Dictionary();
dicHeaders.Add("Authorization", "Bearer " + token);