20221202-1

DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs

@@ -2041,20 +2041,32 @@ namespace DSWeb.MvcShipping.Controllers
 
             //2 没有不成对的 【扣单】和【取消扣单】
 
-            var cdc = new CommonDataContext();
-            var loglist = cdc.WorkLog.Where(x => x.BSNO == _p.BSNO).ToList();
+            //var cdc = new CommonDataContext();
+
+            //var op_blissuelist_detail = cdc.op_blissuelist_detail
+
+            //var loglist = cdc.WorkLog.Where(x => x.BSNO == _p.GID).ToList();
+
+            var condition = $" (BSNO='{_p.GID}' or BSNO in(select linkgid from op_blissuelist_detail where BSNO='{_p.BSNO}'))";
+
+            var loglist = Areas.OA.DAL.WorkFlow.WorkLogDAL.GetWorkLog(condition, null);
 
             var 提单签入count = 0;
             var 提单签出count = 0;
             var 扣单count = 0;
             var 取消扣单count = 0;
-
+            var 放单通知count = 0;
 
             foreach (var log in loglist) {
                 if (log.ACTNAME == "提单签入") 提单签入count++;
+                if (log.ACTNAME == "取消签入") 提单签入count--;
                 if (log.ACTNAME == "提单签出") 提单签出count++;
                 if (log.ACTNAME == "扣单") 扣单count++;
                 if (log.ACTNAME == "取消扣单") 取消扣单count++;
+
+                if (log.ACTNAME == "放单通知") 放单通知count++;
+
+                if (log.ACTNAME == "取消放单通知") 放单通知count--;
             }
 
             if (提单签入count - 提单签出count != 1) {
@@ -2064,7 +2076,10 @@ namespace DSWeb.MvcShipping.Controllers
             {
                 result.SetErrorInfo("目前处于扣单状态");
             }
-
+            if (放单通知count <= 0)
+            {
+                result.SetErrorInfo("还未执行放单通知");
+            }
             return result;
         }
         public ContentResult KD ( string USERID, string data,string type)   //扣单 取消扣单

DSWeb/Areas/MvcShipping/DAL/MsChFeeAutoDui/MsChFeeAutoDuiDAL.cs

@@ -487,11 +487,12 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
 
 
                         //20221122 增加逻辑 如果是已退舱的业务 跳过
-                        var currbs = cdc.v_op_bs.Where(x => x.MBLNO == _mblno && (x.ISCANCEL == 1 || x.ISCANCEL == 2 || x.ISCANCEL == 4)).ToList();
-                        if (currbs != null && currbs.Count > 0)
-                        {
-                            continue;
-                        }
+                        //20221128 改为显示但不对账 在remake当中实现
+                        //var currbs = cdc.v_op_bs.Where(x => x.MBLNO == _mblno && (x.ISCANCEL == 1 || x.ISCANCEL == 2 || x.ISCANCEL == 4)).ToList();
+                        //if (currbs != null && currbs.Count > 0)
+                        //{
+                        //    continue;
+                        //}
 
                         _Detail.MBLNO = GetMBLNO(_Detail.B_MBLNO);
                         var RMBAMOUNT = Convert.ToDecimal(row[_p + 1]);
@@ -796,6 +797,9 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
             var LocalDetailList =  GetLocalList(head.CUSTOMERNAME,head.GID,head.FEETYPE,head.HAVEDEBIT,head.FEEDC,head.CURR,head.FSTATUS,head.FEEDUITYPE,head.FEEDUITYPECONDIT,head.SALECORP);
             //var LocalDetailList = DetailList;
 
+            var cdc = new CommonDataContext();
+
+
             //var result = new DBResult();
             Database db = DatabaseFactory.CreateDatabase();
             using (DbConnection connection = db.CreateConnection())
@@ -808,6 +812,17 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeAutoDuiDAL
 
                     foreach (CH_FEE_AutoDuiDetailmb _D in DetailList)
                     {
+                        var currbs = cdc.v_op_bs.Where(x => x.MBLNO == _D.MBLNO && (x.ISCANCEL == 1 || x.ISCANCEL == 2 || x.ISCANCEL == 4)).ToList();
+                        var currbs_Cando = cdc.v_op_bs.Where(x => x.MBLNO == _D.MBLNO && (x.ISCANCEL == null || x.ISCANCEL == 0 )).ToList();
+                        if (currbs != null && currbs.Count > 0 && (currbs_Cando==null || currbs_Cando.Count==0))
+                        {
+                            //增加判断 如果
+
+                            _D.REMARK2 = "该业务已退舱";
+                            continue;
+                        }
+
+
                         if (_D.B_BSNO == "")
                         {
                             _D.REMARK2 = "我方无此提单号";

DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs

@@ -302,11 +302,11 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             strSql.Append(",ISSUETYPE");
             
 
-           strSql.Append(" from op_seae where  ");
+           strSql.Append(" from op_seae where 1=1 ");
 
             if (!string.IsNullOrEmpty(strCondition))
             {
-                strSql.Append(" where " + strCondition);
+                strSql.Append(" and " + strCondition);
             }
 
             strSql.Append(@")as t ");

DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeAutoDui/MsChFeeAutoDuiEdit.js

@@ -734,7 +734,8 @@
                     if (record.get('ISOK') == "1") {
                         feeStatus = 9;
                     } else
-                        if (REMARK2 == "我方无此提单号") {
+                        //20221128 增加对本地业务已退舱的支持
+                        if (REMARK2 == "我方无此提单号" || REMARK2 =="该业务已退舱") {
                             feeStatus = 3; //4
                         } else
                             if (REMARK2 == "对方账单无此提单号") {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherIndex.js

@@ -1736,7 +1736,7 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
             return '';
         }
 
-        var sql = '';
+        var sql = " isnull(HBLNO,'')='' ";
 
         var MBLNO = form.findField('MBLNO').getValue();
         sql = sql + getAndConSql(sql, MBLNO, "MBLNO like '%" + MBLNO + "%'");