From 29edd8040d8fb2de7f2db6cf6f37ad5ce6776250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 22 Oct 2024 16:37:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/UnplannedIssueJobController.cs | 9 +++++---- .../Jobs/UnplannedReceiptJobController.cs | 14 ++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs index e0d88fdc3..ea686329b 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs @@ -52,15 +52,16 @@ public class UnplannedIssueJobController : AbpController /// /// [HttpGet("list")] - public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedIssueType enumUnplannedIssueType) + public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag) { //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; var jsonStatus = JsonSerializer.Serialize(status); - var issueType = new List() { (int)enumUnplannedIssueType }; - var jsonIssueType = JsonSerializer.Serialize(issueType); + var ishaspage = new List() { ishaspag}; + var ishaspagejson = JsonSerializer.Serialize(status); + //var jsonIssueType = JsonSerializer.Serialize(issueType); var request = new SfsJobRequestInputBase { MaxResultCount = pageSize, @@ -70,7 +71,7 @@ public class UnplannedIssueJobController : AbpController { Filters = new List { - new(nameof(UnplannedIssueJobDTO.UnplannedIssueType),jsonIssueType,"In"), + new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),ishaspagejson,"In"), new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In") } } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs index 77bc5599e..1d4e4b7fc 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs @@ -51,15 +51,21 @@ public class UnplannedReceiptJobController : AbpController /// /// [HttpGet("list")] - public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedReceiptType enumUnplannedReceiptType) + public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag) { //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; - var receiptType = new List() { (int)enumUnplannedReceiptType }; + + var ishaspage = new List() { ishaspag }; + var ishaspagejson = JsonSerializer.Serialize(status); + + + + //var receiptType = new List() { (int)enumUnplannedReceiptType }; var jsonStatus = JsonSerializer.Serialize(status); - var jsonreceiptType = JsonSerializer.Serialize(receiptType); + //var jsonreceiptType = JsonSerializer.Serialize(receiptType); var request = new SfsJobRequestInputBase { MaxResultCount = pageSize, @@ -69,7 +75,7 @@ public class UnplannedReceiptJobController : AbpController { Filters = new List { - new(nameof(UnplannedReceiptJobDTO.UnplannedReceiptType),jsonreceiptType,"In"), + new(nameof(UnplannedReceiptJobDTO.),ishaspagejson,"In"), new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In") } } From cdab0e40c2065d2c2866a6498168b00bf56da76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 22 Oct 2024 16:40:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Jobs/UnplannedReceiptJobController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs index 1d4e4b7fc..b5322e185 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs @@ -75,7 +75,7 @@ public class UnplannedReceiptJobController : AbpController { Filters = new List { - new(nameof(UnplannedReceiptJobDTO.),ishaspagejson,"In"), + new(nameof(UnplannedReceiptJobDTO.IsHasPackingCode),ishaspagejson,"In"), new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In") } } From 22bc9e47f6018b7c828bc156f00a01cd794b5483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 22 Oct 2024 18:16:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Jobs/UnplannedIssueJobController.cs | 6 +++--- .../Controllers/Jobs/UnplannedReceiptJobController.cs | 6 +++--- .../Inputs/UnplannedIssueNoteEditInput.cs | 3 +++ .../Notes/UnplannedIssueNotes/UnplannedIssueNote.cs | 2 +- .../Jobs/UnplannedIssueJobEventHandler.cs | 2 ++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs index ea686329b..8e5f3fc25 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs @@ -52,15 +52,15 @@ public class UnplannedIssueJobController : AbpController /// /// [HttpGet("list")] - public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag) + public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag) { //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; var jsonStatus = JsonSerializer.Serialize(status); - var ishaspage = new List() { ishaspag}; - var ishaspagejson = JsonSerializer.Serialize(status); + var ishaspage = new List() { ishaspag}; + var ishaspagejson = JsonSerializer.Serialize(ishaspage); //var jsonIssueType = JsonSerializer.Serialize(issueType); var request = new SfsJobRequestInputBase { diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs index b5322e185..fd12152fb 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs @@ -51,15 +51,15 @@ public class UnplannedReceiptJobController : AbpController /// /// [HttpGet("list")] - public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag) + public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag) { //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; - var ishaspage = new List() { ishaspag }; - var ishaspagejson = JsonSerializer.Serialize(status); + var ishaspage = new List() { (int)ishaspag }; + var ishaspagejson = JsonSerializer.Serialize(ishaspage); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs index 3b100ea3a..b13734990 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs @@ -104,4 +104,7 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase + + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs index 068f1b505..1bfa5998c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs @@ -92,7 +92,7 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase(entity); + + createInput.BuildDate=DateTime.Now; createInput.ActiveDate=DateTime.Now; createInput.Details.RemoveAll(p => p.Qty == 0); From 61f787b334ddc4feb1b8823f7985ffc4c9e42200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 22 Oct 2024 20:34:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WZC2/v17/.wsuo | Bin 229888 -> 230400 bytes .../DTOs/UnplannedIssueJobDTO.cs | 2 +- .../Inputs/UnplannedIssueJobEditInput.cs | 2 +- .../UnplannedIssueJobAppService.cs | 36 +++++++++--------- .../UnplannedIssueJobs/UnplannedIssueJob.cs | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.vs/WZC2/v17/.wsuo b/.vs/WZC2/v17/.wsuo index 5a177d4c348e16688dba793929c7961619cbd9bf..78cc279edd73a2dedb79baeac1f38266c14ce4a8 100644 GIT binary patch delta 2703 zcmc)LeNdD|90%~*=Xp2}eC|R#6#)_TBt#AmJiG(nND~Ejj;?=t1=X51D&+aOf$`^Vn_0njvVNs?_$m&wndTeRF;k1&YexA4_z1<%jZliQX z?cLGVqQ1q0D812s2p;YfZ4IvTx)$$RjGLY%moPVHzaCh&ifLzQdt4e{O!8shR9t0m}pn=b)g)21E< z>h!V6{Di-{9l;Q#)yLLF)9-Es-TZ7a|CI>t6jWOLWa4tf$$UlddwFRe)RCm=+o>mQ zaU^Jo0TIv6QDTto|w)BJ)q;E0hQWJKFXvw{gv~=}& zJ<~Un1L1tPvu5ZI-Z~gKxqM67E*5w>nm@-sqmxyQwXQiP+dOPhc5Gci*jwjg8_PyA z^ti*2YKcm>m?EvlVNpXfjApaNVsw}yqA+6?N17wrYPCn0ReV7ZXe;w$RVuYBR8o4KNQ#tkC4`yBkxbfHCox?p@luwQWNxJ87uq6j9toq7TaQxPt{@h8iUhe^ zr;|p3C0-UzxaZC$aXPlgEjZm57m||R%qLkev8tZpCijH3Wbc@^bGPXj@fItN5Q({F ziD4|OiBz&H`-y?ApD6~olTVV$uGITR2CK{x_3r$0WQ`{+sn)r5g3wG@>0&Y79q%R7 z5(F_qt{BHo4k!Hk1ecZ*9aHCu{oPW57(7iLJUFjH0;(GA+WSSlvwjRvVc|T z1WoA*jFprx29t{GMDCG`e57J;3db=A6C4CPX#MRR=9e$V(6So~SYn=-ghnPUZj#y7 zWujam32GJ@AogcxcM87b6eHcpan_hDhO#v)#R<$*B(7${vm}vvUkj!|`_yX-Wx-u2 di>sEhOYy=gHmq2jMO)50Sxuo>NE_lK{|0_j+^PTo delta 2510 zcmbW&drTBZ90&0E%^h$a%jLj0?-I>|n z{AOqGwz)O1d4FKLeOwr0Y&=X5+YE8tj#hH<8b3$Qin)t!{3M)wFBNM2JdTPi81on< z1anx*vvd?q$IBBV31~HiI0OjJZPNWvdjA);KVZ^vV&5IDaTdMNP$7 z3QU7km=3og{7JqRPrlZmRWe`A>3fWPEaIM3Vpc4u@Xc4yh0qd77v< z*%kSOCXUQ6_J${EgC@J5!TY??k|64%?TXB7(z9U++Jk6?TnYIBBzxoomGzV1h06?b zkG&1rg9L@nOt`FnE-JaS{xE-XCFP1-vqHn#0<)WrPvWj6`A>2iV^Z+|jZ+XhYE*b( zE7pshF|DHB5ZmpjC!ag$G|9c{a9C0XaFGCm5CJl&e^3v>BN&!#K*ZRYj9wDG+^Wcd za;IbwAr)t}vl|xE@m#K?IM020ZujQh%Fi+Tgp!;g%;lZJUKXqkq!@XJBPslQgt-Dg zz*V>g!yT0ug>80{X!*z-+?7+b=4L@e*PTPxx-abg8P@dS8y-0~46;^IhlLHN%Ad8%fBTXIn zfV}oa?FR-J2S)G*1p*)tf*=?|zyzTX2H_9^kzj@>h=v%5h4I9i*aV!!fd%5>HJAtq zkO-4tG9~f) zU_Dg92G|JIun9K97N~(*sDrKGfNiiHoKO!9&sSqIVCz|xI8v&`JlDcjqPLONqh{=~yd&zx{#xerMA$y&-A=X({qk}0c82JW~hQj<;3ewoQe61MU^o}X!3>GlAZY2*)Pj6XjyXc`J=M`Za8k>!v^ z)qf^&PO5Dm)rj5`W_3w3H67mU*HAq1IcuLDqWSKW_m+qB3K$^BUmbX$tu)iEquC92i_Z#ddoq-i`Cy+ zRP#NqxYv|XFQ*=H>u{~-IUP+S#s9^`OnIylnO0$^P`llHhx_yKw`T-j9KiPAec&DEGp6vORxN17c3)H$$ogz** PSwC!1xVuHs?P>TIGnC9F diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs index 611b882b4..14f2a3b44 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs @@ -93,7 +93,7 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase [Display(Name = "数量")] public decimal Qty { get; set; } - public bool IsHasPackingCode { get; set; } + public int IsHasPackingCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs index 5b04e77c6..95422baf0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs @@ -112,7 +112,7 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr [Display(Name = "数量")] public decimal Qty { get; set; } - public bool IsHasPackingCode { get; set; } + public int IsHasPackingCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs index 8f8750d6a..b00b2c5e8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs @@ -361,40 +361,40 @@ public class UnplannedIssueJobAppService switch (locationDto.Type) { case EnumLocationType.SEMI: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.CUST: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.FG: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.RAW: - job.IsHasPackingCode = true; + job.IsHasPackingCode = 1; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.THIRDPARTY: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.OUTSIDE: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.DimensionalStorehouse: job.UnplannedIssueType = EnumUnplannedIssueType.Raw; - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; break; case EnumLocationType.KittingWip: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; break; case EnumLocationType.WIP: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; break; } @@ -488,40 +488,40 @@ public class UnplannedIssueJobAppService switch (locationDto.Type) { case EnumLocationType.SEMI: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.CUST: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.FG: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.RAW: - job.IsHasPackingCode = true; + job.IsHasPackingCode = 1; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.THIRDPARTY: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.OUTSIDE: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; case EnumLocationType.DimensionalStorehouse: job.UnplannedIssueType = EnumUnplannedIssueType.Raw; - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; break; case EnumLocationType.KittingWip: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; break; case EnumLocationType.WIP: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; break; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs index d1547b21f..855417686 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs @@ -99,7 +99,7 @@ public class UnplannedIssueJob : SfsJobAggregateRootBase /// 设置任务明细的实际库位和实际数量 From 790cab3ff66009d3ada84351104bb60bbe25cd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 22 Oct 2024 20:48:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTOs/UnplannedReceiptJobDTO.cs | 2 +- .../Inputs/UnplannedReceiptJobEditInput.cs | 2 +- .../UnplannedReceiptJobAppService.cs | 18 +++++++++--------- .../UnplannedReceiptJob.cs | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs index 0d68af082..7a22b6dbd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs @@ -117,5 +117,5 @@ public class UnplannedReceiptJobDTO : SfsJobDTOBase [Display(Name = "是否有箱码")] - public bool IsHasPackingCode { get; set; } + public int IsHasPackingCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs index cce9d0881..8a24d40e2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs @@ -143,5 +143,5 @@ public class UnplannedReceiptJobEditInput : SfsJobCreateUpdateInputBase, /// 是否有箱码 /// [Display(Name = "是否有箱码")] - public bool IsHasPackingCode { get; set; } + public int IsHasPackingCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs index b044346f2..d00cb7589 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs @@ -220,40 +220,40 @@ public class UnplannedReceiptJobAppService switch(locationDtos.First().Type) { case EnumLocationType.SEMI: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; case EnumLocationType.CUST: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; case EnumLocationType.FG: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; case EnumLocationType.RAW: - job.IsHasPackingCode = true; + job.IsHasPackingCode = 1; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; case EnumLocationType.THIRDPARTY: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; case EnumLocationType.OUTSIDE: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; case EnumLocationType.DimensionalStorehouse: job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; break; case EnumLocationType.KittingWip: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip; break; case EnumLocationType.WIP: - job.IsHasPackingCode = false; + job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip; break; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs index 7a320bb13..cf9003922 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs @@ -122,7 +122,7 @@ public class UnplannedReceiptJob : SfsJobAggregateRootBase [Display(Name = "是否有箱码")] - public bool IsHasPackingCode { get; set; } + public int IsHasPackingCode { get; set; } /// /// 设置任务明细的实际库位和实际数量