Browse Source

更新版本

Agv分支2024-11-19
赵新宇 4 months ago
parent
commit
0ea83e8d1b
  1. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
  2. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
  3. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
  4. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
  5. 2
      build/src/docker/publish/conf/settings/appsettings.Development.json

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

@ -1216,6 +1216,9 @@ public class CoatingIssueJobAppService
request.OrderType = ((int)EnumJobType.CoatingIssueJob).ToString(); request.OrderType = ((int)EnumJobType.CoatingIssueJob).ToString();
request.BeginPosition = beginPosition; request.BeginPosition = beginPosition;
request.EndPosition = endPosition; request.EndPosition = endPosition;
request.State = "0";
request.PakingCode = !string.IsNullOrEmpty(first.HandledFromPackingCode) ? first.HandledFromPackingCode : string.Empty;
request.Batch = "";
var httpclient = _httpClientFactory.CreateClient(); var httpclient = _httpClientFactory.CreateClient();
_agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address) _agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address)

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

@ -1170,6 +1170,11 @@ public class KittingIssueJobAppService
request.MatCode = first.ItemCode; request.MatCode = first.ItemCode;
request.MatQty = first.HandledToQty; request.MatQty = first.HandledToQty;
request.OrderNum = job.Number; request.OrderNum = job.Number;
request.State = "0";
request.PakingCode = !string.IsNullOrEmpty(first.HandledFromPackingCode)?first.HandledFromPackingCode:string.Empty;
request.Batch = "";
request.OrderType = ((int)EnumJobType.KittingIssueJob).ToString(); request.OrderType = ((int)EnumJobType.KittingIssueJob).ToString();
request.BeginPosition = beginPosition; request.BeginPosition = beginPosition;
request.EndPosition = endPosition; request.EndPosition = endPosition;

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

@ -27,6 +27,7 @@ using Volo.Abp.ObjectMapping;
using Win_in.Sfs.Basedata.Application; using Win_in.Sfs.Basedata.Application;
using System.Text.Json; using System.Text.Json;
using Win_in.Sfs.Shared.Event; using Win_in.Sfs.Shared.Event;
using DocumentFormat.OpenXml.Bibliography;
namespace Win_in.Sfs.Wms.Store.Application; namespace Win_in.Sfs.Wms.Store.Application;
@ -850,7 +851,9 @@ public class UnplannedIssueJobAppService
request.BeginPosition = detail.HandledFromLocationCode; request.BeginPosition = detail.HandledFromLocationCode;
request.EndPosition = detail.HandledFromLocationCode; request.EndPosition = detail.HandledFromLocationCode;
request.OrderType = job.UnplannedIssueType == EnumUnplannedIssueType.Raw ? ((int)EnumJobType.UnplannedIssueJobHasPacking).ToString() :((int)EnumJobType.UnplannedIssueJobNoPacking).ToString(); ; request.OrderType = job.UnplannedIssueType == EnumUnplannedIssueType.Raw ? ((int)EnumJobType.UnplannedIssueJobHasPacking).ToString() :((int)EnumJobType.UnplannedIssueJobNoPacking).ToString(); ;
request.State = "0";
request.PakingCode = !string.IsNullOrEmpty(detail.HandledPackingCode) ? detail.HandledPackingCode : string.Empty;
request.Batch = "";
var httpclient = _httpClientFactory.CreateClient(); var httpclient = _httpClientFactory.CreateClient();
_agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address) _agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address)
? "http://7e42682n64.goho.co:21171/" ? "http://7e42682n64.goho.co:21171/"

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs

@ -479,7 +479,9 @@ public class UnplannedReceiptJobAppService
request.EndPosition = detail.HandledToLocationCode; request.EndPosition = detail.HandledToLocationCode;
request.OrderType = job.UnplannedReceiptType == EnumUnplannedReceiptType.Raw ? ((int)EnumJobType.UnplannedReceiptJobHasPacking).ToString() : ((int)EnumJobType.UnplannedReceiptJobNoPacking).ToString(); request.OrderType = job.UnplannedReceiptType == EnumUnplannedReceiptType.Raw ? ((int)EnumJobType.UnplannedReceiptJobHasPacking).ToString() : ((int)EnumJobType.UnplannedReceiptJobNoPacking).ToString();
request.State = "0";
request.PakingCode = !string.IsNullOrEmpty(detail.HandledPackingCode) ? detail.HandledPackingCode : string.Empty;
request.Batch = "";
var httpclient = _httpClientFactory.CreateClient(); var httpclient = _httpClientFactory.CreateClient();
_agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address) _agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address)
? "http://7e42682n64.goho.co:21171/" ? "http://7e42682n64.goho.co:21171/"

2
build/src/docker/publish/conf/settings/appsettings.Development.json

@ -15,7 +15,7 @@
"AgvOptions": { "AgvOptions": {
"Address": "http://dev.ccwin-in.com:60084/api/basedata/test/", "Address": "http://10.164.233.34:9192/wms/api/RestJsonService/",
// //
"UserName": "", "UserName": "",
// //

Loading…
Cancel
Save