diff --git a/.vs/WZC2/v17/.wsuo b/.vs/WZC2/v17/.wsuo
index 530a087c5..78d4fb1e6 100644
Binary files a/.vs/WZC2/v17/.wsuo and b/.vs/WZC2/v17/.wsuo differ
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/DocumentSettings/DocumentManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/DocumentSettings/DocumentManager.cs
index 0f6e2fd99..9e25d389b 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/DocumentSettings/DocumentManager.cs
+++ b/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;
}
diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Domain/LabelDefinitions/LabelDefinitionManager.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Domain/LabelDefinitions/LabelDefinitionManager.cs
index 0c0744ffc..fa34cfa1e 100644
--- a/be/Modules/Label/src/Win_in.Sfs.Label.Domain/LabelDefinitions/LabelDefinitionManager.cs
+++ b/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;
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/Inputs/ZuPanEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/Inputs/ZuPanEditInput.cs
index 743546879..cfe5711bc 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/GaoTongs/Inputs/ZuPanEditInput.cs
+++ b/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; }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestDetailDTO.cs
index 534e25fb6..0647e0d45 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestDetailDTO.cs
+++ b/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; }
///
- /// 已发数量
+ /// 已发数量 所有已经 生成任务的数量
///
public decimal IssuedQty { get; set; }
///
- /// 已收数量
- ///
+ /// 已收数量 所有 任务已经执行发出的 总数量
+ ///
public decimal ReceivedQty { get; set; }
///
@@ -79,7 +79,7 @@ public class AssembleIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
/// 请求未收
///
[NotMapped]
- public decimal NotFinishQty => Qty - ReceivedQty;
+ public decimal NotFinishQty => Qty - IssuedQty;
///
/// 位置码
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/DTOS/CoatingIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/DTOS/CoatingIssueRequestDetailDTO.cs
index 616bc4947..952110e8f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/DTOS/CoatingIssueRequestDetailDTO.cs
+++ b/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
/// 请求未收
///
[NotMapped]
- public decimal NotFinishQty => Qty - ReceivedQty;
+ public decimal NotFinishQty => Qty - IssuedQty;
///
/// 位置码
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs
index 5a3c8a39f..a030d3287 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs
+++ b/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
/// 请求未收
///
[NotMapped]
- public decimal NotFinishQty => Qty - ReceivedQty;
+ public decimal NotFinishQty => Qty - IssuedQty;
///
/// 位置码
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/DTOs/KittingIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/DTOs/KittingIssueRequestDetailDTO.cs
index 61f0df54f..3eb79216d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/DTOs/KittingIssueRequestDetailDTO.cs
+++ b/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
/// 请求未收
///
[NotMapped]
- public decimal NotFinishQty => Qty - ReceivedQty;
+ public decimal NotFinishQty => Qty - IssuedQty;
///
/// 位置码
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/DTOs/SparePartIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/DTOs/SparePartIssueRequestDetailDTO.cs
index c37257d9a..6971cb1a5 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/DTOs/SparePartIssueRequestDetailDTO.cs
+++ b/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
/// 请求未收
///
[NotMapped]
- public decimal NotFinishQty => Qty - ReceivedQty;
+ public decimal NotFinishQty => Qty - IssuedQty;
///
/// 位置码
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
index 0745cfeab..e70921a92 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
+++ b/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 去箱、去批、去托
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
index 90c36ca5b..460d2469f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
@@ -290,7 +290,7 @@ public class AssembleIssueJobAppService
#region 立库
///
- /// 立体库同步
+ /// 立体库同步
///
///
///
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
index dd009a495..37a78a848 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
+++ b/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 SyncIssueJobStereoAsync(List 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();
- 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}");
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
index 71d54f5c7..3f22b1252 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/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;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs
index 37dd05aac..783808a45 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs
+++ b/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);
- job.JobType = EnumJobType.Transfer;
+ job.JobType = EnumJobType.ThirdLocationJob;
job.JobStatus = EnumJobStatus.Open;
job.WorkGroupCode = fromLocation.WorkGroupCode;
job.WarehouseCode = fromLocation.WarehouseCode;