更新版本

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs

@@ -66,9 +66,9 @@ public class TestService:ApplicationService
     //    return result;
 
     //}
-    [HttpPost("SyncCoatingJobStereo")]
+    [HttpPost("SyncIssueJobStereo")]
 
-    public virtual async Task<ReusltObject> SyncCoatingJobStereoAsync(CoatingIssueJobToRestoDTO input)
+    public virtual async Task<ReusltObject> SyncIssueJobStereoAsync(IssueJobToRestoDTO input)
     {
 
         ReusltObject reuslt=new ReusltObject();
@@ -97,7 +97,7 @@ public class TestService:ApplicationService
 /// <summary>
 /// 发给立体库主表
 /// </summary>
-public class CoatingIssueJobToRestoDetailDTO
+public class IssueJobToRestoDetailDTO
 {
     public string WorkNo { set; get; }
     public string TaskNo { set; get; }
@@ -108,11 +108,11 @@ public class CoatingIssueJobToRestoDetailDTO
 /// <summary>
 /// 发给立体库子表
 /// </summary>
-public class CoatingIssueJobToRestoDTO
+public class IssueJobToRestoDTO
 {
     public Guid  UUID { set; get; }
     public string OperatorName { set; get; }
-    public List<CoatingIssueJobToRestoDetailDTO> Details { set; get; }
+    public List<IssueJobToRestoDetailDTO> Details { set; get; }
 }
 /// <summary>
 /// 返回结果

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/DTOs/CoatingIssueJobDTO.cs

@@ -39,101 +39,6 @@ public class CoatingIssueJobDTO : SfsJobDTOBase<CoatingIssueJobDetailDTO>
     public bool UseOnTheWayLocation { get; set; }
 
 }
-/// <summary>
-/// 喷涂主表
-/// </summary>
-public class IssueRequestFromRestoDTO
-{
-       public string RequestNumber { set; get; }
-       public List<IssueJobFromRestoDTO> Jobs { set; get; }
-}
-/// <summary>
-/// 立体库发给WMS明细
-/// </summary>
-public class IssueJobFromRestoDetailDTO 
-{
-    [Display(Name = "零件编号")]
-    public string ItemCode { set; get; }
-    [Display(Name = "目标库位")]
-    public string ToLocationCode { set; get; }
-    [Display(Name = "来源库位")]
-    public string FromLocationCode { set; get; }
-    [Display(Name = "数量")]
-    public decimal Qty { set; get; }
-}
-/// <summary>
-/// 立体库发给立体库任务单号
-/// </summary>
-public class IssueJobFromRestoDTO
-{
-    [Display(Name = "任务单号")]
-    public string JobNumber { set; get; }
-    [Display(Name = "明细")]
-    public List<IssueJobFromRestoDetailDTO> Details { set; get; }
-}
-/// <summary>
-/// 发给立体库主表
-/// </summary>
-/// <summary>
-/// 发给立体库子表
-/// </summary>
-[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
-public partial class IssueJobToRestoDTO
-{
-
-    [System.Text.Json.Serialization.JsonPropertyName("uuid")]
-    public System.Guid Uuid { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("operatorName")]
-    public string OperatorName { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("details")]
-    public System.Collections.Generic.ICollection<IssueJobToRestoDetailDTO> Details { get; set; }
-
-}
-
-/// <summary>
-/// 发给立体库主表
-/// </summary>
-[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
-public partial class IssueJobToRestoDetailDTO
-{
-
-    [System.Text.Json.Serialization.JsonPropertyName("workNo")]
-    public string WorkNo { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("taskNo")]
-    public string TaskNo { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("needSite")]
-    public string NeedSite { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("productNo")]
-    public string ProductNo { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("count")]
-    public decimal Count { get; set; }
-
-}
-
-/// <summary>
-/// 返回结果
-/// </summary>
-[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
-public partial class ReusltObject
-{
-
-    [System.Text.Json.Serialization.JsonPropertyName("code")]
-    public string Code { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("message")]
-    public string Message { get; set; }
-
-    [System.Text.Json.Serialization.JsonPropertyName("operateTime")]
-    public string OperateTime { get; set; }
-
-}
-
 
 
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -25,6 +25,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
 using Win_in.Sfs.Wms.Store.Notes;
 using Win_in.Sfs.Wms.Store.Options;
 
@@ -233,7 +234,7 @@ public class CoatingIssueJobAppService
 
         #region   
         IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient());
-        ret = await client.SyncCoatingJobStereoAsync(main).ConfigureAwait(false);
+        ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
         #endregion
         return ret;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -18,6 +18,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
 using Win_in.Sfs.Wms.Store.Notes;
 using Win_in.Sfs.Wms.Store.Options;
 using static IdentityModel.ClaimComparer;
@@ -360,7 +361,7 @@ public class KittingIssueJobAppService
 
 
 
-    private  async Task<ReusltObject> SyncCoatingJobStereoAsync(List<KittingIssueJobDTO> input,string p_loc)
+    private  async Task<ReusltObject> SyncIssueJobStereoAsync(List<KittingIssueJobDTO> input,string p_loc)
     {
 
         ReusltObject ret = new ReusltObject();
@@ -396,7 +397,7 @@ public class KittingIssueJobAppService
 
             #region   
             IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient());
-            ret = await client.SyncCoatingJobStereoAsync(main).ConfigureAwait(false);
+            ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
         }
         catch(Exception ex) {
             ret = new ReusltObject();
@@ -413,7 +414,7 @@ public class KittingIssueJobAppService
 
 
     [HttpPost("receive-issue-job-stereo")]
-    public virtual async Task<ReusltObject> SyncReciveCoatingJobStereoAsync(IssueRequestFromRestoDTO input)
+    public virtual async Task<ReusltObject> SyncReciveIssueJobStereoAsync(IssueRequestFromRestoDTO input)
     {
 
 #if DEBUG
@@ -428,22 +429,50 @@ public class KittingIssueJobAppService
         };
         try
         {
+
             if (input.Jobs.Count > 0)
             {
-                var inputs = input.Jobs;
+                var jobs = input.Jobs;
-                var numbers = inputs.Select(p => p.JobNumber);
+                var numbers = jobs.Select(p => p.JobNumber);
                 var query = _repository.WithDetails()
                      .Where(p => numbers.Contains(p.Number));
                 var entities = query.ToList();
 
+                var dtos = ObjectMapper.Map<List<KittingIssueJob>, List<KittingIssueJobDTO>>(entities);
+
+
                 if (input.Jobs.Count == entities.Count)
                 {
                     errors.Add("提交出库任务和WMS出库任务不符,请核对! \n");
                 }
-                var dtos = ObjectMapper.Map<List<KittingIssueJob>, List<KittingIssueJobDTO>>(entities);
+                List<IssueJobFromRestoDetailDTO> inputDetails = new List<IssueJobFromRestoDetailDTO>();
+                foreach (var itm in input.Jobs)
+                {
+                    foreach (var inputjob in itm.Details)
+                    {
+
+                    }
+
+                }
+
+
+                List<KittingIssueJobDetailDTO> existDetails = new List<KittingIssueJobDetailDTO>();
+                foreach (var itm in dtos)
+                {
+
+                    foreach (var inputjob in itm.Details)
+                    {
+
+                    }
+
+                }
+
+
+
                     foreach (var itm in dtos)
                 {
-                    var first = inputs.FirstOrDefault<IssueJobFromRestoDTO>(p => p.JobNumber == itm.Number);
+                    var first = jobs.FirstOrDefault<IssueJobFromRestoDTO>(p => p.JobNumber == itm.Number);
+                    var itmDetails= itm.Details.ToList();
                     List<KittingIssueJobDetailDTO> details = new List<KittingIssueJobDetailDTO>();
                     foreach (var detail in first.Details)
                     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs

@@ -20,6 +20,7 @@
 namespace MyNamespace
 {
     using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
+    using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
     using System = global::System;
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
@@ -68,15 +69,15 @@ namespace MyNamespace
 
         /// <returns>Success</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual System.Threading.Tasks.Task<ReusltObject> SyncCoatingJobStereoAsync(IssueJobToRestoDTO body)
+        public virtual System.Threading.Tasks.Task<ReusltObject> SyncIssueJobStereoAsync(IssueJobToRestoDTO body)
         {
-            return SyncCoatingJobStereoAsync(body, System.Threading.CancellationToken.None);
+            return SyncIssueJobStereoAsync(body, System.Threading.CancellationToken.None);
         }
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <returns>Success</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ReusltObject> SyncCoatingJobStereoAsync(IssueJobToRestoDTO body, System.Threading.CancellationToken cancellationToken)
+        public virtual async System.Threading.Tasks.Task<ReusltObject> SyncIssueJobStereoAsync(IssueJobToRestoDTO body, System.Threading.CancellationToken cancellationToken)
         {
             var client_ = _httpClient;
             var disposeClient_ = false;
@@ -93,8 +94,8 @@ namespace MyNamespace
 
                     var urlBuilder_ = new System.Text.StringBuilder();
                     if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl);
-                    // Operation Path: "CargoState/SyncCoatingJobStereo"
+                    // Operation Path: "CargoState/SyncIssueJobStereo"
-                    urlBuilder_.Append("CargoState/SyncCoatingJobStereo");//修改路由
+                    urlBuilder_.Append("CargoState/SyncIssueJobStereo");//修改路由
 
                     PrepareRequest(client_, request_, urlBuilder_);