From 1549aca4567113f86f3bc62ee6e9f08b2ed19afd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 26 四月 2024 14:19:46 +0800
Subject: [PATCH] 计划平台优化
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index ab54520..134f9dc 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1209,8 +1209,11 @@
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
//oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- oBill.DetailColl.Add(oItemSub);
+ if (oItemSub.HMaterID != 0)
+ {
+ oBill.DetailColl.Add(oItemSub);
+ }
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -1491,6 +1494,18 @@
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
+ }
+
+ foreach(Model.ClsXs_SeOrderBillSub oSub in oBill.DetailColl)
+ {
+ if (oSub.HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓瓨鍦ㄨ鍏抽棴鐨勮褰�!鍙嶅鏍稿け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
}
@@ -2226,7 +2241,7 @@
}
else
{
- sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "') ";
+ sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "' union all select 166351 hcusid)";
}
objJsonResult.code = "1";
@@ -2503,5 +2518,50 @@
}
}
#endregion
+
+ #region 閿�鍞鍗� 鑾峰彇鎺掑簭鍚庣殑鏁版嵁
+ [Route("Xs_SeOrderBill/sortList")]
+ [HttpGet]
+ public object sortList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1