From e6dab7f54698538c7415e057ff784daf6484db89 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 27 十月 2021 16:58:05 +0800
Subject: [PATCH] 1
---
LMES/ClsShowMod.cs | 8
MES/bin/Debug/Interop.gregn6Lib.dll | 0
MES/bin/Debug/Model.dll | 0
WebAPI/WebAPI.csproj.user | 2
MES/bin/Debug/MES.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 4
MES/bin/Debug/DAL.pdb | 0
WebAPI/Models/Gy_OrderLevList.cs | 28 +
MES/bin/Debug/Model.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 4
WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs | 99 ++-
WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs | 4
MES/bin/Debug/AxInterop.gregn6Lib.dll | 0
MES/bin/Debug/DAL.dll | 0
WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs | 368 ++++++++++++++
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 4
WebAPI/Models/Gy_OrderBackInfo.cs | 27 +
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache | 0
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 6
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 37 +
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 4
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs | 427 ++++++++++++++++
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 4
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 4
MES/bin/Debug/MES.exe | 0
/dev/null | 33 -
MES/bin/Debug/WarM.pdb | 0
WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs | 376 ++++++++++----
BaseSet/BaseSet.csproj.user | 1
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 4
MES/bin/Debug/BLL.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 10
WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs | 1
MES/bin/Debug/WarM.dll | 0
MES/bin/Debug/BLL.pdb | 0
WebAPI/WebAPI.csproj | 13
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 22
LMES/LMES.csproj | 22
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs | 15
40 files changed, 1,267 insertions(+), 262 deletions(-)
diff --git a/BaseSet/BaseSet.csproj.user b/BaseSet/BaseSet.csproj.user
index eca3abc..b159ef0 100644
--- a/BaseSet/BaseSet.csproj.user
+++ b/BaseSet/BaseSet.csproj.user
@@ -9,6 +9,5 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
- <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
index 089d37c..7a40204 100644
--- a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
Binary files differ
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 41b473c..be9a43c 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -6607,15 +6607,8 @@
return;
try
{
- MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
switch (gnsy.ToLower())
{
- case "gy_dotcheck"://点检项目
- Gy_DotCheck oGy_DotCheck = new Gy_DotCheck();
- oGy_DotCheck.MdiParent = oMain;
- oGy_DotCheck.Show();
- oMainForm.AddTabPage(oGy_DotCheck);
- break;
case "gy_basedemo":
//权限
Gy_BaseDemo oGy_BaseDemo = new Gy_BaseDemo();
@@ -7688,7 +7681,6 @@
oGy_QCCheckItem.Show();
oMainForm.AddTabPage(oGy_QCCheckItem);
break;
-
case "":
//
break;
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index c001e8c..afd99a9 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -11,21 +11,6 @@
<AssemblyName>LMES</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -235,13 +220,6 @@
<Project>{38499782-d273-45ee-a5a4-19ac1fc36444}</Project>
<Name>WorkM</Name>
</ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/LMES/LMES.csproj.user b/LMES/LMES.csproj.user
deleted file mode 100644
index 51efb67..0000000
--- a/LMES/LMES.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <PublishUrlHistory />
- <InstallUrlHistory />
- <SupportUrlHistory />
- <UpdateUrlHistory />
- <BootstrapperUrlHistory />
- <ErrorReportUrlHistory />
- <FallbackCulture>zh-CN</FallbackCulture>
- <VerifyUploadedFiles>false</VerifyUploadedFiles>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/MES/bin/Debug/AxInterop.gregn6Lib.dll b/MES/bin/Debug/AxInterop.gregn6Lib.dll
index 08ebd4b..a99c570 100644
--- a/MES/bin/Debug/AxInterop.gregn6Lib.dll
+++ b/MES/bin/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/MES/bin/Debug/BLL.dll b/MES/bin/Debug/BLL.dll
index d1e02c5..78eb782 100644
--- a/MES/bin/Debug/BLL.dll
+++ b/MES/bin/Debug/BLL.dll
Binary files differ
diff --git a/MES/bin/Debug/BLL.pdb b/MES/bin/Debug/BLL.pdb
index daf590c..0592720 100644
--- a/MES/bin/Debug/BLL.pdb
+++ b/MES/bin/Debug/BLL.pdb
Binary files differ
diff --git a/MES/bin/Debug/DAL.dll b/MES/bin/Debug/DAL.dll
index 8124f11..4fbb83d 100644
--- a/MES/bin/Debug/DAL.dll
+++ b/MES/bin/Debug/DAL.dll
Binary files differ
diff --git a/MES/bin/Debug/DAL.pdb b/MES/bin/Debug/DAL.pdb
index eb3563b..51d7163 100644
--- a/MES/bin/Debug/DAL.pdb
+++ b/MES/bin/Debug/DAL.pdb
Binary files differ
diff --git a/MES/bin/Debug/Interop.gregn6Lib.dll b/MES/bin/Debug/Interop.gregn6Lib.dll
index f9b4c2c..d47045d 100644
--- a/MES/bin/Debug/Interop.gregn6Lib.dll
+++ b/MES/bin/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/MES/bin/Debug/MES.exe b/MES/bin/Debug/MES.exe
index 5fe763c..e46240e 100644
--- a/MES/bin/Debug/MES.exe
+++ b/MES/bin/Debug/MES.exe
Binary files differ
diff --git a/MES/bin/Debug/MES.pdb b/MES/bin/Debug/MES.pdb
index 9d7bb33..ce51091 100644
--- a/MES/bin/Debug/MES.pdb
+++ b/MES/bin/Debug/MES.pdb
Binary files differ
diff --git a/MES/bin/Debug/Model.dll b/MES/bin/Debug/Model.dll
index f6e035b..d00ded3 100644
--- a/MES/bin/Debug/Model.dll
+++ b/MES/bin/Debug/Model.dll
Binary files differ
diff --git a/MES/bin/Debug/Model.pdb b/MES/bin/Debug/Model.pdb
index 72cae54..f9a4c46 100644
--- a/MES/bin/Debug/Model.pdb
+++ b/MES/bin/Debug/Model.pdb
Binary files differ
diff --git a/MES/bin/Debug/WarM.dll b/MES/bin/Debug/WarM.dll
index 2df66b1..333dce0 100644
--- a/MES/bin/Debug/WarM.dll
+++ b/MES/bin/Debug/WarM.dll
Binary files differ
diff --git a/MES/bin/Debug/WarM.pdb b/MES/bin/Debug/WarM.pdb
index f85e500..fecedb1 100644
--- a/MES/bin/Debug/WarM.pdb
+++ b/MES/bin/Debug/WarM.pdb
Binary files differ
diff --git a/MES/bin/Debug/stdole.dll b/MES/bin/Debug/stdole.dll
deleted file mode 100644
index e46a32c..0000000
--- a/MES/bin/Debug/stdole.dll
+++ /dev/null
Binary files differ
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
new file mode 100644
index 0000000..4e46692
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
@@ -0,0 +1,368 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Gy_OrderBackInfoController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 璁㈠崟鍙嶉鐘舵�佸垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 杩斿洖璁㈠崟鍙嶉鐘舵�佸垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderBackInfo/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere, "h_v_Gy_OrderBackInfoList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_OrderBackInfoList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderBackInfoList");
+ }
+ 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
+
+ #region 璁㈠崟鍙嶉鐘舵�佹牴鎹爲鍨婭D鏌ヨ鎵�鏈夊眰绾у垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 鏍规嵁鏍戝瀷ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderBackInfo/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ //ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_Gy_OrderBackInfoList WHERE HitemID=" + HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_Gy_OrderBackInfoList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_Gy_OrderBackInfoList");
+ 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
+
+ #region 鍒犻櫎璁㈠崟鍙嶉鐘舵��
+ /// <summary>
+ /// 璁㈠崟鍙嶉鐘舵�佸垪琛ㄥ垹闄ゆ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderBackInfo/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+
+ try
+ {
+ ds = oCN.RunProcReturn("delete from Gy_OrderBackInfo where HItemID = " + HItemID, "Gy_OrderBackInfo");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ 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 璁㈠崟鍙嶉鐘舵�佹柊澧炰繚瀛�
+ /// <summary>
+ /// 璁㈠崟鍙嶉鐘舵��-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderBackInfo/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+
+ List<Gy_OrderBackInfo> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderBackInfo>>(msg1);
+
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ bool HUseFlag = list[0].HUseFlag;
+
+ 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_OrderBackInfo " +
+ "(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag) " +
+ " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
+ ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�')");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_OrderBackInfo 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;
+ }
+ }
+ #endregion
+
+ #region 璁㈠崟鍙嶉鐘舵�佷慨鏀逛繚瀛�
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderBackInfo/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+
+ 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_OrderBackInfo> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderBackInfo>>(msg2);
+
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ bool HUseFlag = list[0].HUseFlag;
+
+
+ //鍒ゆ柇鏉冮檺
+ 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;
+ //}
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_OrderBackInfo set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + Convert.ToString(HStopflag ? 1 : 0) + "'" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_OrderBackInfo 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;
+ }
+ }
+ #endregion
+
+ #region 璁㈠崟鍙嶉鐘舵�佷慨鏀硅幏鍙栫粦瀹氭暟鎹�
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderBackInfo/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_OrderBackInfo where HItemID=" + HInterID, "Gy_OrderBackInfo");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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
+
+ #region 璁㈠崟鍙嶉鐘舵�佽幏鍙栨爲鍨嬪垪琛ㄦ暟鎹�
+ [Route("Gy_OrderBackInfo/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoLoadTree", "h_v_Gy_OrderBackInfoLoadTree");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
new file mode 100644
index 0000000..d68528f
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
@@ -0,0 +1,427 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Gy_OrderLevController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 璁㈠崟绛夌骇鍒楄〃鏁版嵁
+ /// <summary>
+ /// 杩斿洖璁㈠崟绛夌骇鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderLev/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere, "h_v_Gy_OrderLevList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_OrderLevList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderLevList");
+ }
+ 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
+
+ #region 璁㈠崟绛夌骇鏍规嵁鏍戝瀷ID鏌ヨ鎵�鏈夊眰绾у垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 鏍规嵁鏍戝瀷ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderLev/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ //ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_Gy_OrderLevList WHERE HitemID=" + HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_Gy_OrderLevList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_Gy_OrderLevList");
+ 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
+
+ #region 鍒犻櫎璁㈠崟绛夌骇
+ /// <summary>
+ /// 璁㈠崟绛夌骇鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderLev/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+ DAL.ClsGy_OrderLev_Ctl oDept = new DAL.ClsGy_OrderLev_Ctl();
+ DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oDeptHlp.GetInfoByID(HItemID))
+ {
+ if (oDept.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oDept.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ 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 璁㈠崟绛夌骇鏂板淇濆瓨
+ /// <summary>
+ /// 璁㈠崟绛夌骇-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderLev/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+
+ DAL.ClsGy_OrderLev_Ctl oDept = new DAL.ClsGy_OrderLev_Ctl();
+ DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
+
+
+
+ List<Gy_OrderLevList> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderLevList>>(msg1);
+
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ string HYX = list[0].HYX;
+ bool HStopflag = list[0].HStopflag;
+ bool HUseFlag = list[0].HUseFlag;
+
+ 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_OrderLev " +
+ "(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HYX) " +
+ " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
+ ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�','" + HYX + "')");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_OrderLev 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;
+ }
+ }
+ #endregion
+
+ #region 璁㈠崟绛夌骇淇敼淇濆瓨
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderLev/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ DAL.ClsGy_OrderLev_Ctl oDept = new DAL.ClsGy_OrderLev_Ctl();
+ DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_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_OrderLevList> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderLevList>>(msg2);
+
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HYX = list[0].HYX;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ bool HUseFlag = list[0].HUseFlag;
+
+
+ //鍒ゆ柇鏉冮檺
+ 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;
+ }
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_OrderLev set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HYX='" + HYX + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + Convert.ToString(HStopflag ? 1 : 0) + "'" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_OrderLev 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;
+ }
+ }
+ #endregion
+
+ #region 璁㈠崟绛夌骇淇敼鑾峰彇缁戝畾鏁版嵁
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_OrderLev/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_OrderLev where HItemID=" + HInterID, "Gy_OrderLev");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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
+
+ #region 璁㈠崟绛夌骇鑾峰彇鏍戝瀷鍒楄〃鏁版嵁
+ [Route("Gy_OrderLev/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevLoadTree", "h_v_Gy_OrderLevLoadTree");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
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/Xt_DataDictionary_ProcController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
deleted file mode 100644
index 75c4796..0000000
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
+++ /dev/null
@@ -1,411 +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 Xt_DataDictionary_ProcController : 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("Xt_DataDictionary_Proc/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Proc where 1=1 ", "h_v_IF_DataDictionary_Proc");
- }
- else
- {
- string sql1 = "select * from h_v_IF_DataDictionary_Proc where 1=1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Proc");
- }
- 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("Xt_DataDictionary_Proc/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_ProcDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_ProcDetail");
- 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>
- /// 鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetXt_DataDictionary_Proc")]
- [HttpGet]
- public object DeltetXt_DataDictionary_Proc(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 h_v_IF_DataDictionary_Proc where HItemID=" + HItemID, "h_v_IF_DataDictionary_Proc");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //ds1 = oCN.RunProcReturn("Select HItemID from h_v_IF_DataDictionary_View Where HParentID='" + HItemID + "'", "h_v_IF_DataDictionary_View");
- //if (ds1.Tables[0].Rows.Count != 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
- oCN.RunProc("delete from h_v_IF_DataDictionary_Proc 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;
- }
- }
-
-
-
- /// <summary>
- /// 绂佺敤鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Xt_DataDictionary_Proc/JY_Json")]
- [HttpGet]
- public object JY_Json(long HItemID)
- {
- try
- {
- ds = oCN.RunProcReturn("update Xt_DataDictionary_Proc set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_Proc");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- 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;
- }
- }
-
- /// <summary>
- /// 鍙嶇鐢ㄦ寜閽�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Xt_DataDictionary_Proc/FJY_Json")]
- [HttpGet]
- public object FJY_Json(long HItemID)
- {
- try
- {
- ds = oCN.RunProcReturn("update Xt_DataDictionary_Proc set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_Proc");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- 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;
- }
- }
-
- ///// <summary>
- ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- /////鍙傛暟锛歴tring sql銆�
- /////杩斿洖鍊硷細object銆�
- ///// </summary>
- //[Route("Xt_DataDictionary_View/AddBill")]
- //[HttpPost]
- //public object AddBill([FromBody] JObject oMain)
- //{
- // try
- // {
- // var _value = oMain["oMain"].ToString();
- // string msg1 = _value.ToString();
- // //鍙嶅簭鍒楀寲
- // msg1 = "[" + msg1.ToString() + "]";
-
- // //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- // //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
-
-
-
- // List<Xt_DataDictionary_View> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_View>>(msg1);
-
- // long HItemID = list[0].HItemID;
- // long HModNameID = list[0].HModNameID;
- // long HBillTypeID = list[0].HBillTypeID;
- // string HViewName = list[0].HViewName;
- // string HViewCaption = list[0].HViewCaption;
- // string HRemark = list[0].HRemark;
- // bool HStopflag = list[0].HStopflag;
- // DateTime HMakeTime = list[0].HMakeTime;
- // string HMakeEmp = list[0].HMakeEmp;
- // DateTime HModifyTime = list[0].HModifyTime;
- // string HModifyEmp = list[0].HModifyEmp;
-
-
- // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- // oCN.BeginTran();
- // //涓昏〃
- // oCN.RunProc("Insert Into Xt_DataDictionary_View " +
- // "(HModNameID,HBillTypeID,HViewName,HViewCaption,HRemark" +
- // ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
- // ",HModifyEmp" +
- // ") " +
- // " values(" + HModNameID + "," + HBillTypeID + "," + HBillTypeID + ",'" + HViewName + "','" + HViewCaption + "'"+
- // ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
- // ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
- // ") ");
- // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = null;
- // 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("Xt_DataDictionary_Proc/AddBill1")]
- [HttpPost]
- public object AddBill1([FromBody] JObject oMain)
- {
-
- try
- {
- //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_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<Xt_DataDictionary_Proc> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Proc>>(msg2);
-
- long HItemID = list[0].HItemID;
- long HModNameID = list[0].HModNameID;
- long HBillTypeID = list[0].HBillTypeID;
- string HProcName = list[0].HProcName;
- string HProcCaption = list[0].HProcCaption;
- string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- DateTime HMakeTime = list[0].HMakeTime;
- string HMakeEmp = list[0].HMakeEmp;
- DateTime HModifyTime = list[0].HModifyTime;
- string HModifyEmp = list[0].HModifyEmp;
-
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
- {
- //鏂板
- oCN.BeginTran();
- oCN.RunProc("Insert Into Xt_DataDictionary_Proc " +
- "(HModNameID,HBillTypeID,HProcName,HProcCaption,HRemark" +
- ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
- ",HModifyEmp" +
- ") " +
- " values(" + HModNameID + "," + HBillTypeID + ",'" + HProcName + "','" + HProcCaption + "'" +
- ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
- ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
- ") ", ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Xt_DataDictionary_Proc set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else
- {
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Xt_DataDictionary_Proc set " +
- " HModNameID= "+ HModNameID +
- " HBillTypeID= " + HBillTypeID +
- ",HProcName='" + HProcName + "'" +
- ",HProcCaption='" + HProcCaption + "'" +
- ",HRemark='" + HRemark + "'" +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HMakeTime='" + HMakeTime + "'" +
- ",HMakeEmp='" + HMakeEmp + "'" +
- ",HModifyTime='" + HModifyTime + "'" +
- ",HModifyEmp='" + HModifyEmp + "'" +
- //",HUpdater='" + HUpdater + "'" +
- //",HUpdateDate= getdate()" +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Xt_DataDictionary_Proc set HStopflag=0 where HItemID=" + HItemID, 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;
- }
- }
-
-
-
-
-
- //
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
index 45e70b1..c7c581e 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
@@ -19,42 +19,33 @@
/// <summary>
- /// 杩斿洖鍒楄〃
+ /// 杩斿洖閮ㄩ棬鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
[Route("Xt_DataDictionary_Table/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string Organization)
{
try
{
+ string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Table where 1=1 ", "h_v_IF_DataDictionary_Table");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
}
else
{
- string sql1 = "select * from h_v_IF_DataDictionary_Table where 1=1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Table");
+ string sql = sql1 + sWhere + "order by HItemID desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
}
- 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;
- }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
}
catch (Exception e)
{
@@ -65,19 +56,20 @@
return objJsonResult;
}
}
+
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Xt_DataDictionary_Table/cx")]
+ [Route("Gy_Department/cx")]
[HttpGet]
public object cx(long HInterID)
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_TableDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_TableDetail");
+ ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentListDetail where HitemID = " + HInterID, "h_v_IF_DepartmentListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -106,15 +98,15 @@
}
/// <summary>
- /// 鍒犻櫎鍔熻兘
+ /// 閮ㄩ棬鍒楄〃鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
- [Route("DeltetXt_DataDictionary_Table")]
+ [Route("DeltetGy_Department")]
[HttpGet]
- public object DeltetXt_DataDictionary_Table(string HItemID)
+ public object DeltetGy_Department(string HItemID)
{
DataSet ds;
- //DataSet ds1;
+ DataSet ds1;
try
{
//鍒犻櫎鏉冮檺
@@ -137,7 +129,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Xt_DataDictionary_Table where HItemID=" + HItemID, "Xt_DataDictionary_Table");
+ ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Department");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -146,18 +138,37 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //ds1 = oCN.RunProcReturn("Select HItemID from Xt_DataDictionary_Table Where HParentID='" + HItemID + "'", "Xt_DataDictionary_Table");
- //if (ds1.Tables[0].Rows.Count != 0)
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_Department Where HParentID='" + HItemID + "'", "Gy_Department");
+ 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;
+ }
+ //v
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
//{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
// objJsonResult.code = "0";
// objJsonResult.count = 0;
- // objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
// objJsonResult.data = null;
// return objJsonResult;
//}
-
-
- oCN.RunProc("delete from Xt_DataDictionary_Table where HItemID=" + HItemID);
+
+ oCN.RunProc("delete from Gy_Department where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -176,20 +187,26 @@
}
}
-
+ //[Route("Gy_Department/LoadTree")]
+ //[HttpGet]
+ //public object LoadTree_Json()
+ //{
+ // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
+ //}
+
/// <summary>
- /// 绂佺敤鎸夐挳
+ /// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Xt_DataDictionary_Table/JY_Json")]
+ [Route("Gy_Department/JY_Json")]
[HttpGet]
public object JY_Json(long HItemID)
{
try
{
- ds = oCN.RunProcReturn("update Xt_DataDictionary_Table set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_Table");
+ ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID = " + HItemID, "Gy_Department");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -208,17 +225,17 @@
}
/// <summary>
- /// 鍙嶇鐢ㄦ寜閽�
+ /// 閮ㄩ棬鍒楄〃鍙嶇鐢ㄦ寜閽�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Xt_DataDictionary_Table/FJY_Json")]
+ [Route("Gy_Department/FJY_Json")]
[HttpGet]
public object FJY_Json(long HItemID)
{
try
{
- ds = oCN.RunProcReturn("update Xt_DataDictionary_Table set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_Table");
+ ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID = " + HItemID, "Gy_Department");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -241,7 +258,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Xt_DataDictionary_Table/AddBill")]
+ [Route("Gy_Department/AddBill")]
[HttpPost]
public object AddBill([FromBody] JObject oMain)
{
@@ -252,49 +269,69 @@
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
- //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+ DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
- List<Xt_DataDictionary_Table> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Table>>(msg1);
+ List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
long HItemID = list[0].HItemID;
- long HModNameID = list[0].HModNameID;
- long HBillTypeID = list[0].HBillTypeID;
- string HTableName = list[0].HTableName;
- string HTableCaption = list[0].HTableCaption;
- string HFieldName = list[0].HFieldName;
- string HFieldCaption = list[0].HFieldCaption;
- string HDataType = list[0].HDataType;
- string HDefaultValue = list[0].HDefaultValue;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- DateTime HMakeTime = list[0].HMakeTime;
- string HMakeEmp = list[0].HMakeEmp;
- DateTime HModifyTime = list[0].HModifyTime;
- string HModifyEmp = list[0].HModifyEmp;
+ string HUseFlag = list[0].HUseFlag;
+ long HParentID = list[0].HParentID;
+ string HBarCode = list[0].HBarCode;
+ string HHelpCode = list[0].HHelpCode;
+ long HSecManagerID = list[0].HSecManagerID;
+ string HCreator = list[0].HCreator;
+ long HCreateOrgID = list[0].HCreateOrgID;
+ //DateTime HCreateDate = list[0].HCreateDate;
+ long HUseOrgID = list[0].HUseOrgID;
+ string HUpdater = list[0].HUpDater;
+ //DateTime HUpdateDate = list[0].HUpDateDate;
+ string HChecker = list[0].HChecker;
+ //DateTime HCheckDate = list[0].HCheckDate;
+ string HDeleteMan = list[0].HDeleteMan;
+ //DateTime HDeleteDate = list[0].HDeleteDate;
+
+
+ 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 Xt_DataDictionary_Table " +
- "(HModNameID,HBillTypeID,HTableName,HTableCaption" +
- ",HFieldName,HFieldCaption,HDataType,HDefaultValue,HRemark" +
- ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
- ",HModifyEmp" +
+ oCN.RunProc("Insert Into Gy_Department " +
+ "(HNumber,HShortNumber,HName,HParentID" +
+ ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
+ ",HCREATEORGID,HUSEORGID,HBarCode,HCreator" +
+ ",HUpdater,HChecker,HDeleteMan" +
+ ",HSecManagerID,HCreateDate" +
") " +
- " values(" + HModNameID + "," + HBillTypeID + ",'" + HTableName + "'"+
- ",'" + HTableCaption + "','" + HFieldName + "','" + HFieldCaption + "','" + HDataType + "'" +
- ",'" + HDefaultValue + "','" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
- ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
+ " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
+ ",'',0,'" + HRemark + "',0,''" +
+ "," + HCreateOrgID + "," + HUseOrgID + ",'" + HBarCode + "','" + HCreator + "'" +
+ ",'" + HUpdater + "','" + HChecker + "','" + HDeleteMan + "'" +
+ "," + HSecManagerID + ", getdate()" +
") ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
@@ -314,42 +351,82 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Xt_DataDictionary_Table/AddBill1")]
+ [Route("Gy_Department/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
try
{
- //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+ DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_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 msg3 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
- List<Xt_DataDictionary_Table> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Table>>(msg2);
+ List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
long HItemID = list[0].HItemID;
- long HModNameID = list[0].HModNameID;
- long HBillTypeID = list[0].HBillTypeID;
- string HTableName = list[0].HTableName;
- string HTableCaption = list[0].HTableCaption;
- string HFieldName = list[0].HFieldName;
- string HFieldCaption = list[0].HFieldCaption;
- string HDataType = list[0].HDataType;
- string HDefaultValue = list[0].HDefaultValue;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
string HRemark = list[0].HRemark;
+ string HUseFlag = list[0].HUseFlag;
+ long HParentID = list[0].HParentID;
+ string HBarCode = list[0].HBarCode;
+ string HHelpCode = list[0].HHelpCode;
+ string HUpDater = list[0].HUpDater;
+ long HEmpID = list[0].HEmpID;
bool HStopflag = list[0].HStopflag;
- DateTime HMakeTime = list[0].HMakeTime;
- string HMakeEmp = list[0].HMakeEmp;
- DateTime HModifyTime = list[0].HModifyTime;
- string HModifyEmp = list[0].HModifyEmp;
+ long HSecManagerID = list[0].HSecManagerID;
+ //string HCreator = list[0].HCreator;
+ long HCreateOrgID = list[0].HCreateOrgID;
+ //DateTime HCreateDate = list[0].HCreateDate;
+ long HUseOrgID = list[0].HUseOrgID;
+ string HUpdater = list[0].HUpDater;
+ //DateTime HUpdateDate = list[0].HUpDateDate;
+ string HChecker = list[0].HChecker;
+ //DateTime HCheckDate = list[0].HCheckDate;
+ string HDeleteMan = list[0].HDeleteMan;
+ //DateTime HDeleteDate = list[0].HDeleteDate;
+ long HLevel = 1;
+ bool HEndFlag = true;
+ long HEntityID = 1;
+
+ //鍒ゆ柇鏉冮檺
+ //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;
+ //}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -357,46 +434,35 @@
{
//鏂板
oCN.BeginTran();
- oCN.RunProc("Insert Into Xt_DataDictionary_Table " +
- "(HModNameID,HBillTypeID,HTableName,HTableCaption" +
- ",HFieldName,HFieldCaption,HDataType,HDefaultValue,HRemark" +
- ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
- ",HModifyEmp" +
- ") " + " values(" + HModNameID + "," + HBillTypeID + ",'" + HTableName + "'" +
- ",'" + HTableCaption + "','" + HFieldName + "','" + HFieldCaption + "','" + HDataType + "'" +
- ",'" + HDefaultValue + "','" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
- ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
- ") ", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Insert into Gy_Department " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
+ "," + HEntityID.ToString() + "," + HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Xt_DataDictionary_Table set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else
{
oCN.BeginTran();
//涓昏〃
- oCN.RunProc("Update Xt_DataDictionary_Table set " +
- " HModNameID= "+ HModNameID +
- " HBillTypeID= " + HBillTypeID +
- ",HTableName='" + HTableName + "'" +
- ",HTableCaption='" + HTableCaption + "'" +
- ",HFieldName='" + HFieldName + "'" +
- ",HDataType='" + HDataType + "'" +
- ",HFieldName='" + HFieldName + "'" +
- ",HFieldCaption='" + HFieldCaption + "'" +
- //",HRemark='" + HRemark + "'" +
+ oCN.RunProc("Update Gy_Department set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HParentID=" + HParentID +
+ ",HEmpID=" + HEmpID.ToString() +
",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HMakeTime='" + HMakeTime + "'" +
- ",HMakeEmp='" + HMakeEmp + "'" +
- ",HModifyTime='" + HModifyTime + "'" +
- ",HModifyEmp='" + HModifyEmp + "'" +
//",HUpdater='" + HUpdater + "'" +
//",HUpdateDate= getdate()" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Xt_DataDictionary_Table set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
objJsonResult.code = "0";
@@ -417,7 +483,91 @@
}
}
+ /// <summary>
+ /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/GetMAXBillID")]
+ [HttpGet]
+ public object GetMAXBillID()
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Department", "Gy_Department");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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_Department/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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;
+ }
+ }
+
+
+
+ [Route("Gy_Department/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+ ds = oCN.RunProcReturn("select * from h_v_DepartmentLoadTree", "h_v_DepartmentLoadTree");
+ 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;
+ }
+ }
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
deleted file mode 100644
index f4b8ec3..0000000
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
+++ /dev/null
@@ -1,411 +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 Xt_DataDictionary_ViewController : 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("Xt_DataDictionary_View/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 ", "h_v_IF_DataDictionary_View");
- }
- else
- {
- string sql1 = "select * from h_v_IF_DataDictionary_View where 1=1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_View");
- }
- 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("Xt_DataDictionary_View/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_ViewDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_ViewDetail");
- 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>
- /// 鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetXt_DataDictionary_View")]
- [HttpGet]
- public object DeltetXt_DataDictionary_View(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 h_v_IF_DataDictionary_View where HItemID=" + HItemID, "h_v_IF_DataDictionary_View");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //ds1 = oCN.RunProcReturn("Select HItemID from h_v_IF_DataDictionary_View Where HParentID='" + HItemID + "'", "h_v_IF_DataDictionary_View");
- //if (ds1.Tables[0].Rows.Count != 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
- oCN.RunProc("delete from h_v_IF_DataDictionary_View 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;
- }
- }
-
-
-
- /// <summary>
- /// 绂佺敤鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Xt_DataDictionary_View/JY_Json")]
- [HttpGet]
- public object JY_Json(long HItemID)
- {
- try
- {
- ds = oCN.RunProcReturn("update Xt_DataDictionary_View set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_View");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- 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;
- }
- }
-
- /// <summary>
- /// 鍙嶇鐢ㄦ寜閽�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Xt_DataDictionary_View/FJY_Json")]
- [HttpGet]
- public object FJY_Json(long HItemID)
- {
- try
- {
- ds = oCN.RunProcReturn("update Xt_DataDictionary_View set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_View");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- 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;
- }
- }
-
- ///// <summary>
- ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- /////鍙傛暟锛歴tring sql銆�
- /////杩斿洖鍊硷細object銆�
- ///// </summary>
- //[Route("Xt_DataDictionary_View/AddBill")]
- //[HttpPost]
- //public object AddBill([FromBody] JObject oMain)
- //{
- // try
- // {
- // var _value = oMain["oMain"].ToString();
- // string msg1 = _value.ToString();
- // //鍙嶅簭鍒楀寲
- // msg1 = "[" + msg1.ToString() + "]";
-
- // //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- // //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
-
-
-
- // List<Xt_DataDictionary_View> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_View>>(msg1);
-
- // long HItemID = list[0].HItemID;
- // long HModNameID = list[0].HModNameID;
- // long HBillTypeID = list[0].HBillTypeID;
- // string HViewName = list[0].HViewName;
- // string HViewCaption = list[0].HViewCaption;
- // string HRemark = list[0].HRemark;
- // bool HStopflag = list[0].HStopflag;
- // DateTime HMakeTime = list[0].HMakeTime;
- // string HMakeEmp = list[0].HMakeEmp;
- // DateTime HModifyTime = list[0].HModifyTime;
- // string HModifyEmp = list[0].HModifyEmp;
-
-
- // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- // oCN.BeginTran();
- // //涓昏〃
- // oCN.RunProc("Insert Into Xt_DataDictionary_View " +
- // "(HModNameID,HBillTypeID,HViewName,HViewCaption,HRemark" +
- // ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
- // ",HModifyEmp" +
- // ") " +
- // " values(" + HModNameID + "," + HBillTypeID + "," + HBillTypeID + ",'" + HViewName + "','" + HViewCaption + "'"+
- // ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
- // ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
- // ") ");
- // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = null;
- // 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("Xt_DataDictionary_View/AddBill1")]
- [HttpPost]
- public object AddBill1([FromBody] JObject oMain)
- {
-
- try
- {
- //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_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<Xt_DataDictionary_View> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_View>>(msg2);
-
- long HItemID = list[0].HItemID;
- long HModNameID = list[0].HModNameID;
- long HBillTypeID = list[0].HBillTypeID;
- string HViewName = list[0].HViewName;
- string HViewCaption = list[0].HViewCaption;
- string HRemark = list[0].HRemark;
- bool HStopflag = list[0].HStopflag;
- DateTime HMakeTime = list[0].HMakeTime;
- string HMakeEmp = list[0].HMakeEmp;
- DateTime HModifyTime = list[0].HModifyTime;
- string HModifyEmp = list[0].HModifyEmp;
-
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
- {
- //鏂板
- oCN.BeginTran();
- oCN.RunProc("Insert Into Xt_DataDictionary_View " +
- "(HModNameID,HBillTypeID,HViewName,HViewCaption,HRemark" +
- ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
- ",HModifyEmp" +
- ") " +
- " values(" + HModNameID + "," + HBillTypeID + ",'" + HViewName + "','" + HViewCaption + "'" +
- ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
- ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
- ") ", ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Xt_DataDictionary_View set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else
- {
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Xt_DataDictionary_View set " +
- " HModNameID= "+ HModNameID +
- " HBillTypeID= " + HBillTypeID +
- ",HViewName='" + HViewName + "'" +
- ",HViewCaption='" + HViewCaption + "'" +
- ",HRemark='" + HRemark + "'" +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HMakeTime='" + HMakeTime + "'" +
- ",HMakeEmp='" + HMakeEmp + "'" +
- ",HModifyTime='" + HModifyTime + "'" +
- ",HModifyEmp='" + HModifyEmp + "'" +
- //",HUpdater='" + HUpdater + "'" +
- //",HUpdateDate= getdate()" +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Xt_DataDictionary_View set HStopflag=0 where HItemID=" + HItemID, 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;
- }
- }
-
-
-
-
-
- //
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index df9c210..45d7371 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -144,7 +144,44 @@
}
+ [Route("POOrderBack")]
+ [HttpGet]
+ /// <summary>
+ /// 璁㈠崟鍙嶉鐘舵��
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ public object POOrderBack(string HmainidList, string OrderBackId)
+ {
+ try
+ {
+ string sql = "";
+ for (int i = 0; i < HmainidList.Split(',').Length; i++)
+ {
+ var Hmainid = HmainidList.Split(',')[i];
+ sql = string.Format(@"
+ update Cg_POOrderBillSub set
+ HFeedback ='{0}'
+ where HInterID = '{1}' and HEntryID = '{2}' ", OrderBackId, Hmainid.Split('-')[0], Hmainid.Split('-')[1]);
+ oCN.RunProc(sql);
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ //objJsonResult.Message = string.Join(",", HmainidList.ToArray());
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//鍒ゆ柇鏄惁瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇�
public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index de02065..a885694 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -223,7 +223,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index f4895c0..16ac781 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -224,7 +224,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 9e3ef9c..8c7ec4c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -222,7 +222,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 6dd7a94..be3b1c1 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -32,7 +32,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -409,7 +409,6 @@
public object Sc_MouldScrapInProdBillListProjectDetai(string sqlWhere)
{
DataSet ds;
- DataSet ds1;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -420,11 +419,6 @@
瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
- //鏌ユ眹鎬�
- ds1 = oCN.RunProcReturn(string.Format(@"select 妯″叿浠ｇ爜,妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,
- 鏀舵枡浠撳簱,琛ㄤ綋澶囨敞,sum(HMaterID) from h_v_Sc_MouldProdInHouseBillList group by 妯″叿浠ｇ爜,
- 妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,鏀舵枡浠撳簱,琛ㄤ綋澶囨敞"),
- "h_v_Sc_MouldProdInHouseBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -488,7 +482,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index 4e2781c..c02c96e 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -224,7 +224,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 2bd0218..8a698fb 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -32,7 +32,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -430,7 +430,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -508,7 +508,7 @@
//oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
//oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
//oItem.HRemark = ""; //澶囨敞
-
+
//oItem.HMainSourceInterID = oItem.HInterID;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index f98d851..ef0b978 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -35,7 +35,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -196,7 +196,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index 0e0cfac..c7f92e8 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -328,7 +328,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
index dc72dd6..ab795e5 100644
--- a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
+++ b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
@@ -33,8 +33,70 @@
#region 鏍规嵁妯℃不鍏锋潯鐮佹煡鎵炬ā鍏锋。妗堜俊鎭�
[Route("Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown")]
[HttpGet]
- public object txtHBarCode_KeyDown(string HBarCode,long HInterID,long HWHID,long HSPID)
+ public object txtHBarCode_KeyDown(string HBarCode)
{
+ //try
+ //{
+ // if (HBarCode == null || HBarCode.Equals(""))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // //寰楀埌淇℃伅
+ // ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
+ // //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
+ // //鍐欏叆淇℃伅
+ // if (ds == null )
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏈煡璇㈠埌妯″叿淇℃伅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // omodel.HInterID = HInterID;
+ // omodel.HBillType = "3796";
+ // omodel.HMaker = DBUtility.ClsPub.CurUserName;
+ // omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
+ // omodel.HQty = 0;
+ // omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
+ // omodel.HWhID = HWHID;
+ // omodel.HStockPlaceID = HSPID;
+ // omodel.HSourceBillNo = "1";
+ // omodel.HSourceBillType = "1";
+ // omodel.HSourceEntryID = 0;
+ // omodel.HSourceInterID = 0;
+ // if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
+ // {
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ // 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;
+ //}
try
{
if (HBarCode == null || HBarCode.Equals(""))
@@ -49,7 +111,7 @@
ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
//ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
//鍐欏叆淇℃伅
- if (ds == null )
+ if (ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -59,34 +121,11 @@
}
else
{
- omodel.HInterID = HInterID;
- omodel.HBillType = "3796";
- omodel.HMaker = DBUtility.ClsPub.CurUserName;
- omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
- omodel.HQty = 0;
- omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
- omodel.HWhID = HWHID;
- omodel.HStockPlaceID = HSPID;
- omodel.HSourceBillNo = "1";
- omodel.HSourceBillType = "1";
- omodel.HSourceEntryID = 0;
- omodel.HSourceInterID = 0;
- if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎵爜鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀛樺叆缂撳瓨琛ㄥけ璐ワ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
}
catch (Exception e)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index 71883bf..d08b222 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4222,7 +4222,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4338,7 +4338,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index e054928..653c4bd 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -223,7 +223,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
index cef2724..a8c2e7b 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -3344,6 +3344,8 @@
#region 妯″叿鎶ュ簾鍏ュ簱鍗�
+
+
#region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai")]
[HttpGet]
@@ -3440,7 +3442,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3607,6 +3609,9 @@
}
#endregion
+
+
+
#region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�
[Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA")]
@@ -3760,7 +3765,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3890,7 +3895,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4374,7 +4379,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4720,7 +4725,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
index d653986..c7e9544 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
@@ -46,14 +46,14 @@
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HDate," +
"HMaker,HMakeDate,HInnerBillNo,HRepairID,HDeptID,HRepairBeginDate,HRepairEndDate," +
"HCycleUnit,HPlanTimes,HTimes,HChangeNum,HEmpID,HManagerID,HRepairType,HSupID," +
- "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark,HChangeType" +
+ "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark" +
") " +
" values("+omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
",'" + omodel.HMaker + "',getdate()" +
",'" + omodel.HInnerBillNo+"',"+ omodel.HRepairID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate +
"','" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HChangeNum.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
",'" + omodel.HRepairType + "'," + omodel.HSupID.ToString() + "," + omodel.HNewMaterID.ToString() + ",'"+ omodel.HNewName + "','" + omodel.HNewModel + "','" + omodel.HNewModel2 + "','" + omodel.HExplanation + "','" + omodel.HRepairContent + "','" + omodel.HRemark+
- "','"+omodel.HChangeType + "') ");
+ "') ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_MouldRepairChangeBillSub oSub in DetailColl)
{
diff --git a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
index 3d19e8c..114f0e8 100644
--- a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
+++ b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
@@ -28,7 +28,6 @@
public string HNewBarCode; /*--鏀瑰埗鍚庢柊鏉＄爜*/
public string HNewDesignLife; /*--鏂拌璁″鍛�*/
public string HExplanation; /* --鏀瑰埗瑕佹眰*/
- public string HChangeType; /* --鏀瑰瀷绫诲瀷*/
public string HRemark; /* --澶囨敞*/
public string HInnerBillNo; /* --鍐呴儴鍗曟嵁鍙�*/
}
diff --git a/WebAPI/Models/Gy_OrderBackInfo.cs b/WebAPI/Models/Gy_OrderBackInfo.cs
new file mode 100644
index 0000000..9c6b05c
--- /dev/null
+++ b/WebAPI/Models/Gy_OrderBackInfo.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_OrderBackInfo
+ {
+ 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 HEndFlag { get; set; } //
+
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+
+ public string HRemark { get; set; } //澶囨敞
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
new file mode 100644
index 0000000..e5f326b
--- /dev/null
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+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 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 HYX { get; set; }//浼樺厛绾�
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Xt_DataDictionary_Proc.cs b/WebAPI/Models/Xt_DataDictionary_Proc.cs
deleted file mode 100644
index 70d4931..0000000
--- a/WebAPI/Models/Xt_DataDictionary_Proc.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace WebAPI.Models
-{
- public class Xt_DataDictionary_Proc
- {
- public long HItemID { get; set; }
- public long HModNameID { get; set; }
- public long HBillTypeID { get; set; }
- public string HProcName { get; set; }
-
- public string HProcCaption { get; set; }
- public string HRemark { get; set; }
- public bool HStopflag { get; set; }
-
- public DateTime HMakeTime { get; set; }
-
- public string HMakeEmp { get; set; }
- public DateTime HModifyTime { get; set; }
-
- public string HModifyEmp { get; set; }
- public DateTime HStopTime { get; set; }
-
- public string HStopEmp { get; set; }
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Models/Xt_DataDictionary_Table.cs b/WebAPI/Models/Xt_DataDictionary_Table.cs
deleted file mode 100644
index 037e44e..0000000
--- a/WebAPI/Models/Xt_DataDictionary_Table.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace WebAPI.Models
-{
- public class Xt_DataDictionary_Table
- {
- public long HItemID { get; set; }
- public long HModNameID { get; set; }
- public long HBillTypeID { get; set; }
- public string HTableName { get; set; }
-
- public string HTableCaption { get; set; }
-
- public string HFieldName { get; set; }
-
- public string HFieldCaption { get; set; }
-
- public string HDataType { get; set; }
-
- public string HDefaultValue { get; set; }
-
- public string HRemark { get; set; }
- public bool HStopflag { get; set; }
-
- public DateTime HMakeTime { get; set; }
-
- public string HMakeEmp { get; set; }
- public DateTime HModifyTime { get; set; }
-
- public string HModifyEmp { get; set; }
- public DateTime HStopTime { get; set; }
-
- public string HStopEmp { get; set; }
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Models/Xt_DataDictionary_View.cs b/WebAPI/Models/Xt_DataDictionary_View.cs
deleted file mode 100644
index e087e2b..0000000
--- a/WebAPI/Models/Xt_DataDictionary_View.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace WebAPI.Models
-{
- public class Xt_DataDictionary_View
- {
- public long HItemID { get; set; }
- public long HModNameID { get; set; }
- public long HBillTypeID { get; set; }
- public string HViewName { get; set; }
-
- public string HViewCaption { get; set; }
- public string HRemark { get; set; }
- public bool HStopflag { get; set; }
-
- public DateTime HMakeTime { get; set; }
-
- public string HMakeEmp { get; set; }
- public DateTime HModifyTime { get; set; }
-
- public string HModifyEmp { get; set; }
- public DateTime HStopTime { get; set; }
-
- public string HStopEmp { get; set; }
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 29c559a..2b68cc6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,10 +278,8 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
- <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
- <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
- <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
@@ -430,6 +428,8 @@
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
+ <Compile Include="Models\Gy_OrderBackInfo.cs" />
+ <Compile Include="Models\Gy_OrderLevList.cs" />
<Compile Include="Models\ClsGy_EquipFileType.cs" />
<Compile Include="Models\ClsGy_Material_Model.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
@@ -446,10 +446,6 @@
<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\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\Menu.cs" />
@@ -532,7 +528,6 @@
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
- <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 038673c..16d95e2 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>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1