|
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|
|
using System.Data.SqlClient;
|
|
|
using System.Linq;
|
|
|
using System.Text;
|
|
|
+using DirectService.Tools;
|
|
|
using JLHHJSvr.BLL;
|
|
|
using JLHHJSvr.Com;
|
|
|
using JLHHJSvr.Com.Model;
|
|
@@ -45,7 +46,7 @@ namespace JLHHJSvr.Excutor
|
|
|
foreach (int itemid in request.mattressids)
|
|
|
{
|
|
|
var mattressInfo = new u_mattress() { mattressid = itemid };
|
|
|
- if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, js1_flag") != 1)
|
|
|
+ if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, js1_flag, mattresscode, parentid") != 1)
|
|
|
{
|
|
|
rslt.ErrMsg = "查找报价单据失败:" + itemid;
|
|
|
return;
|
|
@@ -53,13 +54,41 @@ namespace JLHHJSvr.Excutor
|
|
|
|
|
|
if (mattressInfo.flag == 1)
|
|
|
{
|
|
|
- rslt.ErrMsg = "床垫已审核,不能删除!(" + itemid + ")";
|
|
|
- return;
|
|
|
+ throw new LJCommonException("床垫已审核,不能删除!(" + mattressInfo.mattresscode + ")");
|
|
|
}
|
|
|
if (mattressInfo.js1_flag == 1)
|
|
|
{
|
|
|
- rslt.ErrMsg = "资料已技术审核不能删除!(" + itemid + ")";
|
|
|
- return;
|
|
|
+ throw new LJCommonException("资料已技术审核不能删除!(" + mattressInfo.mattresscode + ")");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (mattressInfo.parentid == null || mattressInfo.parentid == 0)
|
|
|
+ {
|
|
|
+
|
|
|
+ var list = new List<u_mattress>();
|
|
|
+ var outputFields = @"flag, js1_flag, mattresscode,";
|
|
|
+ var selectStr = @" SELECT flag, js1_flag, mattresscode, parentid FROM u_mattress";
|
|
|
+
|
|
|
+ var whereList = new List<string>();
|
|
|
+ whereList.Add("parentid = @parentid");
|
|
|
+
|
|
|
+
|
|
|
+ DbSqlHelper.SelectJoin(cmd, selectStr, ListEx.GetWhereStr(whereList), new Dictionary<string, object>() { { "@parentid", mattressInfo.mattressid } }, "mattressid", outputFields, 0, 0, list);
|
|
|
+
|
|
|
+ if (list.Count > 0)
|
|
|
+ {
|
|
|
+ foreach(var mtitem in list)
|
|
|
+ {
|
|
|
+
|
|
|
+ if (mtitem.flag == 1)
|
|
|
+ {
|
|
|
+ throw new LJCommonException("副规格床垫已审核,不能删除!(" + mtitem.mattresscode + ")");
|
|
|
+ }
|
|
|
+ if (mtitem.js1_flag == 1)
|
|
|
+ {
|
|
|
+ throw new LJCommonException("副规格床垫资料已技术审核不能删除!(" + mtitem.mattresscode + ")");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (DbSqlHelper.Delete(cmd, mattressInfo) <= 0)
|