20230307放单部分修改完成。暂无未修改完成的问题

DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs

@@ -1251,6 +1251,11 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose0) };
             }
 
+            //20230303 如果是财务扣单的话 也不允许添加
+            var cwkd = MsOp_BLISSUEDAL.ISKDWithCW(dataList);
+            if (cwkd.Success) {
+                return BasicDataRefDAL.GetContentResult(cwkd);
+            }
 
             var DoDataList = new List<MsOp_BLISSUEList_Detailmb>();
             var DoDataListDel = new List<MsOp_BLISSUEList_Detailmb>();

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

@@ -3628,27 +3628,19 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             var _recount = 0;
             var headList = GetDataList(" B.BSNO in (" + BSNO + ") ",0,999,out _recount);
 
-            //0 如果所有BSNO对应的特殊放单申请都已被审核通过 则直接返回true
+            if (headList.Count == 0) {
-            var cdc = new CommonDataContext();
+                result.SetErrorInfo("没有可以放单或放货的业务");
-            var bsnoList = BSNO.Replace("'", "").Split(',').ToList();
+                return result;
-            var 特放明细List = cdc.v_op_blissuelist_Detail.Where(x => bsnoList.Contains(x.bsno));
+            }
-            var 特放审核通过 = true;
-            foreach (var bsno in bsnoList) {
-                var 审批通过的特放明细 = 特放明细List.Where(x => x.bsno == bsno && x.BLSTATUS == "审核通过").ToList();
-                var 未审批通过的特放明细 = 特放明细List.Where(x => x.bsno == bsno && x.BLSTATUS != "审核通过").ToList();
-
 
-                if (审批通过的特放明细 != null && 审批通过的特放明细.Count > 0 && (未审批通过的特放明细 == null || 未审批通过的特放明细.Count == 0))
+            //0 如果所有BSNO对应的特殊放单申请都已被审核通过 则直接返回true
-                {
+            result = 是否全部特放审核通过(BSNO);
+            if (result.Success) return result;
 
-                }
+            //如果有财务扣单的 直接报错返回
-                else {
+            result = ISKDWithCW(BSNO);
-                    特放审核通过 = false;
+            if (result.Success) {
-                    break;
+                result.Success = false;
-                }
-            }
-            if (特放审核通过) {
-                result.OK();
                 return result; 
             }
 
@@ -3737,9 +3729,12 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             var result = new DBResult();
             result.OK();
 
+            try
+            {
+
                 //判断标准 该客户的全部其他业务 是否存在 BLISSUESTATUS<>'提单签出'且<>'已放货' 且其下属明细中有箱号长度11位的箱号 的
                 var recordcount = 0;
-            var bsnostr ="'"+ string.Join("','", headList.Select(s => s.BSNO))+ "'";
+                var bsnostr = "'" + string.Join("','", headList.Select(s => s.BSNO)) + "'";
                 var 其他未签出业务List = GetDataList($" b.CUSTOMERNAME='{headList[0].CUSTOMERNAME}' and b.BLISSUESTATUS<>'提单签出' and b.BLISSUESTATUS<>'已放货' and  exists(select 1 from op_ctn where BSNO=b.BSNO and len(CNTRNO)=11) and b.BSNO not in({bsnostr})", 0, 9, out recordcount);
 
                 if (recordcount > 0)
@@ -3756,11 +3751,12 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
                     {
                         var 最晚业务 = headList.Where(x => x.ETD == LastEtd).ToList();
                         //有其他未签出的 且用于判断的这些业务是ETD最晚的 是最后一票
-                    var custnoStr = "单号[" + string.Join(",", 最晚业务.Select(s=>s.CUSTNO).Distinct().ToArray()) + "]ATD:"+ LastEtd+"，此后无单";
+                        var custnoStr = "单号[" + string.Join(",", 最晚业务.Select(s => s.CUSTNO).Distinct().ToArray()) + "]ATD:" + LastEtd + "，此后无单";
 
-                    result.OK($"最后开船的{headList.Count}票，"+ custnoStr+"", true);
+                        result.OK($"最后开船的{headList.Count}票，" + custnoStr + "", true);
                     }
-                else {
+                    else
+                    {
                         //有其他未签出的 但用于判断的这些业务不是ETD最晚的 不是最后一票
                         result.OK("", false);
                     }
@@ -3770,7 +3766,10 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
                     //没有其他未签出的业务了 是最后一票
                     result.OK($"警示！！！该客户仅剩此{headList.Count}票", true);
                 }
-
+            }
+            catch (Exception e) {
+                result.SetErrorInfo(e.Message);
+            }
 
             return result;
         }
@@ -3995,38 +3994,93 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             return result;
         }
 
+        public static DBResult 是否全部特放审核通过(string BSNO)
+        {
+            var result = new DBResult();
+            var cdc = new CommonDataContext();
+            var bsnoList = BSNO.Replace("'", "").Split(',').ToList();
+
+
+            var 特放明细List = cdc.v_op_blissuelist_Detail.Where(x => bsnoList.Contains(x.bsno));
+            var 特放审核通过 = true;
+            foreach (var bsno in bsnoList)
+            {
+                var 审批通过的特放明细 = 特放明细List.Where(x => x.bsno == bsno && x.BLSTATUS == "审核通过").ToList();
+                var 未审批通过的特放明细 = 特放明细List.Where(x => x.bsno == bsno && x.BLSTATUS != "审核通过").ToList();
+
+
+                if (审批通过的特放明细 != null && 审批通过的特放明细.Count > 0 && (未审批通过的特放明细 == null || 未审批通过的特放明细.Count == 0))
+                {
+
+                }
+                else
+                {
+                    特放审核通过 = false;
+                    break;
+                }
+            }
+            if (特放审核通过)
+            {
+                result.OK();
+            }
+            else {
+                result.SetErrorInfo("");
+                
+            }
+            return result;
+        }
+
+
         /// <summary>
         /// 是否财务扣单
-        /// 由财务扣单的业务 不可以申请特放
+        /// 由财务扣单的业务 不可以申请特放;
+        /// 如有财务扣单 返回true,如无返回false
         /// </summary>
         /// <param name="BSNO"></param>
         /// <returns></returns>
         public static DBResult ISKDWithCW(string BSNO)
+        {
+
+            var _recount = 0;
+            var headList = GetDataList(" B.BSNO in (" + BSNO + ") and oB.blstatus='扣单' ", 0, 999, out _recount);
+
+            return ISKDWithCW(headList);
+        }
+        /// <summary>
+        /// 是否财务扣单
+        /// 由财务扣单的业务 不可以申请特放;
+        /// 如有财务扣单 返回true,如无返回false
+        /// </summary>
+        /// <param name="BSNO"></param>
+        /// <returns></returns>
+        public static DBResult ISKDWithCW(List<MsOp_BLISSUEmb> headList)
         {
 
             var result = new DBResult();
             result.SetErrorInfo("没有财务角色扣单");
 
-            var _recount = 0;
+            //var _recount = 0;
-            var headList = GetDataList(" B.BSNO in (" + BSNO + ") and oB.blstatus='扣单' ", 0, 999, out _recount);
+            //var headList = GetDataList(" B.BSNO in (" + BSNO + ") and oB.blstatus='扣单' ", 0, 999, out _recount);
 
-            if (headList != null && headList.Count > 0) {
+            if (headList != null && headList.Count > 0)
+            {
                 var 特放GIDList = headList.Select(s => s.GID).ToList();
                 var cdc = new CommonDataContext();
-                var 扣单动作日志 = cdc.WorkLog.Where(x => 特放GIDList.Contains(x.BSNO) && x.ACTNAME==BLSTATUSTYPE.扣单).ToList();
+                var 扣单动作日志 = cdc.WorkLog.Where(x => 特放GIDList.Contains(x.BSNO) && x.ACTNAME == BLSTATUSTYPE.扣单).ToList();
 
-                var 扣单执行人UseridList= 扣单动作日志.Select(s=>s.OP).Distinct().ToList();
+                var 扣单执行人UseridList = 扣单动作日志.Select(s => s.OP).Distinct().ToList();
 
                 var 角色List = 获取角色列表();
-                var 财务角色IDList = 角色List.Where(x => x.GVALUE.Contains("财务")).Select(s=>s.GID).ToList();
+                var 财务角色IDList = 角色List.Where(x => x.GVALUE.Contains("财务")).Select(s => s.GID).ToList();
 
                 var 扣单财务人员角色IDList = cdc.user_role.Where(x => 扣单执行人UseridList.Contains(x.USERID) && 财务角色IDList.Contains(x.ROLEID)).ToList();
 
-                if (扣单财务人员角色IDList.Count > 0) {
+                if (扣单财务人员角色IDList.Count > 0)
+                {
                     var 扣单USERID = 扣单财务人员角色IDList[0].USERID;
                     var 扣单动作 = 扣单动作日志.First(x => x.OP == 扣单USERID);
                     var head = headList.First(x => x.GID == 扣单动作.BSNO);
-                    var msg = $"存在一个由财务扣单的业务，不能执行特殊放单申请【{head.CUSTNO}】";
+                    var msg = $"存在一个由财务扣单的业务，不能执行放货或特殊放单申请【{head.CUSTNO}】";
                     result.OK(msg);
                     return result;
                 }

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js

@@ -8122,18 +8122,18 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                 //        _this2.winFDTZShow.close();
                 //    }
                 //},
-
                 {
-                    text: Zi.LAN.btnprint, //"打印",
+                    text: Zi.LAN.TFSQ, //"特放申请",
                     minWidth: 70,
                     handler: function () {
-                        _this2.Print_FDTZ();
+                        _this2.TFSQ();
                     }
-                }, {
+                },
-                    text: Zi.LAN.TFSQ, //"特放申请",
+                {
+                    text: Zi.LAN.btnprint, //"打印",
                     minWidth: 70,
                     handler: function () {
-                        _this2.TFSQ();
+                        _this2.Print_FDTZ();
                     }
                 }]
         });