From 894e4e2856d5dcf4ac8a3b7be79db7aeb9704ba7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 03 八月 2022 09:20:39 +0800
Subject: [PATCH] 工序 进站 出站 退出功能 齐套报表
---
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs | 94 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 insertions(+), 12 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
index 36d67ed..37a8953 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
@@ -21,27 +21,38 @@
#region 杩斿洖宸ュ簭宸ヤ环鍒楄〃
[Route("Gy_ProcPrice/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -71,9 +82,19 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string OperationType = sArray[2].ToString().Trim();
+ string msg4 = sArray[3].ToString();
bool bResult;
try
{
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
msg2 = "[" + msg2.ToString() + "]";
List<ClsGy_ProcPrice> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ProcPrice>>(msg2);
List<ClsGy_ProcPrice> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ProcPrice>>(msg3);
@@ -148,5 +169,54 @@
}
#endregion
+
+ #region 缂栬緫鏃惰繑鍥炲伐搴忓伐浠蜂俊鎭�
+ [Route("Gy_ProcPrice/GetProcPriceValue")]
+ [HttpGet]
+ public object GetProcPriceValue(int HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select " +
+ "a.HItemID,ltrim(a.HMaterID)+'-'+ltrim(a.HProcID) 宸ュ簭宸ヤ环璧勬枡浠ｇ爜,a.HDeptID,b.HName HDeptName" +
+ ",a.HMaterID HMaterIDCol,c.HNumber HMaterNumberCol,c.HName HMaterNameCol,c.HModel HMaterModelCol" +
+ ",a.HProcID HProcIDCol,d.HNumber HProcNumberCol,d.HName HProcNameCol" +
+ ",a.HSourceID HSourceIDCol,e.HNumber HSourceNumberCol,e.HName HSourceNameCol" +
+ ",a.HPrice HPriceCol,a.HBeginDate HBeginDateCol,a.HEndDate HEndDateCol" +
+ ",case when a.HCostFlag<>0 then 'true'else 'false'end HCostFlagCol" +
+ ",case when a.HFlowFlag<>0 then 'true'else 'false'end HFlowFlagCol" +
+ ",case when a.HPayFlag<>0 then 'true'else 'false'end HPayFlagCol,a.HRemark HRemarkCol " +
+ " from Gy_ProcPrice a " +
+ " left join Gy_Department b on a.HDeptID = b.HItemID " +
+ " left join Gy_Material c on a.HMaterID = c.HItemID " +
+ " left join Gy_Process d on a.HProcID = d.HItemID " +
+ " left join Gy_Source e on a.HSourceID = e.HItemID where a.HItemID = " + HItemID, "Gy_ProcPrice");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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