From 6c1b31728b0dbafeab9b1cce19dac145b972b1b5 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 01 十一月 2021 10:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/bin/x86/Debug.zip | 0
WebAPI/Models/Gy_WorkType.cs | 34 ++
WebAPI/Models/Gy_OrderBackInfo.cs | 20 +
WebAPI/WebAPI.csproj.user | 2
DAL/计划管理/ClsGy_RoutingBill.cs | 7
WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs | 366 ++++++++++++++++++++++
WebAPI/WebAPI.csproj | 8
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 22
WebAPI/Models/Gy_WorkPayType.cs | 35 ++
WebAPI/Models/Gy_OrderLevList.cs | 46 ++
WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs | 371 +++++++++++++++++++++++
11 files changed, 882 insertions(+), 29 deletions(-)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
index b095354..112b96d 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
@@ -143,6 +143,7 @@
{
try
{
+ string orgid = DBUtility.ClsPub.HOrgID.ToString();
//寰楀埌mainid
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -201,14 +202,14 @@
",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
- ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum,HOrgID" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum" +
") " +
" values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
"," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
"," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
- ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HPRDORGID.ToString() + "','" + omodel.HVerNum.ToString() + "'," + DBUtility.ClsPub.HOrgID +
+ ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + DBUtility.ClsPub.HOrgID + "','" + omodel.HVerNum.ToString() + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -332,7 +333,7 @@
omodel.HMaterTexture = Ds.Tables[0].Rows[0]["HMaterTexture"].ToString().Trim();
omodel.HProductNum = Ds.Tables[0].Rows[0]["HProductNum"].ToString().Trim();
omodel.HVerNum = Ds.Tables[0].Rows[0]["HVerNum"].ToString().Trim();
-
+ omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"].ToString());
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Gy_RoutingBillSub Where HInterID=" + lngBillKey.ToString() + " Order by HEntryID ", "Gy_RoutingBillSub");
diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip
new file mode 100644
index 0000000..ccbd9b3
--- /dev/null
+++ b/LMES/bin/x86/Debug.zip
Binary files differ
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 6b49370..f43c15d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -39,22 +39,22 @@
string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
+ //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)
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
new file mode 100644
index 0000000..98d001b
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
@@ -0,0 +1,366 @@
+锘縰sing Model;
+using 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_WorkPayTypeController : 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_WorkPayType/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList " + sWhere, "h_v_Gy_WorkPayTypeList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
+ }
+ 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_WorkPayType/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList where HitemID=" + HInterID, "h_v_Gy_WorkPayTypeList");
+ 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_WorkType/AddBill")]
+ //[HttpPost]
+ //public object AddBill([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+ // DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
+ // DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
+ // List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg1);
+ // long HItemID = list[0].HItemID ;
+ // string HNumber = list[0].HNumber;
+ // string HName = list[0].HName;
+ // string HShortNumber = list[0].HShortNumber;
+ // long HParentID = list[0].HParentID;
+ // string HHelpCode = list[0].HHelpCode;
+ // string HRemark = list[0].HRemark;
+ // bool HStopflag = list[0].HStopflag;
+ // string HForEmp = list[0].HForEmp;
+ // //string HUseFlag = list[0].HUseFlag;
+ // var HPayMoney = list[0].HPayMoney;
+ // var HDayMoney = list[0].HDayMoney;
+ // var HEndFlag = 0;
+ // var HLevel = "";
+ // if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // //涓昏〃
+ // string sql = "Insert into Gy_WorkType " +
+ // " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
+ // ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
+ // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
+ // "," + HLevel.ToString() + "," + HEndFlag + "," + HStopflag + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")";
+ // oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // if (list[0].HItemID.ToString() != "")
+ // {
+ // oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HItemID, 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_WorkPayType/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_WorkPayType_Ctl oDept = new DAL.ClsGy_WorkPayType_Ctl();
+ DAL.ClsGy_WorkPayType_View oDeptHlp = new DAL.ClsGy_WorkPayType_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_WorkPayType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkPayType>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HHelpCode = list[0].HHelpCode;
+ string HShortNumber = "0";
+ long HParentID = list[0].HParentID;
+ var HLevel = list[0].HLevel;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ bool HEndFlag = list[0].HEndFlag;
+ string HUseFlag = list[0].HUseFlag;
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_WorkPayType " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_WorkPayType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ oCN.RunProc("Update Gy_WorkPayType set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HLevel=" + HLevel.ToString() +
+ ",HParentID=" + HParentID.ToString() +
+ ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_WorkPayType set HEndflag=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_WorkPayType")]
+ [HttpGet]
+ public object DeltetGy_WorkPayType(string HItemID)
+ {
+ DataSet ds;
+ DataSet ds1;
+ //string ModRightNameCheck = "Sc_ProcessReport_check";
+ 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_WorkPayType where HItemID=" + HItemID, "Gy_WorkPayType");
+ 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_WorkPayType Where HParentID='" + HItemID + "'", " Gy_WorkPayType");
+ 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_WorkPayType 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_WorkTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
new file mode 100644
index 0000000..f1cc28a
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
@@ -0,0 +1,371 @@
+锘縰sing Model;
+using 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_WorkTypeController : 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_WorkType/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList " + sWhere, "h_v_Gy_WorkTypeList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_WorkTypeList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkTypeList");
+ }
+ 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_WorkType/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList where HitemID=" + HInterID, "h_v_Gy_WorkTypeList");
+ 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_WorkType/AddBill")]
+ //[HttpPost]
+ //public object AddBill([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+ // DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
+ // DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
+ // List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg1);
+ // long HItemID = list[0].HItemID ;
+ // string HNumber = list[0].HNumber;
+ // string HName = list[0].HName;
+ // string HShortNumber = list[0].HShortNumber;
+ // long HParentID = list[0].HParentID;
+ // string HHelpCode = list[0].HHelpCode;
+ // string HRemark = list[0].HRemark;
+ // bool HStopflag = list[0].HStopflag;
+ // string HForEmp = list[0].HForEmp;
+ // //string HUseFlag = list[0].HUseFlag;
+ // var HPayMoney = list[0].HPayMoney;
+ // var HDayMoney = list[0].HDayMoney;
+ // var HEndFlag = 0;
+ // var HLevel = "";
+ // if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // //涓昏〃
+ // string sql = "Insert into Gy_WorkType " +
+ // " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
+ // ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
+ // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
+ // "," + HLevel.ToString() + "," + HEndFlag + "," + HStopflag + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")";
+ // oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // if (list[0].HItemID.ToString() != "")
+ // {
+ // oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HItemID, 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_WorkType/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
+ DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_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_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HHelpCode = list[0].HHelpCode;
+ string HShortNumber = "0";
+ long HParentID = list[0].HParentID;
+ var HLevel = list[0].HLevel;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ bool HEndFlag = list[0].HEndFlag;
+ string HUseFlag = list[0].HUseFlag;
+ var HDayMoney = list[0].HDayMoney;
+ var HPayMoney = list[0].HPayMoney;
+ string HForEmp = list[0].HForEmp;
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_WorkType " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ oCN.RunProc("Update Gy_WorkType set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HForEmp='" + HForEmp + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HLevel=" + HLevel.ToString() +
+ ",HParentID=" + HParentID.ToString() +
+ ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HPayMoney=" + HPayMoney.ToString() +
+ ",HDayMoney=" + HDayMoney.ToString() +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_WorkType set HEndflag=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_WorkType")]
+ [HttpGet]
+ public object DeltetGy_WorkType(string HItemID)
+ {
+ DataSet ds;
+ DataSet ds1;
+ //string ModRightNameCheck = "Sc_ProcessReport_check";
+ 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_WorkType where HItemID=" + HItemID, "Gy_WorkType");
+ 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_WorkType Where HParentID='" + HItemID + "'", " Gy_WorkType");
+ 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_WorkType 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/Models/Gy_OrderBackInfo.cs b/WebAPI/Models/Gy_OrderBackInfo.cs
index ee8bee3..ff6a493 100644
--- a/WebAPI/Models/Gy_OrderBackInfo.cs
+++ b/WebAPI/Models/Gy_OrderBackInfo.cs
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
namespace WebAPI.Models
{
public class Gy_OrderBackInfo
@@ -14,6 +22,17 @@
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
public long HEndFlag { get; set; } //
+<<<<<<< HEAD
+
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+
+ public string HRemark { get; set; } //澶囨敞
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
+=======
public string HHelpCode { get; set; } // 鍔╄鐮�
@@ -23,5 +42,6 @@
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
index dc38119..82f4f07 100644
--- a/WebAPI/Models/Gy_OrderLevList.cs
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -1,28 +1,52 @@
+<<<<<<< HEAD
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
namespace WebAPI.Models
{
public class Gy_OrderLevList
{
- public long HItemID { get; set; } ID
- public string HNumber { get; set; } 浠ｇ爜
- public string HName { get; set; } 鍚嶇О
- public string HShortNumber { get; set; } 鐭唬鐮�
- public long HParentID { get; set; } 鐖剁骇ID
- public long HLevel { get; set; } 灞傜骇
+ public long HItemID { get; set; } //ID
+ public string HNumber { get; set; } //浠ｇ爜
+ public string HName { get; set; } //鍚嶇О
+<<<<<<< HEAD
+ public string HShortNumber { get; set; } //鐭唬鐮�
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HLevel { get; set; } //灞傜骇
+ public long HEndFlag { get; set; } //
+
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+
+ public string HRemark { get; set; } //澶囨敞
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
+=======
+ public string HShortNumber { get; set; } // 鐭唬鐮�
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HLevel { get; set; } //灞傜骇
public long HEndFlag { get; set; }
- public string HHelpCode { get; set; } 鍔╄鐮�
+ public string HHelpCode { get; set; } // 鍔╄鐮�
- public string HRemark { get; set; } 澶囨敞
+ public string HRemark { get; set; } // 澶囨敞
- public bool HStopflag { get; set; } 绂佺敤鏍囧織
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
- public bool HUseFlag { get; set; } 浣跨敤鐘舵��
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
- public string HYX { get; set; }浼樺厛绾�
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+ public string HYX { get; set; }//浼樺厛绾�
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
new file mode 100644
index 0000000..8d9cb07
--- /dev/null
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_WorkPayType
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; } // 浠ｇ爜
+ public string HName { get; set; } //
+ public string HHelpCode { get; set; } //鍔╄鐮�
+ public string HShortNumber { get; set; } //鐭唬鐮�
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HLevel { get; set; }
+ public bool HEndFlag { get; set; } //鏈骇鏍囧織
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+<<<<<<< HEAD
+
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+
+
+
+=======
+
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+
+
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_WorkType.cs b/WebAPI/Models/Gy_WorkType.cs
new file mode 100644
index 0000000..34a1a24
--- /dev/null
+++ b/WebAPI/Models/Gy_WorkType.cs
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_WorkType
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; } // 浠ｇ爜
+ public string HName { get; set; } //
+ public string HHelpCode { get; set; } //鍔╄鐮�
+ public string HShortNumber { get; set; } //鐭唬鐮�
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HLevel { get; set; }
+ public bool HEndFlag { get; set; } //鏈骇鏍囧織
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+ public long HPayMoney { get; set; }
+ public long HDayMoney { get; set; }
+ public string HForEmp { get; set; } //鐭唬鐮�
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+<<<<<<< HEAD
+
+
+
+=======
+
+
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1992d69..b9a1b09 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -281,8 +281,9 @@
<Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
@@ -306,6 +307,7 @@
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
<Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
<Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
<Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -452,13 +454,13 @@
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
<Compile Include="Models\ClsGy_ProcPrice.cs" />
+ <Compile Include="Models\Gy_WorkType.cs" />
+ <Compile Include="Models\Gy_WorkPayType.cs" />
<Compile Include="Models\Xt_DataDictionary_Proc.cs" />
<Compile Include="Models\Xt_DataDictionary_View.cs" />
<Compile Include="Models\Xt_DataDictionary_Table.cs" />
<Compile Include="Models\Gy_User.cs" />
<Compile Include="Models\Gy_UserSupper.cs" />
- <Compile Include="Models\Gy_WorkPayType.cs" />
- <Compile Include="Models\Gy_WorkType.cs" />
<Compile Include="Models\Menu.cs" />
<Compile Include="Models\ModelConvertHelper.cs" />
<Compile Include="Models\Pay_OtherBalBill.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 16d95e2..038673c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1