From cfee793e8fb3ec23c879e6086db8c25ddd368b46 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 13 四月 2023 14:28:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 745 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 593 insertions(+), 152 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 44b51be..7635a40 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -27,12 +27,14 @@
DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
DAL.ClsGy_WorkCenter_View oCenHlp = new DAL.ClsGy_WorkCenter_View();
+ DAL.ClsGy_Warehouse_View oCenWare = new DAL.ClsGy_Warehouse_View();
Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
public string BillType = "3301";
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- #region 宸ヨ壓璺嚎 鍒楄〃
+ #region 鏈煡
/// <summary>
- /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ /// 鏈煡
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
@@ -44,11 +46,11 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
}
else
{
- string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
+ string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustOutBillList");
}
@@ -119,9 +121,9 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
- int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
- string user = sArray[4].ToString();//鐢ㄦ埛鍚�
+ //int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
try
{
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
@@ -136,12 +138,12 @@
msg2 = "[" + msg2.ToString() + "]";
List<Gy_RoutingBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBill>>(msg2);
-
+
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
int HYear = DateTime.Now.Year;
- double HPeriod = 1;
+ double HPeriod = DateTime.Now.Month;
string HRemark = mainList[0].HRemark;//澶囨敞
string HMaker = mainList[0].HMaker;//鍒跺崟浜�
long HMaterID = mainList[0].HMaterID;//浜у搧ID
@@ -169,8 +171,24 @@
string HMaterTexture = mainList[0].HMaterTexture;//鏉愯川
string HProductNum = mainList[0].HProductNum;//鎴愬搧缂栧彿
string HVerNum = mainList[0].HVerNum;//鐗堟湰
+ int IsProNo = mainList[0].IsProNo;//鏄惁杞伐搴�
+
+ if (OperationType == 2)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶�,璇烽噸鏂拌緭鍏�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
- if (OperationType == 1)//鏂板
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
+
+ if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
//涓昏〃
oCN.RunProc("Insert Into Gy_RoutingBillMain " +
@@ -184,14 +202,14 @@
"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
- ",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "',"+ HOrgID + ") ");
+ ",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ") ");
}
- else if (OperationType == 3)
+ else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
oCN.RunProc("update Gy_RoutingBillMain set " +
"HDate='" + HDate +
- "',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',HMaker='" + HMaker +
- "',Hmakedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
+ "',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',hupdater='" + HMaker +
+ "',hupdatedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
"',HRoutingGroupID='" + HRoutingGroupID + "',HUnitID='" + HUnitID + "',HMaterNumber='" + HMaterNumber + "',HUnitNumber='" + HUnitNumber +
"',HStandard='" + Convert.ToString(HStandard ? 1 : 0) + "',HMainGroupID='" + HMainGroupID + "',HMainProcID='" + HMainProcID + "',HMainCenterID='" + HMainCenterID +
"',HMainTimeUnit='" + HMainTimeUnit + "',HMainUnitTime='" + HMainUnitTime + "',HMainWorkQty='" + HMainWorkQty + "',HMainPrice='" + HMainPrice +
@@ -200,10 +218,10 @@
",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");
//鍒犻櫎瀛愯〃
- oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
+ oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HProcNo!='9999'");
}
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub(msg3, HInterID, hentryid);
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -212,13 +230,61 @@
objJsonResult.data = null;
return objJsonResult;
}
- oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //璁剧疆榛樿宸ヨ壓璺嚎
+
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈缃浆宸ュ簭!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //璁剧疆杞伐搴�
+ oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
+ }
+ }
+ else if (IsProNo == 1 && OperationType == 1)
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈缃浆宸ュ簭!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //璁剧疆杞伐搴�
+ oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
+ }
+ }
+
+
+ //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾�
+ if (HStandard)
+ {
+ //璁剧疆榛樿宸ヨ壓璺嚎
+ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //璁剧疆榛樿宸ヨ壓璺嚎
+ }
+
//鍒ゆ柇鏄惁閲嶅宸ュ簭鍙�
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
if (OperationType == 1)
{
-
+
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -255,7 +321,7 @@
}
}
- public json AddBillSub(string msg3, long HInterID, int hentryid)
+ public json AddBillSub(string msg3, long HInterID,int OperationType)
{
List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
int i = 0;
@@ -271,31 +337,34 @@
return objJsonResult;
}
- oCN.RunProc("Insert into Gy_RoutingBillSub " +
- "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
- ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
- ",HReadyTime,HQueueTime,HMoveTime" +
- ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
- ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
- ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
- ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
- ",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate,HProcWorkNum" +
- ") values("
- + HInterID + "," + (hentryid==-1?i: hentryid) + "," + oSub.HProcID.ToString() + ",'" + (hentryid == -1 ? i : hentryid) + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
- "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
- "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
- "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
- "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
- "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
- ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
- ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
- "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
- ") ");
+ if (oSub.HProcNo != "9999" || OperationType == 2)
+ {
+ oCN.RunProc("Insert into Gy_RoutingBillSub " +
+ "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
+ ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
+ ",HReadyTime,HQueueTime,HMoveTime" +
+ ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
+ ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
+ ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
+ ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
+ ",HTechnologyParameter,HPicNum,HProcCheckNote" +
+ ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID " +
+ ") values("
+ + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
+ "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
+ "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
+ "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
+ "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
+ ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
+ ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString()+"," + oSub.HWasterWHID.ToString()+"," + oSub.HWHID.ToString() +
+ ") ");
+ }
}
objJsonResult.code = "1";
@@ -303,6 +372,46 @@
objJsonResult.Message = null;
objJsonResult.data = null;
return objJsonResult;
+ }
+
+ #endregion
+
+ #region 宸ヨ壓璺嚎鍒楄〃 鏌ヨ绯荤粺鍙傛暟
+ /// <summary>
+ /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_XT_List")]
+ [HttpGet]
+ public object MES_XT_List(string sWhere)
+ {
+ try
+ {
+ string flag = "flase";
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg))
+ {
+ if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y")
+ {
+ flag = "true";
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = flag;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
#endregion
@@ -324,13 +433,14 @@
file.SaveAs(ExcelPath);
NpoiHelper np = new NpoiHelper();
- DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,2, WorkBookName);
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 2, WorkBookName);
//鍒犻櫎鏂囦欢
File.Delete(ExcelPath);
//鍒涘缓涓存椂琛�
DataTable tb2 = new DataTable("dt2");
+ DataTable tb3 = new DataTable("dt3");
//娣诲姞鍒楀悕
for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
@@ -358,7 +468,7 @@
if (!tb2.Columns.Contains("宸ュ簭"))
error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
-
+
if (!tb2.Columns.Contains("宸ヤ綔涓績"))
error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冦�戠殑鏍囬,";
@@ -413,11 +523,20 @@
if (!tb2.Columns.Contains("鑹巼"))
error += "娌℃湁鎵惧埌銆愯壇鐜囥�戠殑鏍囬";
+ if (!tb2.Columns.Contains("涓嶈壇鍝佷粨"))
+ error += "娌℃湁鎵惧埌銆愪笉鑹搧浠撱�戠殑鏍囬";
+
+ if (!tb2.Columns.Contains("鎶ュ簾鍝佷粨"))
+ error += "娌℃湁鎵惧埌銆愭姤搴熷搧浠撱�戠殑鏍囬";
+
+ if (!tb2.Columns.Contains("鑹搧浠�"))
+ error += "娌℃湁鎵惧埌銆愯壇鍝佷粨銆戠殑鏍囬";
+
if (error.Length > 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n" ;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
objJsonResult.data = null;
return objJsonResult;
}
@@ -464,6 +583,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() + "','" + 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;
@@ -494,12 +631,12 @@
Single sWorkQty = 0;
Single sHPassRate = 0;
- //
sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["浜у搧浠ｇ爜"].ToString());
sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ヤ綔涓績"].ToString());
sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ュ簭"].ToString());
sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["鍔犲伐鏁伴噺"].ToString());
sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["鑹巼"].ToString());
+
if (sHNumber != "")
{
//
@@ -562,9 +699,92 @@
sErrMsg = sErrMsg + "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦╘r\n";
}
b = true;
-
}
+
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ string HBadWHName = ""; //涓嶈壇鍝佷粨
+ string HWasterWHName = ""; //鎶ュ簾鍝佷粨
+ string HWHName = ""; //鑹搧浠�
+
+ HBadWHName = DBUtility.ClsPub.isStrNull(dt.Rows[i]["涓嶈壇鍝佷粨"].ToString());
+ HWasterWHName = DBUtility.ClsPub.isStrNull(dt.Rows[i]["鎶ュ簾鍝佷粨"].ToString());
+ HWHName = DBUtility.ClsPub.isStrNull(dt.Rows[i]["鑹搧浠�"].ToString());
+
+ //鍒ゆ柇鏄惁涓虹┖
+ if (HBadWHName == "")
+ {
+ sErrMsg = sErrMsg + "绗�" + index + "琛� :涓嶈壇鍝佷粨涓嶈兘涓虹┖ !\r\n";
+ b = true;
+ }
+
+ if (HWasterWHName == "")
+ {
+ sErrMsg = sErrMsg + "绗�" + index + "琛� :鎶ュ簾鍝佷粨涓嶈兘涓虹┖ !\r\n";
+ b = true;
+ }
+
+ if (HWHName == "")
+ {
+ sErrMsg = sErrMsg + "绗�" + index + "琛� :鑹搧浠撲笉鑳戒负绌� !\r\n";
+ b = true;
+ }
+
+ //鍒ゆ柇浠撳簱鏄惁閲嶅
+ if (HBadWHName == HWasterWHName)
+ {
+ sErrMsg = sErrMsg + "涓嶈壇鍝佷粨鍜屾姤搴熷搧浠撻噸澶峔r\n";
+ b = true;
+ }
+
+ if (HWasterWHName == HWHName)
+ {
+ sErrMsg = sErrMsg + "鎶ュ簾鍝佷粨鍜岃壇鍝佷粨閲嶅\r\n";
+ b = true;
+ }
+
+ if (HBadWHName == HWHName)
+ {
+ sErrMsg = sErrMsg + "涓嶈壇鍝佷粨鍜岃壇鍝佷粨閲嶅\r\n";
+ b = true;
+ }
+
+ //寰楀埌浠撳簱鍐呯爜
+ if (!oCenWare.GetInfoByName(HBadWHName))
+ {
+ sMsg = "[" + HBadWHName + "]浠撳簱涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + HBadWHName + "]浠撳簱涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+
+ if (!oCenWare.GetInfoByName(HWasterWHName))
+ {
+ sMsg = "[" + HWasterWHName + "]浠撳簱涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + HWasterWHName + "]浠撳簱涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+
+ if (!oCenWare.GetInfoByName(HWHName))
+ {
+ sMsg = "[" + HWHName + "]浠撳簱涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + HWHName + "]浠撳簱涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+ }
+ }
}
}
if (b == true)
@@ -595,6 +815,7 @@
public string HPeriod;
public string DataAppend;
public string HOrgID;
+ public Int64 HTProcessFlag;
}
[Route("Gy_RoutingBill/Gy_RoutingBill_btnSave")]
@@ -644,116 +865,36 @@
//琛ㄥご瀛楁
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 浜у搧浠ｇ爜,isnull(宸ヨ壓璺嚎浠ｇ爜,'') 宸ヨ壓璺嚎浠ｇ爜 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())
+ var HBillNo = ds.Tables[0].Rows[i]["宸ヨ壓璺嚎浠ｇ爜"].ToString();//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ if (HBillNo == "")
{
- dic.Add(itm.Name, itm.Value.ToString());
+ DataSet dataSet = oCN.RunProcReturn($"select HBillNo from Gy_RoutingBillMain where HBillNo='1' ", "Gy_RoutingBillMain");
+ while (1 == 1)
+ {
+ if (HBillNo != "")
+ {
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ break;
+ }
+ }
+ HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ dataSet = oCN.RunProcReturn($"select HBillNo from Gy_RoutingBillMain where HBillNo='{HBillNo}' ", "Gy_RoutingBillMain");
+ }
+
}
- 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]++;
+ 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;
}
@@ -767,5 +908,305 @@
}
}
#endregion
+
+ #region 宸ヨ壓璺嚎 瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_RoutingBill/AuditGy_RoutingBill")]
+ [HttpGet]
+ public object AuditGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_RoutingBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鍏抽棴銆佸弽鍏抽棴
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_RoutingBill/CloseGy_RoutingBill")]
+ [HttpGet]
+ public object CloseGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Close", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_RoutingBillMain set HCloseMan='" + CurUserName + "',HCloseDate=getdate() where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ oCN.RunProc("update Gy_RoutingBillMain set HCloseMan='',HCloseDate=null where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎鍒楄〃 涓昏〃
+ /// <summary>
+ /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_RoutingBill/Gy_RoutingBillQuery")]
+ [HttpGet]
+ public object Gy_RoutingBillQuery(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuery where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillQuery");
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ #endregion
+
+ #region 宸ヨ壓璺嚎鍒楄〃 瀛愯〃
+ /// <summary>
+ /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_RoutingBill/Gy_RoutingBillQuerySub")]
+ [HttpGet]
+ public object Gy_RoutingBillQuerySub(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuerySub where 1 = 1 and hmainid=" + sWhere;
+ string sql = sql1 + " order by hmainid desc,cast(宸ュ簭鍙� as int)";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillQuerySub");
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ #endregion
+
+ ///<summary>
+ ///灏佽鐘舵�佺爜鍙婅繑鍥炰俊鎭殑鍏敤鏂规硶銆�
+ ///鍙傛暟锛欴ataSet銆�
+ ///杩斿洖鍊硷細json銆�
+ ///</summary>
+ public object GetObjectJson(DataSet ds)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //娣诲姞鍒楀悕
+ 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 = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1