提单号验证

2 years ago · 6057b8d928
parent 7f1aaa306d
commit 6057b8d928
1 changed files with 10 additions and 16 deletions
--- a/Myshipping.Application/Service/DataSync/DataSyncService.cs
+++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs
@ -303,16 +303,12 @@ namespace Myshipping.Application
                {
                    foreach (var item in model.childrens)
                    {
-                        if (string.IsNullOrWhiteSpace(item.MBLNO))
-                        {
-                            throw Oops.Bah("请填写提单号！");
-                        }
+ 
+                        JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
                        if (string.IsNullOrWhiteSpace(item.HBLNO))
                        {
                            throw Oops.Bah("请填写分提单号！");
                        }
-                        JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
-
                        var fms = JsonUtil.TrimFields(item);
                        if (!string.IsNullOrEmpty(fms))
                        {
@ -629,12 +625,12 @@ namespace Myshipping.Application
                {
                    foreach (var item in model.childrens)
                    {
-                        if (string.IsNullOrWhiteSpace(item.MBLNO))
+ 
+                        JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
+                        if (string.IsNullOrWhiteSpace(item.HBLNO))
                        {
-                            throw Oops.Bah("请填写提单号！");
+                            throw Oops.Bah("请填写分提单号！");
                        }
-                        JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
-
                        var fms = JsonUtil.TrimFields(item);
                        if (!string.IsNullOrEmpty(fms))
                        {
@ -1028,10 +1024,7 @@ namespace Myshipping.Application
                    {
                        foreach (var item in model.childrens)
                        {
-                            if (string.IsNullOrWhiteSpace(item.MBLNO))
-                            {
-                                throw Oops.Bah("请填写提单号！");
-                            }
+ 
                            if (string.IsNullOrWhiteSpace(item.HBLNO))
                            {
                                throw Oops.Bah("请填写分提单号！");
@ -1348,9 +1341,10 @@ namespace Myshipping.Application
                    {
                        foreach (var item in model.childrens)
                        {
-                            if (string.IsNullOrWhiteSpace(item.MBLNO))
+
+                            if (string.IsNullOrWhiteSpace(item.HBLNO))
                            {
-                                throw Oops.Bah("请填写提单号！");
+                                throw Oops.Bah("请填写分提单号！");
                            }
                            JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");