From 2609bffee3a8de0d1e08b1b2c3fa3cfe13064f4e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 24 三月 2025 11:40:14 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 160 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 145 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 5c0848e..b5e58ab 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -44,12 +44,25 @@
objJsonResult.data = null;
return objJsonResult;
}
- //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
- bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
- if (!isCgjl)
+
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
{
- sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )";
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ if (!isCgjl)
+ {
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )";
+ }
+ }
}
+
sWhere = sWhere.Replace("'", "''");
@@ -1042,14 +1055,14 @@
long HBUYERWITHHOLDING = DetailColl2[i].HBUYERWITHHOLDING;//涔版柟浠ｆ墸浠ｇ即
string HMATERIALDESC = DetailColl2[i].HMATERIALDESC == null ? "''" : DetailColl2[i].HMATERIALDESC; //鐗╂枡璇存槑
i++;
- if (oSub.HQty <= 0 || oSub.HQty == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oSub.HQty <= 0 || oSub.HQty == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oSub.HMaterID == 0)
{
@@ -1338,7 +1351,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillEdit where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1374,9 +1387,11 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
+ string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName,a.HWHID,w.HName 榛樿浠撳簱,a.HPOUnitID,u.HName HPOUnitName " +
" from Gy_Material AS a " +
" LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
+ " left outer join Gy_Warehouse as w on a.HWHID = w.HItemID " +
+ " left outer join Gy_Unit As u on a.HPOUnitID = u.HItemID" +
" where a.HItemID =" + HMaterID;
var dataSet = oCN.RunProcReturn(sql, "Gy_Material");
@@ -3117,7 +3132,7 @@
}
string sql = "select * from h_v_Cg_POOrderBillQuerySub where hmainid = "+ hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POOrderBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Cg_POOrderBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -3202,6 +3217,121 @@
}
}
#endregion
+
+ #region 鍑哄簱姹囨�� 鏌ヨ
+ [Route("Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList")]
+ [HttpGet]
+ public object Xs_SeOrderOutStockSumReportList(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+ ds = oCN.RunProcReturn($"exec h_p_Xs_SeOrderOutStockSumReport " + sWhere + "", "h_p_Xs_SeOrderOutStockSumReport");
+
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍏ュ簱姹囨�� 鏌ヨ
+ [Route("Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList")]
+ [HttpGet]
+ public object Cg_PoOrderInStockSumReportList(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+ ds = oCN.RunProcReturn($"exec h_p_Cg_PoOrderInStockSumReport " + sWhere + "", "h_p_Cg_PoOrderInStockSumReport");
+
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 閲囪喘璁㈠崟 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈渚涘簲鍟嗚繃婊ゆ潯浠�
+ [Route("Cg_POOrderBill/getSupIDListByUser")]
+ [HttpGet]
+ public object getSupIDListByUser(string CurUserID, string CurUserName)
+ {
+ string sWhere = "";
+ string ModRightNameCheck = "Gy_UserLookAllSup";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //鏉冮檺鍒ゆ柇锛氭槸鍚﹀彲浠ユ煡鐪嬫墍鏈変緵搴斿晢
+ if (DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ sWhere = "";
+ }
+ else
+ {
+ sWhere = " and HSupID in (select HSupID from Gy_UserSupplierRelation Where HUserID = '" + CurUserID + "')";
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = sWhere;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ sWhere = " and 1=0 ";
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = sWhere;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1