From 9d33c8d24a9567801a17c25ba16bf26bb61a9d5e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 23 五月 2022 08:56:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 166 insertions(+), 6 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 5a56f56..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"
@@ -18,18 +18,179 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
- /// <summary>
- /// 杩斿洖鐝粍鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
#region 杩斿洖宸ュ簭宸ヤ环鍒楄〃
[Route("Gy_ProcPrice/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ 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)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭宸ヤ环淇濆瓨
+ [Route("Gy_ProcPrice/set_SaveBill")]
+ [HttpPost]
+ public object set_SaveBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = AddBillMain(msg1);
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ 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);
+ DAL.ClsGy_ProcPrice_Ctl BillNew = new DAL.ClsGy_ProcPrice_Ctl();
+ BillNew.DetailColl = new List<Model.ClsGy_ProcPrice_Model>();
+ Model.ClsGy_ProcPrice_Model BillOld = new Model.ClsGy_ProcPrice_Model();
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsGy_ProcPrice_Model oSub = new Model.ClsGy_ProcPrice_Model();
+ oSub.HMaterID = DBUtility.ClsPub.isLong(subList[i].HMaterIDCol);
+ oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcIDCol);
+ oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceIDCol);
+ oSub.HPrice = DBUtility.ClsPub.isLong(subList[i].HPriceCol);
+ oSub.HBeginDate = DBUtility.ClsPub.isDate(subList[i].HBeginDateCol);
+ oSub.HEndDate = DBUtility.ClsPub.isDate(subList[i].HEndDateCol);
+ oSub.HCostFlag = DBUtility.ClsPub.GridToBool(subList[i].HCostFlagCol);
+ oSub.HFlowFlag = DBUtility.ClsPub.GridToBool(subList[i].HFlowFlagCol);
+ oSub.HPayFlag = DBUtility.ClsPub.GridToBool(subList[i].HPayFlagCol);
+ oSub.HDeptID = DBUtility.ClsPub.isLong(mainList[0].HDeptID);
+ oSub.HStopflag = false;
+ oSub.HMaker = DBUtility.ClsPub.isStrNull(mainList[0].HMaker);
+ oSub.HMakeDate = DateTime.Today.ToString();
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemarkCol);
+ BillNew.DetailColl.Add(oSub);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (OperationType.Equals("1.1") || OperationType.Equals("1.2") || OperationType.Equals("2"))
+ {
+ bResult = BillNew.AddNew();
+ }
+ else
+ {
+ bResult = BillNew.ModifyByID(DBUtility.ClsPub.isLong(mainList[0].HItemID));
+ }
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #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";
@@ -57,6 +218,5 @@
}
}
#endregion
-
}
}
\ No newline at end of file
--
Gitblit v1.9.1