From 6c66fff0a02b6860e63a1eb9791100130584084c Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 23 十二月 2021 15:39:02 +0800
Subject: [PATCH] 代码上传
---
/dev/null | 386 -------------------------------------------------------
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 6
WebAPI/Models/基础资料/Gy_ClassTimePrjSub.cs | 2
WebAPI/WebAPI.csproj | 2
4 files changed, 5 insertions(+), 391 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
deleted file mode 100644
index 3c31a73..0000000
--- a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
+++ /dev/null
@@ -1,386 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-namespace WebAPI.Controllers
-{
- public class Gy_ClassTimePrjController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
-
-
- /// <summary>
- /// 杩斿洖鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where 1=1 ", "h_v_Gy_ClassTimePrjList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_ClassTimePrjList where 1=1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjList");
- }
- 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;
- }
- }
- /// <summary>
- /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
-
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjListDetail where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjListDetail");
- 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;
- }
- }
-
- //
-
-
-
- /// <summary>
- ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- /////鍙傛暟锛歴tring sql銆�
- /////杩斿洖鍊硷細object銆�
- ///// </summary>
- //[Route("Gy_ClassTimePrj/AddNew")]
- //[HttpPost]
- //public object AddNew([FromBody] JObject oMain)
- //{
- // try
- // {
- // var _value = oMain["oMain"].ToString();
- // string msg1 = _value.ToString();
- // //鍙嶅簭鍒楀寲
- // msg1 = "[" + msg1.ToString() + "]";
-
- // DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- // DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
- // List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg1);
-
- // long HItemID = list[0].HItemID;
- // string HNumber = list[0].HNumber;
- // string HName = list[0].HName;
- // long hparentid = list[0].hparentid; ;
- // long HDeptID = list[0].HDeptID; ;
- // long HGroupID = list[0].HGroupID;
- // bool HStopflag = list[0].HStopflag;
- // string HRemark = list[0].HRemark;
-
- // if (!DBUtility.ClsPub.AllowNumber(HNumber))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- // oCN.BeginTran();
- // //涓昏〃
- // oCN.RunProc("Insert into Gy_ClassTimePrj" +
- // " (HNumber,HName,HParentID" +
- // ",HStopflag,HRemark,HDeptID,HGroupID) " +
- // " Values('" + HNumber + "','" + HName + "'," + hparentid.ToString() +
- // "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
- // , ref DBUtility.ClsPub.sExeReturnInfo);
- // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- // oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- // oCN.Commit();
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- // //objJsonResult.data = null;
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + e.Message;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
-
- /// <summary>
- /// 淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/ModifyByID")]
- [HttpPost]
- public object ModifyByID([FromBody] JObject oMain)
- {
- try
- {
- DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
-
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
- //鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg2);
-
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- long hparentid = list[0].hparentid; ;
- long HDeptID = list[0].HDeptID; ;
- long HGroupID = list[0].HGroupID;
- bool HStopflag = list[0].HStopflag;
- string HRemark = list[0].HRemark;
-
- ////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- //if (!DBUtility.ClsPub.AllowNumber(HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- //if (oDept.HavSameNumber(HItemID, HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
- {
- oCN.BeginTran();
- oCN.RunProc("Insert into Gy_ClassTimePrj" +
- " (HNumber,HName,hparentid" +
- ",HStopflag,HRemark,HDeptID,HGroupID) " +
- " Values('" + HNumber + "','" + HName + "'," + hparentid.ToString() +
- "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
- , ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrj set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else {
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Gy_ClassTimePrj set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",hparentid=" + hparentid.ToString() +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HDeptID=" + HDeptID.ToString() +
- ",HGroupID=" + HGroupID.ToString() +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_ClassTimePrj set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- //
- oCN.Commit();
- }
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- /// <summary>
- /// 浠撳簱鍒楄〃鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetGy_ClassTimePrj")]
- [HttpGet]
- public object DeltetGy_ClassTimePrj(string HItemID)
- {
- DataSet ds;
- DataSet ds1;
- try
- {
- //鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (string.IsNullOrWhiteSpace(HItemID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HItemID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_ClassTimePrj where HItemID=" + HItemID, "Gy_ClassTimePrj");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- ds1 = oCN.RunProcReturn("Select HItemID from Gy_ClassTimePrj Where HParentID='" + HItemID + "'", "Gy_ClassTimePrj");
- if (ds1.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
- if (HUseFlag == "宸蹭娇鐢�")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- oCN.RunProc("delete from Gy_ClassTimePrj where HItemID=" + HItemID);
- oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult; ;
-
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
similarity index 97%
rename from WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
rename to "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
index 3e0aa8b..428bbbb 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
@@ -139,7 +139,7 @@
string HSumWorkTimes = list[0].HSumWorkTimes;
string HRate = list[0].HRate;
decimal HSumMoney = list[0].HSumMoney;
- DateTime HYear = list[0].HYear;
+ string HYear = list[0].HYear;
decimal HPeriod = list[0].HSumMoney;
decimal HOldRate = list[0].HOldRate;
//淇濆瓨
@@ -155,7 +155,7 @@
"," + HRate + "," + HSumMoney.ToString() + "," + HYear.ToString() + "," + HPeriod.ToString() +
"," + HOldRate.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else {
@@ -176,7 +176,7 @@
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
}
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
index d49c5dd..3aef35c 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
@@ -13,7 +13,7 @@
public string HName { get; set; }
public string HNumber { get; set; }
public long hparentid { get; set; }
- public DateTime HYear { get; set; }
+ public string HYear { get; set; }
public decimal HPeriod { get; set; }
public decimal HSumMoney { get; set; }
public string HSumWorkTimes { get; set; }
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 9a7365c..1594a73 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -279,7 +279,6 @@
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -351,6 +350,7 @@
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
<Compile Include="Controllers\PurchaseOrderController.cs" />
--
Gitblit v1.9.1