20221223-3

2 years ago · 32b09a317c
parent cfe1e7d9e8
commit 32b09a317c
1 changed files with 8 additions and 2 deletions
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
@ -2313,10 +2313,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL

            if (headData.ISINSPECTION == true) //&& oldHeadData.iscancel = 0 ||= null)
            {
-                headData.ISCANCEL = "3";
+                if (!string.IsNullOrWhiteSpace(oldHeadData.BSNO))
+                {
+                    if (oldHeadData.ISCANCEL == "0" || string.IsNullOrWhiteSpace(oldHeadData.ISCANCEL))
+                        headData.ISCANCEL = "3";
+                }
+                else
+                    headData.ISCANCEL = "3";
            }
            else {
-                if (string.IsNullOrWhiteSpace(oldHeadData.BSNO)) { 
+                if (!string.IsNullOrWhiteSpace(oldHeadData.BSNO)) { 
                    if(oldHeadData.ISCANCEL=="3")
                        headData.ISCANCEL = "0";
                }