Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/DocumentSettings/DocumentManager.cs

@@ -22,7 +22,7 @@ public class DocumentManager : DomainService, IDocumentManager
         var result = await _documentSettingRepository.FindAsync(p => p.Code == typeName).ConfigureAwait(false);
         if (result == null)
         {
-            throw new UserFriendlyException($"未找到 {typeName} 单据的配置信息");
+            throw new UserFriendlyException($"documentSetting未找到 {typeName} 单据的配置信息");
         }
         return result;
     }

be/Modules/Label/src/Win_in.Sfs.Label.Domain/LabelDefinitions/LabelDefinitionManager.cs

@@ -23,7 +23,7 @@ public class LabelDefinitionManager : DomainService, ILabelDefinitionManager
         var result = await _labelDefinitionRepository.FindAsync(p => p.Code == labelType).ConfigureAwait(false);
         if (result == null)
         {
-            throw new UserFriendlyException($"未找到 {labelType} 单据的配置信息");
+            throw new UserFriendlyException($"labelDefinition未找到 {labelType} 单据的配置信息");
         }
         return result;
     }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/Inputs/ZuPanEditInput.cs

@@ -17,7 +17,7 @@ public class ZuPanEditInput : EntityDto
     public string ContainerCode { get; set; }
 
     [Display(Name = "数量")]
-    public string Qty { get; set; }
+    public decimal Qty { get; set; }
 
     [Display(Name = "固定值，在立库中配置。用于多立库时区分哪个立库")]
     public string ToLocationCode { get; set; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestDetailDTO.cs

@@ -49,13 +49,13 @@ public class AssembleIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     public string ProdLine { get; set; }
 
     /// <summary>
-    ///     已发数量
+    ///     已发数量 所有已经  生成任务的数量
     /// </summary>
     public decimal IssuedQty { get; set; }
 
     /// <summary>
-    ///     已收数量
-    /// </summary>
+    ///     已收数量 所有  任务已经执行发出的 总数量
+    /// </summary> 
     public decimal ReceivedQty { get; set; }
 
     /// <summary>
@@ -79,7 +79,7 @@ public class AssembleIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     ///     请求未收
     /// </summary>
     [NotMapped]
-    public decimal NotFinishQty => Qty - ReceivedQty;
+    public decimal NotFinishQty => Qty - IssuedQty;
 
     /// <summary>
     ///     位置码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/DTOS/CoatingIssueRequestDetailDTO.cs

@@ -79,7 +79,7 @@ public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     ///     请求未收
     /// </summary>
     [NotMapped]
-    public decimal NotFinishQty => Qty - ReceivedQty;
+    public decimal NotFinishQty => Qty - IssuedQty;
 
     /// <summary>
     ///     位置码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs

@@ -79,7 +79,7 @@ public class InjectionIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     ///     请求未收
     /// </summary>
     [NotMapped]
-    public decimal NotFinishQty => Qty - ReceivedQty;
+    public decimal NotFinishQty => Qty - IssuedQty;
 
     /// <summary>
     ///     位置码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/DTOs/KittingIssueRequestDetailDTO.cs

@@ -79,7 +79,7 @@ public class KittingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     ///     请求未收
     /// </summary>
     [NotMapped]
-    public decimal NotFinishQty => Qty - ReceivedQty;
+    public decimal NotFinishQty => Qty - IssuedQty;
 
     /// <summary>
     ///     位置码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/DTOs/SparePartIssueRequestDetailDTO.cs

@@ -79,7 +79,7 @@ public class SparePartIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     ///     请求未收
     /// </summary>
     [NotMapped]
-    public decimal NotFinishQty => Qty - ReceivedQty;
+    public decimal NotFinishQty => Qty - IssuedQty;
 
     /// <summary>
     ///     位置码

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs

@@ -88,7 +88,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
             detailObj.ItemDesc1 = itemBasicObj.Desc1;
             detailObj.ItemDesc2 = itemBasicObj.Desc2;
             detailObj.Uom = itemBasicObj.BasicUom;
-            detailObj.Qty = input.Qty.TryToDecimalZero();
+            detailObj.Qty = input.Qty; //.TryToDecimalZero();
             detailObj.StdPackQty = itemBasicObj.StdPackQty;
 
             #region 去箱、去批、去托
@@ -204,7 +204,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
             detailObj.ItemDesc1 = itemBasicObj.Desc1;
             detailObj.ItemDesc2 = itemBasicObj.Desc2;
             detailObj.Uom = itemBasicObj.BasicUom;
-            detailObj.Qty = input.Qty.TryToDecimalZero();
+            detailObj.Qty = input.Qty; //.TryToDecimalZero();
             detailObj.StdPackQty = itemBasicObj.StdPackQty;
 
             #region 去箱、去批、去托

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -290,7 +290,7 @@ public class AssembleIssueJobAppService
     #region 立库
 
     /// <summary>
-    ///     立体库同步
+    ///   立体库同步
     /// </summary>
     /// <param name="input"></param>
     /// <param name="pLoc"></param>

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

@@ -318,7 +318,7 @@ public class CoatingIssueJobAppService
     public async Task<ReusltObject> SyncIssueJobStereoAsync(List<CoatingIssueJobDTO> input, string pLoc)
     {
         var ret = new ReusltObject();
-        ret.Code = "1";
+        ret.Code = "0";
         ret.Message = "操作成功";
         ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         try
@@ -364,6 +364,10 @@ public class CoatingIssueJobAppService
             _logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options));
 
 
+
+
+
+
             if (!string.IsNullOrEmpty(_options.Value.Token))
             {
                 var token = _options.Value.Token;
@@ -383,6 +387,9 @@ public class CoatingIssueJobAppService
             var flag=DateTime.Now.ToString("yyyyMMddHHmmss");
             _logger.LogInformation($"标志{flag}开始调用高通WMS:传递值{System.Text.Json.JsonSerializer.Serialize(main)}");
 
+            //_logger.LogInformation(MakeGrid($"标志{flag}开始调用高通WMS明细", main.Details.ToList()));
+
+
             ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
 
             _logger.LogInformation($"标志{flag}调用高通WMS:返回值{ret}");
@@ -406,7 +413,7 @@ public class CoatingIssueJobAppService
         var json = JsonSerializer.Serialize(input);
 #endif
         var errors = new List<string>();
-        var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" };
+        var ret = new ReusltObject { Code = "0", OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" };
         try
         {
             if (input.Jobs.Count > 0)
@@ -581,7 +588,7 @@ public class CoatingIssueJobAppService
                 loctionDto.Code).ConfigureAwait(false);
 
             _logger.LogInformation($"立体库任务结束标记{flag}，返回值{ret}");
-            if (ret.Code != "1")
+            if (ret.Code != "0")
             {
                 throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
             }

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

@@ -171,7 +171,6 @@ public class KittingIssueJobAppService
         jobDetail.TransferLibFromQty = transferLibNoteDetail.HandledFromQty;
         jobDetail.TransferLibFromSupplierBatch = transferLibNoteDetail.HandledFromSupplierBatch;
         jobDetail.TransferLibFromWarehouseCode = transferLibNoteDetail.HandledFromWarehouseCode;
-
         jobDetail.TransferLibToArriveDate = transferLibNoteDetail.HandledToArriveDate;
         jobDetail.TransferLibToContainerCode = transferLibNoteDetail.HandledToContainerCode;
         jobDetail.TransferLibToExpireDate = transferLibNoteDetail.HandledToExpireDate;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs

@@ -326,7 +326,7 @@ public class ThirdLocationRequestEventHandler
     {
         ThirdLocationJobEditInput job;
         job = ObjectMapper.Map<ThirdLocationRequest, ThirdLocationJobEditInput>(thirdLocationRequest);
-        job.JobType = EnumJobType.Transfer;
+        job.JobType = EnumJobType.ThirdLocationJob;
         job.JobStatus = EnumJobStatus.Open;
         job.WorkGroupCode = fromLocation.WorkGroupCode;
         job.WarehouseCode = fromLocation.WarehouseCode;