From 98731367da8582a305024679c07089b68d36e29b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 28 七月 2022 10:32:30 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 153 +++++-------------------------
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 9 +
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 63 ++++++++++--
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 22 +++-
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 32 +++---
5 files changed, 116 insertions(+), 163 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 2e16b55..2073b09 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -189,14 +189,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HSourceID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HCenterID == 0)
{
objJsonResult.code = "0";
@@ -213,14 +213,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HWorkTimes <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HWorkTimes <= 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//if (HEmpID2 == 0 )
//{
// objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 76b2def..c9f0218 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -465,6 +465,24 @@
}
}
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ oCN.RunProc("delete from diyipi");
+
+ //涓存椂琛ㄦ坊鍔犳暟鎹�
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ oCN.RunProc(@"insert into diyipi(浜у搧浠ｇ爜,浜у搧鍚嶇О,宸ュ簭搴忓彿,宸ュ簭浠ｇ爜,宸ュ簭,宸ヤ綔涓績,鍔犲伐鏁伴噺
+ , 鑹巼, 宸ュ簭宸ヤ环, 涓嶅悎鏍煎崟浠�, 鎶ュ簾鍗曚环, 鏈亾鍥哄畾寮�宸ュぉ鏁�, 鏈亾寮�宸ヤ綑閲�, 涓婇亾绛夊緟澶╂暟
+ , 涓婇亾寰幆鍛ㄦ湡, 鑷姩杞Щ, 澶栧崗鏍囪, 渚涘簲鍟嗕唬鐮�, 渚涘簲鍟�, 宸ヨ壓鍙傛暟, 鍥剧焊缂栧彿
+ , 鏈伐搴忕‘璁よ褰�, 澶囨敞, 鍥惧彿鐗堟湰, 鎬昏鍥惧彿, 鏉愯川, 鎴愬搧缂栧彿, 鐗堟湰
+ , 妯″叿缂栧彿, 绋嬪簭鍙�, 鐝骇瀹氶, 宸ヨ壓璺嚎鍚嶇О, 鏃堕棿鍗曚綅)values
+ ('" + tb2.Rows[i]["浜у搧浠ｇ爜"].ToString() + "','" + tb2.Rows[i]["浜у搧鍚嶇О"].ToString() + "','" + tb2.Rows[i]["宸ュ簭搴忓彿"].ToString() + "','" + tb2.Rows[i]["宸ュ簭浠ｇ爜"].ToString() + "','" + tb2.Rows[i]["宸ュ簭"].ToString() + "','" + tb2.Rows[i]["宸ヤ綔涓績"].ToString() + "','" + tb2.Rows[i]["鍔犲伐鏁伴噺"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["鑹巼"].ToString() + "','" + (tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()==""?"0": tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()) + "','" + tb2.Rows[i]["涓嶅悎鏍煎崟浠�"].ToString() + "','" + tb2.Rows[i]["鎶ュ簾鍗曚环"].ToString() + "','" + tb2.Rows[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString() + "','" + tb2.Rows[i]["鏈亾寮�宸ヤ綑閲�"].ToString() + "','" + tb2.Rows[i]["涓婇亾绛夊緟澶╂暟"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["涓婇亾寰幆鍛ㄦ湡"].ToString() + "','" + tb2.Rows[i]["鑷姩杞Щ"].ToString() + "','" + tb2.Rows[i]["澶栧崗鏍囪"].ToString() + "','" + tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString() + "','" + tb2.Rows[i]["渚涘簲鍟�"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓鍙傛暟"].ToString() + "','" + tb2.Rows[i]["鍥剧焊缂栧彿"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString() + "','" + tb2.Rows[i]["澶囨敞"].ToString() + "','" + tb2.Rows[i]["鍥惧彿鐗堟湰"].ToString() + "','" + tb2.Rows[i]["鎬昏鍥惧彿"].ToString() + "','" + tb2.Rows[i]["鏉愯川"].ToString() + "','" + tb2.Rows[i]["鎴愬搧缂栧彿"].ToString() + "','" + tb2.Rows[i]["鐗堟湰"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["妯″叿缂栧彿"].ToString() + "','" + tb2.Rows[i]["绋嬪簭鍙�"].ToString() + "','" + tb2.Rows[i]["鐝骇瀹氶"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓璺嚎鍚嶇О"].ToString() + "','" + tb2.Rows[i]["鏃堕棿鍗曚綅"].ToString() + "')");
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = error;
@@ -646,138 +664,19 @@
//琛ㄥご瀛楁
omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
- //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
- List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
- List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
- foreach (JObject item in jb)
+
+ ds = oCN.RunProcReturn("select distinct 浜у搧浠ｇ爜 from diyipi ", "diyipi");
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
- Dictionary<string, string> dic = new Dictionary<string, string>();
- foreach (var itm in item.Properties())
- {
- dic.Add(itm.Name, itm.Value.ToString());
- }
- list.Add(dic);
- }
-
- var hnumber = "";
- var HBillNo = "";
- long HInterID = 0;
- int[] num = new int[2] { 1, 0 };
-
- for (int i = 0; i < list.Count; i++)
- {
- //鑾峰彇鐗╂枡鏁版嵁
- ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber='" + list[i]["浜у搧浠ｇ爜"].ToString() + "' and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
- var HMaterNumber = list[i]["浜у搧浠ｇ爜"].ToString();
- var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- var Hunitid = ds.Tables[0].Rows[0]["Hunitid"].ToString();
- var HUnitNumber = ds.Tables[0].Rows[0]["HUnitNumber"].ToString();
-
- var HName = list[i]["宸ヨ壓璺嚎鍚嶇О"].ToString();
- var HPicNumVer = list[i]["鍥惧彿鐗堟湰"].ToString();
- var HPicNumAssemble = list[i]["鎬昏鍥惧彿"].ToString();
- var HMaterTexture = list[i]["鏉愯川"].ToString();
- var HProductNum = list[i]["鎴愬搧缂栧彿"].ToString();
- var HVerNum = list[i]["鐗堟湰"].ToString();
- var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
-
- if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
- {
- //鑾峰彇鐩稿悓涓昏〃鐨勫瓙琛ㄧ殑娣诲姞娆℃暟 HEntryID
- num[0] = 1;
- hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
- HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
- HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
-
- //娣诲姞涓昏〃鏁版嵁
- oCN.RunProc("insert into Gy_RoutingBillMain(HInterID, HBillNo, HYear, HPeriod, HBillType, HDate, HBillStatus, " +
- "HMaker, HMakeDate,HMaterNumber, HMaterID, Hunitid, HUnitNumber, HName," +
- "HPicNumVer, HPicNumAssemble, HMaterTexture, HProductNum, HVerNum, HRoutingGroupID, HStandard, HRemark,HMainPrice" +
- ",HOrgID)values" +
- $"({HInterID}, '{HBillNo}', {omdelMian.HYear}, {omdelMian.HPeriod}, '{BillType}', GETDATE(), 1" +
- $", '{user}', GETDATE(), '{HMaterNumber}', {HMaterID}, {Hunitid}, '{HUnitNumber}', '{HName}'," +
- $" '{HPicNumVer}', '{HPicNumAssemble}', '{HMaterTexture}', '{HProductNum}', '{HVerNum}', 0, 1, '',{(HMainPrice==""?"0":HMainPrice)}" +
- $",{omdelMian.HOrgID})");
- //鑾峰彇涓昏〃娣诲姞鐨勬鏁�
- num[1]++;
- }
-
- //鑾峰彇渚涘簲鍟�
- ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where 渚涘簲鍟嗕唬鐮�='" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString()+"'", "h_v_Gy_SupplierList");
- var HSupID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- //鑾峰彇宸ュ簭
- ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber='" + list[i]["宸ュ簭浠ｇ爜"].ToString() + "'", "Gy_Process");
- var HProcID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- //鑾峰彇宸ヤ綔涓績
- ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HName='" + list[i]["宸ヤ綔涓績"].ToString() + "'", "Gy_WorkCenter");
- var HCenterID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
- var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
- var hworkqty = list[i]["鍔犲伐鏁伴噺"].ToString();
- var HFixPrice = list[i]["鐝骇瀹氶"].ToString();
- var HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
- var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
- var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
- var HBeginDayQty = list[i]["鏈亾寮�宸ヤ綑閲�"].ToString();
- var HFixWorkDays = list[i]["涓婇亾绛夊緟澶╂暟"].ToString();
- var HTrunWorkDays = list[i]["涓婇亾寰幆鍛ㄦ湡"].ToString();
- var HAutoTrunFlag = list[i]["鑷姩杞Щ"].ToString();
- var HSupFlag = list[i]["澶栧崗鏍囪"].ToString();
- var HTechnologyParameter = list[i]["宸ヨ壓鍙傛暟"].ToString();
- var HPicNum = list[i]["鍥剧焊缂栧彿"].ToString();
- var HProcCheckNote = list[i]["鏈伐搴忕‘璁よ褰�"].ToString();
- var hpassrate = list[i]["鑹巼"].ToString();
- var hremark = list[i]["澶囨敞"].ToString();
- var HMouldNo = list[i]["妯″叿缂栧彿"].ToString();
- var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
- //鐗╂枡鍒嗙被
-
-
-
- oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
- ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
- ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
- ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
- $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
- $", {hworkqty}, {(HFixPrice == "" ? "0" : HFixPrice)}, {(HBadPrice == "" ? "0" : HBadPrice)}, {(HWasterPrice == "" ? "0" : HWasterPrice)}, {(HBeginFixQty == "" ? "0" : HBeginFixQty)}, {(HBeginDayQty == "" ? "0" : HBeginDayQty)}, {(HFixWorkDays == "" ? "0" : HFixWorkDays)}" +
- $", {(HTrunWorkDays == "" ? "0" : HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1" : "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
- $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
- //鑷娆℃暟
- num[0]++;
- if(omdelMian.HTProcessFlag == 1 )
- {
- if ((i == list.Count - 1) || (list[i]["浜у搧浠ｇ爜"].ToString() != list[i + 1]["浜у搧浠ｇ爜"].ToString()))
- {
- ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1", "Gy_Process");
- if (ds.Tables[0].Rows.Count > 0)
- HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- HProcNo = ds.Tables[0].Rows[0]["HSno"].ToString();
- oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
- ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
- ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
- ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
- $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
- $", {hworkqty}, {(HFixPrice == "" ? "0" : HFixPrice)}, {(HBadPrice == "" ? "0" : HBadPrice)}, {(HWasterPrice == "" ? "0" : HWasterPrice)}, {(HBeginFixQty == "" ? "0" : HBeginFixQty)}, {(HBeginDayQty == "" ? "0" : HBeginDayQty)}, {(HFixWorkDays == "" ? "0" : HFixWorkDays)}" +
- $", {(HTrunWorkDays == "" ? "0" : HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1" : "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
- $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
- }
- num[0]++;
- }
-
+ var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ oCN.RunProc($"exec Gy_RoutingBill_Excel '{ds.Tables[0].Rows[i]["浜у搧浠ｇ爜"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + num[1] + "涓伐鑹鸿矾绾�";
+ objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + ds.Tables[0].Rows.Count + "涓伐鑹鸿矾绾�";
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
index 770bc0f..fc8ad92 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
@@ -25,11 +25,16 @@
/// <returns></returns>
[Route("JIT_Complete/JIT_CompleteDetailList")]
[HttpGet]
- public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID)
+ public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID)
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' " + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
+ string sql = "";
+ if (HMainICMOEntryID != "-1" && HMainICMOInterID != "-1" && HICMOInterID != "-1")
+ {
+ sql = "and 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' and 涓荤敓浜ц鍗曚富鍐呯爜='" + HMainICMOInterID + "' and 鏃ヨ鍒掕鍗曚富鍐呯爜='" + HICMOInterID + "'";
+ }
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 1=1 " +sql + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index b38c925..a01c670 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -643,7 +643,6 @@
{
try
{
- oCN.BeginTran();
Stopwatch sw = new Stopwatch();
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
@@ -653,7 +652,14 @@
DataTable resulTable = ds.Tables[0];
if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
{
- return resulTable.Rows[0][0].ToString();
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = resulTable.Rows[0][0].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -664,7 +670,14 @@
string fDayPlanFEntryids = string.Empty;
if (BomList.Count == 0)
{
- return "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -1045,8 +1058,6 @@
sw.Stop();//缁撴潫璁℃椂
LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
- oCN.Commit();
-
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎿嶄綔鎴愬姛";
@@ -1055,7 +1066,6 @@
}
catch (Exception e)
{
- oCN.RollBack();
LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index df22e67..826c8ef 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -90,22 +91,60 @@
ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖閿�鍞鍗曞姩鎬佸垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Xs_SeOrderBill/DyColList")]
+ [HttpGet]
+ public object DyColList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_IF_SeOrderBillList");
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+
}
catch (Exception e)
{
--
Gitblit v1.9.1