Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

3 months ago · ad36866165
parent 40a16c16b7 2bc8458469
commit ad36866165
1 changed files with 1 additions and 1 deletions
--- a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs
@ -330,7 +330,7 @@ namespace DS.WMS.Core.Op.EDI
                }

                //截单时必需校验提单号，订舱时CMA可以不校验提单号必填
-                if (InttrEdi.filetype == "E" || (InttrEdi.filetype == "B" && (headData.CARRIEREDICODE != "HLCU" && headData.CARRIEREDICODE != "CMDU" && headData.CARRIEREDICODE != "CHNL")))
+                if (InttrEdi.filetype == "E" || (InttrEdi.filetype == "B" && (headData.CARRIEREDICODE != "HLCU" && headData.CARRIEREDICODE != "CMDU" && headData.CARRIEREDICODE != "CHNL" && headData.CARRIEREDICODE != "MAEU")))
                {
                    if (string.IsNullOrEmpty(headData.MBLNO))
                    { error = error + "<br />主提单号不能为空"; }