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 376ba26b1..9b34dde0c 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
@@ -1271,73 +1271,6 @@ public class CoatingIssueJobAppService
}
return ret;
}
- ///
- /// 回库调用
- ///
- ///
- ///
- ///
- private async Task ReturnBackAsync(CoatingIssueJobDTO job)
- {
- var ret = new AgvResultObject
- {
- Code = "0",
- ReqCode = job.CoatingRequestNumber,
- Message = "OK"
- };
- using var unitOfWork = _unitOfWorkManager.Begin();
- try
- {
- var first = job.Details.FirstOrDefault();
- var request = new AgvRequestBack();
- request.MatCode = first.ItemCode;
- request.ReturnQty = first.HandledToQty;
- request.EndPosition = first.HandledToLocationCode;
-
-
- var httpclient = _httpClientFactory.CreateClient();
- _agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address)
- ? "http://7e42682n64.goho.co:21171/"
- : _agvOptions.Value.Address; //测试地址
- _agvOptions.Value.Token =
- string.IsNullOrEmpty(_agvOptions.Value.Token) ? string.Empty : _agvOptions.Value.Token; //测试token
- _agvOptions.Value.UserName =
- string.IsNullOrEmpty(_agvOptions.Value.UserName) ? "" : _agvOptions.Value.UserName; //测试用户名
- _agvOptions.Value.Password =
- string.IsNullOrEmpty(_agvOptions.Value.Password) ? "" : _agvOptions.Value.Password; //测试密码
- _agvOptions.Value.Path = string.IsNullOrEmpty(_agvOptions.Value.Path)
- ? "zozocnApi/custom/receiveProductionPlan"
- : _agvOptions.Value.Path; //测试密码
- var flag = DateTime.Now.ToString("yyyyMMddHHmmss");
-
- if (!string.IsNullOrEmpty(_agvOptions.Value.Token))
- {
- var token = _agvOptions.Value.Token;
- httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
- }
-
- if (!string.IsNullOrEmpty(_agvOptions.Value.UserName) && !string.IsNullOrEmpty(_agvOptions.Value.Password))
- {
- var username = _agvOptions.Value.UserName;
- var password = _agvOptions.Value.Password;
- httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
- Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")));
- }
-
- var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path);
- ret = await client.NotifyOutTaskBack4FWAsync(request).ConfigureAwait(false);
-
- }
- catch (Exception e)
- {
- ret = new AgvResultObject();
- ret.Code = "1";
- ret.Message = e.Message;
- ret.ReqCode = job.CoatingRequestNumber;
- await unitOfWork.RollbackAsync().ConfigureAwait(false);
- throw new UserFriendlyException($"接口报错 错误信息{e.Message}");
- }
- return ret;
- }
+
#endregion
}
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 04697dbf7..2aaf93d24 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
@@ -1129,11 +1129,6 @@ public class KittingIssueJobAppService
}
-
-
-
-
-
///
/// 调用Agv接口实现
///
@@ -1216,74 +1211,7 @@ public class KittingIssueJobAppService
}
return ret;
}
- ///
- /// 回库调用
- ///
- ///
- ///
- ///
- private async Task ReturnBackAsync(KittingIssueJobDTO job)
- {
- var ret = new AgvResultObject
- {
- Code = "0",
- ReqCode = job.KittingRequestNumber,
- Message = "OK"
- };
- using var unitOfWork = _unitOfWorkManager.Begin();
- try
- {
- var first = job.Details.FirstOrDefault();
- var request = new AgvRequestBack();
- request.MatCode = first.ItemCode;
- request.ReturnQty = first.HandledToQty;
- request.EndPosition = first.HandledToLocationCode;
-
-
- var httpclient = _httpClientFactory.CreateClient();
- _agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address)
- ? "http://7e42682n64.goho.co:21171/"
- : _agvOptions.Value.Address; //测试地址
- _agvOptions.Value.Token =
- string.IsNullOrEmpty(_agvOptions.Value.Token) ? string.Empty : _agvOptions.Value.Token; //测试token
- _agvOptions.Value.UserName =
- string.IsNullOrEmpty(_agvOptions.Value.UserName) ? "" : _agvOptions.Value.UserName; //测试用户名
- _agvOptions.Value.Password =
- string.IsNullOrEmpty(_agvOptions.Value.Password) ? "" : _agvOptions.Value.Password; //测试密码
- _agvOptions.Value.Path = string.IsNullOrEmpty(_agvOptions.Value.Path)
- ? "zozocnApi/custom/receiveProductionPlan"
- : _agvOptions.Value.Path; //测试密码
- var flag = DateTime.Now.ToString("yyyyMMddHHmmss");
-
- if (!string.IsNullOrEmpty(_agvOptions.Value.Token))
- {
- var token = _agvOptions.Value.Token;
- httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
- }
-
- if (!string.IsNullOrEmpty(_agvOptions.Value.UserName) && !string.IsNullOrEmpty(_agvOptions.Value.Password))
- {
- var username = _agvOptions.Value.UserName;
- var password = _agvOptions.Value.Password;
- httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
- Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")));
- }
-
- var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path);
- ret = await client.NotifyOutTaskBack4FWAsync(request).ConfigureAwait(false);
-
- }
- catch (Exception e)
- {
- ret = new AgvResultObject();
- ret.Code = "1";
- ret.Message = e.Message;
- ret.ReqCode = job.KittingRequestNumber;
- await unitOfWork.RollbackAsync().ConfigureAwait(false);
- throw new UserFriendlyException($"接口报错 错误信息{e.Message}");
- }
- return ret;
- }
+
#endregion