From 2fa71a673f27b62038ceba4da0413dd7bc0f3497 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 16 十月 2025 13:20:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 554 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 366 insertions(+), 188 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 9a53e47..e4ae986 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -15,6 +15,7 @@
{
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
DataSet ds;
#region 宸ュ簭鍗曞搧涓嶈壇閲囬泦 鐢ㄦ埛鏌ヨ鍏宠仈瀛楁
@@ -29,7 +30,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-038]Sucess锛�";
objJsonResult.data = new DataTable();
return objJsonResult;
}
@@ -38,7 +39,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -46,7 +47,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -170,6 +171,7 @@
long HMainSourceEntryID = mainList[0].HICMOEntryID;
string HMainSourceBillNo = mainList[0].HICMOBillNo;
+ //鍒ゆ柇鐢熶骇璐ㄩ噺姹囨姤鍗曟槸鍚﹀瓨鍦�
ds = oCN.RunProcReturn("select * from Sc_QualityReportBillMain WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Sc_QualityReportBillMain");
if (ds.Tables[0].Rows.Count != 0) {
objJsonResult.code = "0";
@@ -183,14 +185,31 @@
if (ds.Tables[0].Rows.Count == 0)//鏂板
{
- //涓昏〃
- oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
-(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
-,HYear,HPeriod,HRemark,HMaker,HMakeDate
-,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
+ if (HResult== "寰憰鍝�")
+ {
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
+ (HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
+ ,HYear,HPeriod,HRemark,HMaker,HMakeDate
+ ,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
+ values('3717','3717-1',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+ //閲嶆柊缁橦Result璧嬪��
+ HResult = "";
+ }
+ else
+ {
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
+ (HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
+ ,HYear,HPeriod,HRemark,HMaker,HMakeDate
+ ,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
values('3717','3717',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+ "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+ }
+
}
@@ -280,18 +299,33 @@
(HInterID,HENTRYID,HBillNo_bak,HEmpID,HBarCode,HBadReasonID,HAddr,HMaker,HMakeDate
,HMaterID,HUnitID,HRemark,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HReportType
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
-,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo)
+,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HProcID)
values({HInterID},1,'{oSub.HBillNo_bak}',{oSub.HEmpID},'{oSub.HBarCode}',{oSub.HBadReasonID},'','{oSub.HMaker}','{oSub.HMakeDate}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HReportType}
,0,0,'','',0,0
-,1,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}')");
+,1,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}',{oSub.HProcID})");
//淇敼鏉＄爜琛ㄧ殑鐘舵��
oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'");
+ LogService.Write("绫诲瀷:" + oSub.HBadTypeID + ",鍒跺崟浜�:" + oSub.HMaker + ",鍒跺崟鏃ユ湡:" + oSub.HMakeDate);
//淇敼鍑虹珯鍗曠殑 涓嶈壇 鎶ュ簾鏁伴噺
- if (HResult == "涓嶈壇") {
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ if (HResult == "涓嶈壇")
+ {
+ LogService.Write("绫诲瀷:" + oSub.HBadTypeID);
+ //宸ュ簾
+ if (oSub.HBadTypeID == 3)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ }//鏂欏簾
+ else if (oSub.HBadTypeID == 4)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Mater+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ }//杩斿伐
+ else if (oSub.HBadTypeID == 6)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HBackWorkQty+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ }
}
else if (HResult == "鎶ュ簾")
{
@@ -318,7 +352,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -329,16 +363,33 @@
HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
}
- //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚︽槸寮�宸�
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
- if (ds.Tables[0].Rows.Count == 0)
+
+
+ //瀹㈡埛鍒跺畾
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗″彿:" + HBarCode + ",娴佽浆鍗℃湭寮�宸�!";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ {
+
+ //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚︽槸寮�宸�
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚﹀ⅷ瑗垮摜鐨�
+ ds = oCN.RunProcReturn("select HPRDORGID from Sc_ProcessExchangeBillMain with(nolock) where HBillNo = '" + HBarCode + "' ", "Sc_ProcessExchangeBillMain");
+ if (ds.Tables[0].Rows[0]["HPRDORGID"].ToString() != "7667152")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-2-018]鍗″彿:" + HBarCode + ",娴佽浆鍗℃湭寮�宸�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
}
+
ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomList '" + HBarCode + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
if (ds.Tables[0].Rows.Count == 0)
@@ -349,7 +400,7 @@
{
objJsonResult.code = "2";
objJsonResult.count = 2;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = dataSet.Tables[0];
return objJsonResult;
}
@@ -357,7 +408,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�,鍙兘鏄綋鍓嶇敤鎴峰伐搴忎笉姝ｇ‘鎴栬�呮祦杞崱杈撳叆閿欒!";
+ objJsonResult.Message = "[3791-2-019]閰嶄欢娓呭崟鏌ユ棤鏁版嵁锛�,鍙兘鏄綋鍓嶇敤鎴峰伐搴忎笉姝ｇ‘鎴栬�呮祦杞崱杈撳叆閿欒!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -366,7 +417,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
}
@@ -377,7 +428,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -406,7 +457,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄�!";
+ objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -416,10 +467,11 @@
List<Model.Sc_AssemblyBill_BindSourceTemp> tempList = new List<Model.Sc_AssemblyBill_BindSourceTemp>();
tempList = JsonConvert.DeserializeObject<List<Model.Sc_AssemblyBill_BindSourceTemp>>(msg1);
- if (tempList.Count == 0) {
+ if (msg1 != "[]" && tempList.Count == 0)
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犻厤浠舵暟鎹�!";
+ objJsonResult.Message = "[3791-2-026]鏃犻厤浠舵暟鎹�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -450,7 +502,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛!";
+ objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!";
objJsonResult.data = null;
return objJsonResult;
@@ -460,7 +512,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-051]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -486,7 +538,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄�!";
+ objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -500,13 +552,13 @@
List<Model.ClsSc_AssemblyBillSub> sub = new List<Model.ClsSc_AssemblyBillSub>();
sub = JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(sSubStr);
-
- ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + omodel.HBarCode_P + "'," + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
+ //鏉＄爜涓婇亾宸ュ簭鏄惁杩囩珯
+ ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + omodel.HBarCode_P + "'," + omodel.HProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鏁版嵁!";
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -514,11 +566,12 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
+ objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
objJsonResult.data = null;
return objJsonResult;
}
+ //鍒ゆ柇鏉＄爜鏄惁宸茬粡鍑虹珯
ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 浜у搧鏉＄爜='" + omodel.HBarCode_P + "' and HProcExchInterID="+ omodel .HProcExchInterID+ " and HProcExchEntryID="+ omodel.HProcExchEntryID + " and HProcID="+ omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
if (ds.Tables[0].Rows.Count > 0)
@@ -526,7 +579,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜:" + omodel.HBarCode_P + ",宸插瓨鍦�!";
+ objJsonResult.Message = "[0000-2-039]鏉＄爜:" + omodel.HBarCode_P + ",宸插瓨鍦�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -545,7 +598,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!";
+ objJsonResult.Message = "[3791-2-020]閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -558,26 +611,44 @@
{
Int64 HInterID1 = DBUtility.ClsPub.CreateBillID("3727", ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo1 = DBUtility.ClsPub.CreateBillCode("3727", ref DBUtility.ClsPub.sExeReturnInfo, true);
- //淇濆瓨鐢熶骇缁勮鍗曚富琛�
- string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
-,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
-,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
-values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
-,'{HBillNo1}','1','{user}',getdate(),{omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()},'{omodel.HProcExchBillNo.ToString()}'
-,{omodel.HICMOInterID.ToString()},'{omodel.HICMOBillNo.ToString()}','{omodel.HBarCode_P.ToString()}',{omodel.HMaterID},0,'姹囨姤',{omodel.HProdOrgID})";
+ string prefix = omodel.HBarCode_P.Substring(0, 10); // 浠庣储寮�0寮�濮嬶紝鎴彇10涓瓧绗� 鍒ゆ柇姣忎釜椤圭洰鐨凮鏄熷湀閰嶄欢鏁伴噺
+
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
+ ,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
+ ,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
+ values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
+ ,'{HBillNo1}','1','{user}',getdate(),{omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()},'{omodel.HProcExchBillNo.ToString()}'
+ ,{omodel.HICMOInterID.ToString()},'{omodel.HICMOBillNo.ToString()}','{omodel.HBarCode_P.ToString()}',{omodel.HMaterID},0,'姹囨姤',{omodel.HProdOrgID})";
oCN.RunProc(sql);
-
- for (int i = 0; i < sub.Count; i++)
- {
- //瀛愯〃瀛樺偍
- string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
-,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
-,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
-values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
-,'',{sub[i].HMaterID},0,0,0,1
-,0,0,getdate(),'{sub[i].HBarCode}','{omodel.HBarCode_P}','') ";
- oCN.RunProc(sq2);
+ if (prefix == "#0TE911124") {
+ for (int i = 0; i < sub.Count; i++)
+ {
+ //瀛愯〃瀛樺偍
+ string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
+ ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
+ values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
+ ,'',{sub[i].HMaterID},0,0,0,3
+ ,0,0,getdate(),'{sub[i].HBarCode}','{omodel.HBarCode_P}','') ";
+ oCN.RunProc(sq2);
+ }
}
+ else
+ {
+ for (int i = 0; i < sub.Count; i++)
+ {
+ //瀛愯〃瀛樺偍
+ string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
+ ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
+ values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
+ ,'',{sub[i].HMaterID},0,0,0,1
+ ,0,0,getdate(),'{sub[i].HBarCode}','{omodel.HBarCode_P}','') ";
+ oCN.RunProc(sq2);
+ }
+ }
+
}
}
@@ -661,11 +732,13 @@
int HTemporaryAreaID = 0;//鏆傛斁鍖�
int HShiftsID = 0;
+ //鑾峰彇褰撳墠鐝
DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
if (set.Tables[0].Rows.Count > 0)
{
HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
}
+ //鍒ゆ柇褰撳ぉ褰撳墠鐨勬祦杞崱鏄惁鏈夊嚭绔欏崟
ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain a WITH(NOLOCK) left join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID where a.HInterID=" + HInterID + " and HBillNo='" + HBillNo + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "' ", "Sc_StationOutBillMain");
if (ds.Tables[0].Rows.Count == 0)
@@ -700,7 +773,7 @@
ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + omodel.HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
-values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{omodel.HBarCode_P}', 1, GETDATE(), '', " + HProcExchInterID + ","+ HProcExchEntryID + ", '"+ HProcExchBillNo + "', '', 0, 0)");
+ values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{omodel.HBarCode_P}', 1, GETDATE(), '', " + HProcExchInterID + ","+ HProcExchEntryID + ", '"+ HProcExchBillNo + "', '', 0, 0)");
//鎶婃潯鐮佸啓鍏ユ棩蹇楅噷闈�
LogService.CustomWriteLog("鏉＄爜:" + omodel.HBarCode_P + ",宸ュ簭:"+ HProcID + ",鍑虹珯鏃堕棿:" + DateTime.Now, "TM" + DateTime.Now.ToString("yyyy-MM-dd"));
@@ -710,15 +783,15 @@
ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK)
-left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
-where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
-group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out");
+ left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
+ where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
+ group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out");
if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0) {
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!";
+ objJsonResult.Message = "[3791-2-028]鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -727,7 +800,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛!";
+ objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!";
objJsonResult.data = null;
return objJsonResult;
@@ -737,7 +810,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-051]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -751,6 +824,7 @@
{
try
{
+ string str1 = "";
ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");
//鍒ゆ柇鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
@@ -774,27 +848,27 @@
//鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
if (HBarCode.Length == 29)
{
- string str1 = HBarCode.Substring(18, 8);
+ str1 = HBarCode.Substring(18, 8);
DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count == 0)
{
str1 = HBarCode.Substring(23, 3);
dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.Message = "[3791-2-016]鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -812,95 +886,150 @@
return get_HBardBillSave(HProcExchBillNo, HBarCode);
}
}
- //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
+ //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿 鍜� O6椤圭洰
else if (HBarCode.Length == 50)
{
- string str1 = HBarCode.Substring(42, 8);
-
- DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
-
- if (dataSet.Tables[0].Rows.Count == 0)
+ string prefix = HBarCode.Substring(0, 10); // 浠庣储寮�0寮�濮嬶紝鎴彇10涓瓧绗�
+ if (prefix == "#0TE911124")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
- objJsonResult.data = null;
- return objJsonResult;
+ str1 = HBarCode.Substring(41, 3);
+ LogService.Write($"鏉＄爜鍓嶇紑" + str1);
+
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-2-016]鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ClsPub.CurUserName = user;
+ //鏉＄爜鐢熸垚
+ return get_HBardBillSave(HProcExchBillNo, HBarCode);
+ }
}
else
{
- ClsPub.CurUserName = user;
- //鏉＄爜鐢熸垚
- return get_HBardBillSave(HProcExchBillNo, HBarCode);
+
+ str1 = HBarCode.Substring(42, 8);
+ LogService.Write($"鏉＄爜鍓嶇紑1.1" + str1);
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-2-016]鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ClsPub.CurUserName = user;
+ //鏉＄爜鐢熸垚
+ return get_HBardBillSave(HProcExchBillNo, HBarCode);
+ }
}
+
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鏍煎紡涓嶆纭�!";
+ objJsonResult.Message = "[0000-2-036]鏉＄爜鏍煎紡涓嶆纭�!";
objJsonResult.data = null;
return objJsonResult;
}
}
- else {
+ else
+ {
//鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
if (HBarCode.Length == 29)
{
- string str1 = HBarCode.Substring(18, 8);
+ str1 = HBarCode.Substring(18, 8);
DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count == 0)
{
str1 = HBarCode.Substring(23, 3);
dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.Message = "[3791-2-016]鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
objJsonResult.data = null;
return objJsonResult;
}
}
}
- //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
+ //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿 鍜� O6椤圭洰
else if (HBarCode.Length == 50)
{
- string str1 = HBarCode.Substring(42, 8);
-
- DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
-
- if (dataSet.Tables[0].Rows.Count == 0)
+ string prefix = HBarCode.Substring(0, 10); // 浠庣储寮�0寮�濮嬶紝鎴彇10涓瓧绗�
+ if (prefix == "#0TE911124")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
- objJsonResult.data = null;
- return objJsonResult;
+ str1 = HBarCode.Substring(41, 3);
+ LogService.Write($"鏉＄爜鍓嶇紑" + str1);
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-2-016]鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ {
+ str1 = HBarCode.Substring(42, 8);
+
+ DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
+
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-2-016]鏉＄爜涓庢祦杞崱涓嶅瓨鍦ㄥ搴斿叧绯�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鏉＄爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�";
+ objJsonResult.Message = "[0000-2-037]褰撳墠鏉＄爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -908,7 +1037,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -917,7 +1046,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -928,10 +1057,10 @@
{
//鏌ヨ娴佽浆鍗℃暟鎹�
DataSet dataSet = oCN.RunProcReturn(@"select a.HPRDORGID, m.HModel 鐗╂枡瑙勬牸,m.HName 鍚嶇墿鏂欑О,a.HBillNo,a.HInterID,a.HMaterID,m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜,a.HUnitID,u.HNumber 鍗曚綅浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-left join Gy_Unit u WITH(NOLOCK) on a.HUnitID=u.HItemID
-where HBillNo='" + HProcExchBillNo + "'", "Sc_ProcessExchangeBillMain");
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ left join Gy_Unit u WITH(NOLOCK) on a.HUnitID=u.HItemID
+ where HBillNo='" + HProcExchBillNo + "'", "Sc_ProcessExchangeBillMain");
string HMaterNumber = dataSet.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
string HOrgNumber = dataSet.Tables[0].Rows[0]["缁勭粐浠ｇ爜"].ToString();
@@ -940,7 +1069,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ objJsonResult.Message = "[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
return objJsonResult;
}
@@ -1011,7 +1140,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1020,7 +1149,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1039,7 +1168,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1049,7 +1178,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "SN鐮佹煡鏃犳暟鎹紒";
+ objJsonResult.Message = "[3791-2-023]SN鐮佹煡鏃犳暟鎹紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1058,7 +1187,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鏉＄爜鐨勭姸鎬佷负:"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�";
+ objJsonResult.Message = "[0000-2-037]褰撳墠鏉＄爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1069,7 +1198,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閰嶄欢鏉＄爜鍒ゆ柇澶辫触锛�";
+ objJsonResult.Message = "[3791-2-024]閰嶄欢鏉＄爜鍒ゆ柇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1077,14 +1206,14 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.Message = "[0000-1-010]" + DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1093,7 +1222,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1112,7 +1241,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1120,13 +1249,14 @@
ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
+ //鏌ヨ娴佽浆鍗℃墍鏈夊伐搴忎俊鎭�
ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBillHICOMProcessExchange WITH(NOLOCK) where 鏉＄爜='" + HBarCode + "' ", "h_v_Gy_BarCodeBillHICOMProcessExchange");
if (ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鏌ユ棤鏁版嵁锛�";
+ objJsonResult.Message = "[0000-1-045]鏉＄爜鏌ユ棤鏁版嵁锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1142,7 +1272,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鏉＄爜涓庡綋鍓嶅伐搴忎笉鍖归厤!";
+ objJsonResult.Message = "[3791-2-017]褰撳墠鏉＄爜涓庡綋鍓嶅伐搴忎笉鍖归厤!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1150,14 +1280,14 @@
if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "姝ｅ父") {
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鏉＄爜鐘舵�佷负"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
+ objJsonResult.Message = "[0000-2-037]褰撳墠鏉＄爜鐘舵�佷负" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
objJsonResult.data = null;
return objJsonResult;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1166,7 +1296,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1185,7 +1315,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1194,7 +1324,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds;
return objJsonResult;
}
@@ -1203,7 +1333,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1222,7 +1352,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1231,7 +1361,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1240,7 +1370,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1259,7 +1389,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1270,7 +1400,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�";
objJsonResult.data = null;
}
string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
@@ -1303,7 +1433,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1312,7 +1442,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1331,7 +1461,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1344,7 +1474,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�";
objJsonResult.data = null;
}
@@ -1373,7 +1503,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1382,7 +1512,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1401,7 +1531,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1415,7 +1545,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鏌ユ棤鏁版嵁锛�";
+ objJsonResult.Message = "[0000-2-020]鏉＄爜鏌ユ棤鏁版嵁锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1432,7 +1562,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鏉＄爜涓庡綋鍓嶅伐搴忎笉鍖归厤!";
+ objJsonResult.Message = "[3791-2-017]褰撳墠鏉＄爜涓庡綋鍓嶅伐搴忎笉鍖归厤!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1441,7 +1571,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鏉＄爜鐘舵�佷负" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
+ objJsonResult.Message = "[0000-2-037]褰撳墠鏉＄爜鐘舵�佷负" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1449,7 +1579,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1458,7 +1588,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1525,7 +1655,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1545,7 +1675,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -1554,7 +1684,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1581,7 +1711,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄�!";
+ objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1594,7 +1724,7 @@
Model.Sc_AssemblyBill_BindSourceTemp temp = new Model.Sc_AssemblyBill_BindSourceTemp();
temp = JsonConvert.DeserializeObject<Model.Sc_AssemblyBill_BindSourceTemp>(sSubStr);
-
+ //宸ュ簭杩斾慨璁板綍鍗� 閰嶄欢琛�
ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub_Mater where HInterID=" + model.HInterID+ " order by HEntryID desc", "Sc_SourceLineRepairBillSub_Mater");
oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub_Mater
@@ -1608,7 +1738,7 @@
oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);
//oCN.RunProc("exec h_p_AssemblyBill_Temp '" + temp.HProcExchBillNo + "'," + model.HProcess + "," + temp.HMaterID + ",'" + temp.HBatchNo + "'");
}
- else if (HResult == "NG"|| HResult == "OK") {
+ else if (HResult == "NG"|| HResult == "OK") {
Model.ClsSc_SourceLineRepairBillMain model = new Model.ClsSc_SourceLineRepairBillMain();
model = JsonConvert.DeserializeObject<Model.ClsSc_SourceLineRepairBillMain>(sMainStr);
@@ -1657,15 +1787,27 @@
if (dataSet.Tables[0].Rows.Count > 0)
{
string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString();
-
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'");
+ //鏂帿灏旂殑鎯呭喌 鍒� 宸ュ簾 鏂欏簾 杩斿伐
+ //宸ュ簾
+ if (subLsit[0].HBadTypeID == 3)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Work-=1 where HInterID='" + HOutInterID + "'");
+ }//鏂欏簾
+ else if (subLsit[0].HBadTypeID == 4)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Mater-=1 where HInterID='" + HOutInterID + "'");
+ }//杩斿伐
+ else if (subLsit[0].HBadTypeID == 6)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HBackWorkQty-=1 where HInterID='" + HOutInterID + "'");
+ }
}
else
{
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触,褰撳墠娴佽浆鍗″綋鍓嶅伐搴忕殑鍑虹珯鍗曟病鏈変笉鑹暟閲�!";
+ objJsonResult.Message = "[3748-2-005]淇濆瓨澶辫触,褰撳墠娴佽浆鍗″綋鍓嶅伐搴忕殑鍑虹珯鍗曟病鏈変笉鑹暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1675,7 +1817,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触,鏃犵粨鏋滐紒";
+ objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触,鏃犵粨鏋滐紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1685,7 +1827,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-050]Sucess锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1694,7 +1836,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-051]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1713,7 +1855,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1723,7 +1865,7 @@
if (ds.Tables[0].Rows.Count == 0) {
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�";
objJsonResult.data = null;
}
@@ -1762,7 +1904,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1834,7 +1976,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1844,7 +1986,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -1852,7 +1994,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1922,7 +2064,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -1932,7 +2074,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1962,7 +2104,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -1972,7 +2114,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2002,7 +2144,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -2012,7 +2154,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2042,7 +2184,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -2051,7 +2193,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2081,7 +2223,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -2091,7 +2233,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2108,6 +2250,7 @@
List<object> columnNameList = new List<object>();
+ //鏌ヨ閰嶄欢娓呭崟淇℃伅
string sql = @"exec h_p_GZ_BarCodeBillList '" + HMaterNumber + "','" + HBatchNo + "','" + sWhere + "'";
ds = oCN.RunProcReturn(sql, "h_p_GZ_BarCodeBillList");
@@ -2121,7 +2264,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -2131,7 +2274,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2161,7 +2304,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -2171,7 +2314,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2258,5 +2401,40 @@
}
#endregion
+ #region 宸ュ簭鍗曞搧杩囩珯 鏌ヨ褰撳墠娴佽浆鍗℃槸鍚︽湁宸叉湁鍑虹珯鍗� 鑾峰彇id 鍗曟嵁鍙�
+ [Route("Cj_SingleStation/SingleItemTransit_CZD")]
+ [HttpGet]
+ public object SingleItemTransit_CZD(string sWhere)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ds = oCN.RunProcReturn(sWhere, "WindowPrint");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1