From 9679b5c75cc44730badf9148b51ab9f2a6e79fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 12 Dec 2024 10:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/TestAppService.cs                    | 259 ++++++++++++++----
 1 file changed, 213 insertions(+), 46 deletions(-)

diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs
index 1bd57d744..d53d7b11a 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs
@@ -191,9 +191,81 @@ public class AgvResultObject1
 #region AGV
 
 
+/// <summary>
+/// 海康调闻荫入参数
+/// </summary>
+public class AgvRequestDto1
+{
+    //[Display(Name = "请求编号")]
+    //public string ReqCode { set; get; }
+    [Display(Name = "明细")]
+    public List<AgvRequestDetailDto1> Data { set; get; }
+
+}
+/// <summary>
+/// 海康调闻荫入参数
+/// </summary>
+//public class AgvRequestOnlyJobHK
+//{
+//    //[Display(Name = "请求编号")]
+//    //public string ReqCode { set; get; }
+//    [Display(Name = "明细")]
+//    public List<AgvRequestDetailDto> Data { set; get; }
+
+//}
+
+
+
+/// <summary>
+/// 海康调闻荫入参明细
+/// </summary>
+public class AgvRequestDetailDto1
+{
+    [Display(Name = "任务类型")]
+    public string OrderType { set; get; }
+    [Display(Name = "任务编号")]
+    public string OrderNum { set; get; }
+    [Display(Name = "物料编号")]
+    public string MatCode { set; get; }
+    [Display(Name = "物料数量")]
+    public decimal MatQty { set; get; }
+    [Display(Name = "起始点")]
+    public string BeginPosition { set; get; }
+    [Display(Name = "终点")]
+    public string EndPosition { set; get; }
+
+    [Display(Name = "箱码")]
+    public string PakingCode { set; get; }
+
+
+    [Display(Name = "库存状态")]
+    public string State { set; get; }
+
+
+    [Display(Name = "批次属性07")]
+    public string BatchAttr07 { set; get; }
+    [Display(Name = "批次属性08")]
+    public string BatchAttr08 { set; get; }
+    [Display(Name = "批次属性09")]
+    public string BatchAttr09 { set; get; }
+    [Display(Name = "批次属性10")]
+    public string BatchAttr10 { set; get; }
+    [Display(Name = "批次属性11")]
+    public string BatchAttr11 { set; get; }
+    [Display(Name = "批次属性12")]
+    public string BatchAttr12 { set; get; }
+    [Display(Name = "批次属性13")]
+    public string BatchAttr13 { set; get; }
+    [Display(Name = "批次属性14")]
+    public string BatchAttr14 { set; get; }
+    [Display(Name = "批次属性15")]
+    public string BatchAttr15 { set; get; }
+
+}
+
 public class AgvRequestUnplannedDto1
 {
-   
+
     [Display(Name = "明细")]
     public List<AgvRequestUnplannedDetailDto1> Data { set; get; }
 
@@ -216,6 +288,10 @@ public class AgvRequestUnplannedDetailDto1
     [Display(Name = "箱码")]
     public string PakingCode { set; get; }
 
+    [Display(Name = "库存状态")]
+    public string State { set; get; }
+
+
     [Display(Name = "批次属性07")]
     public string BatchAttr07 { set; get; }
     [Display(Name = "批次属性08")]
@@ -238,71 +314,162 @@ public class AgvRequestUnplannedDetailDto1
 }
 
 
+/// <summary>
+/// 闻荫调海康入参
+/// </summary>
 
+public partial class AgvRequest1
+{
 
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("orderType", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string OrderType { get; set; }
 
+    /// <summary>
+    /// 任务编号
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("orderNum", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string OrderNum { get; set; }
 
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string MatCode { get; set; }
 
+    /// <summary>
+    /// 箱码
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("pakingCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string PakingCode { get; set; }
 
+    /// <summary>
+    /// 库存状态
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("state", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string State { get; set; }
 
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("batch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string Batch { get; set; }
+
+
+    /// <summary>
+    /// 物料数量
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("matQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public decimal MatQty { get; set; }
 
+    /// <summary>
+    /// 来源工位
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("beginPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string BeginPosition { get; set; }
 
+    /// <summary>
+    /// 目标工位
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string EndPosition { get; set; }
 
+}
 
-/// <summary>
-/// 闻荫调海康入参
-/// </summary>
-public class AgvRequest1
+[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")]
+public partial class AgvRequestBack1
 {
-    [Display(Name = "任务类型")]
-    public string OrderType { set; get; }
-    [Display(Name = "任务编号")]
-    public string OrderNum { set; get; }
-    [Display(Name = "物料编号")]
-    public string MatCode { set; get; }
-    [Display(Name = "物料数量")]
-    public decimal MatQty { set; get; }
-    [Display(Name = "来源工位")]
-    public string BeginPosition { set; get; }
-    [Display(Name = "目标工位")]
-    public string EndPosition { set; get; }
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string MatCode { get; set; }
+
+    /// <summary>
+    /// 物料数量
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("returnQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public decimal ReturnQty { get; set; }
+
+    /// <summary>
+    /// 目标工位
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string EndPosition { get; set; }
 
 }
 
-public class AgvRequestUnplanned1
+[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")]
+public partial class AgvRequestUnplanned1
 {
-    [Display(Name = "批次")]
-    public string Batch { set; get; }
-    [Display(Name = "箱码")]
-    public string PakingCode { set; get; }
-    [Display(Name = "ERP储位")]
-    public string ErpLocationCode { set; get; }
-    [Display(Name = "任务类型")]
-    public string OrderType { set; get; }
-    [Display(Name = "任务编号")]
-    public string OrderNum { set; get; }
-    [Display(Name = "物料编号")]
-    public string MatCode { set; get; }
-    [Display(Name = "物料数量")]
-    public decimal MatQty { set; get; }
-    [Display(Name = "来源工位")]
-    public string BeginPosition { set; get; }
-    [Display(Name = "目标工位")]
-    public string EndPosition { set; get; }
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("batch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string Batch { get; set; }
 
-}
+    /// <summary>
+    /// 箱码
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("pakingCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string PakingCode { get; set; }
 
 
-public class AgvRequestBack1
-{
-    [Display(Name = "物料编号")]
-    public string MatCode { set; get; }
-    [Display(Name = "物料数量")]
-    public decimal ReturnQty { set; get; }
-    [Display(Name = "目标工位")]
-    public string EndPosition { set; get; }
-}
+    /// <summary>
+    /// 库存状态
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("state", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string State { get; set; }
+
+
+    /// <summary>
+    /// ERP储位
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("erpLocationCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string ErpLocationCode { get; set; }
+
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("orderType", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string OrderType { get; set; }
 
+    /// <summary>
+    /// 任务编号
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("orderNum", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string MatCode { get; set; }
+
+    /// <summary>
+    /// 物料数量
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("matQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public decimal MatQty { get; set; }
+
+    /// <summary>
+    /// 来源工位
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("beginPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string BeginPosition { get; set; }
+
+    /// <summary>
+    /// 目标工位
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    public string EndPosition { get; set; }
+
+
+
+
+}