From 464f5a591e5d02fe0873505a119e17a576945ca6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 19 七月 2024 17:21:44 +0800
Subject: [PATCH] 报工台跳转异常反馈单 弹窗获取 设备编码
---
WebAPI/Controllers/条码管理/WEBSController.cs | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 510 insertions(+), 46 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 57c0693..6d9b83c 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -3778,31 +3778,55 @@
[HttpGet]
public object get_SourceBarCode_MateOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HStockOrgID)
{
- try
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBar == null)
+ if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ {
+ if(HSourceBillType == "1214")
+ {
+ //閲嶆柊鍚屾鐢熶骇鍙戞枡閫氱煡鍗�
+ Kf_MateOutRequestBillController obill = new Kf_MateOutRequestBillController();
+ objJsonResult = obill.GetKf_MateOutRequestBill_Sync_Json(HSourceBillNo, HSourceBillType);
+ }
+ }
+
+ try
+ {
+ WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = WebSoBar;
- return objJsonResult;
- }
+
}
- catch (Exception e)
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -6186,26 +6210,7 @@
HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
}
- string HSourceInterIDs = "0";
- string HSourceEntryIDs = "0";
string HSourceBillNos = "0";
- string HUnitIDs = "0";
- //鏌ヨ閲囪喘璁㈠崟
- ds = oCn.RunProcReturn(@"select a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
-inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + str[3] + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
- if (ds.Tables[0].Rows.Count == 0)
- {
- //sErrMsg = "鏉＄爜瑙ｆ瀽澶辫触,璇风‘璁ゆ潯鐮侀噰璐鍗曟槸鍚︽纭�!";
- //return null;
- }
- else
- {
- HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
- HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
- HSourceBillNos = ds.Tables[0].Rows[0]["HBillNo"].ToString();
- HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
- }
-
string HInnerBillNos = "";
//鏌ヨ鍐呴儴閲囪喘璁㈠崟鍙�
ds = oCn.RunProcReturn(@" select * from h_v_IF_POInStockList where 閲囪喘璁㈠崟鍙�= '" + str[3] + "' ", "h_v_IF_POInStockList");
@@ -6218,7 +6223,27 @@
else
{
HInnerBillNos = ds.Tables[0].Rows[0]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
+ HSourceBillNos = ds.Tables[0].Rows[0]["閲囪喘璁㈠崟鍙�"].ToString();
}
+
+ string HSourceInterIDs = "0";
+ string HSourceEntryIDs = "0";
+ string HUnitIDs = "0";
+ //鏌ヨ閲囪喘璁㈠崟
+ ds = oCn.RunProcReturn(@"select a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
+inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + HSourceBillNos + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ //sErrMsg = "鏉＄爜瑙ｆ瀽澶辫触,璇风‘璁ゆ潯鐮侀噰璐鍗曟槸鍚︽纭�!";
+ //return null;
+ }
+ else
+ {
+ HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
+ HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
+ }
+
double HQty = double.Parse(str[6]);
//鏃ユ湡鑾峰彇鏂瑰紡
@@ -7476,20 +7501,20 @@
DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp");
if (ds1 != null && ds1.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇敼澶辫触锛佸師鍥狅細淇敼鍚庣殑鍗曟嵁鍙峰湪鏈彁浜ょ殑缂撳瓨鍒楄〃涓笉瀛樺湪锛�";
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
-
-
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = ds1.Tables[0];
- return objJsonResult;
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds1.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception e)
{
@@ -8115,12 +8140,12 @@
if (sWhere == null || sWhere == "")
{
- sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query order by 鍒跺崟鏃ユ湡 desc";
+ sql = "select * from h_v_Gy_getCusBarCodeBillList_Query order by 鍒跺崟鏃ユ湡 desc";
ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
}
else
{
- sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
+ sql = "select * from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
}
@@ -8213,5 +8238,444 @@
#endregion
#endregion
+
+ #region 鎵爜楠岃瘉鍗�
+ #region 鎵爜楠岃瘉鍗� 鎵爜鐗╂枡鏉＄爜
+ [Route("WEBSController/Gy_BarCodeConfirmBill_rushBarCode")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID, string HBarCode)
+ {
+ DataSet ds;
+ try
+ {
+ string sql = "exec h_p_Gy_BarCodeConfirmBill_rushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HMaker + "'," + HStockOrgID + ",'" + HBarCode + "'";
+ ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_rushBarCode");
+ if(ds==null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛佸師鍥狅細鎵爜鏉＄爜閿欒锛岃瀵绘壘IT浜哄憳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 杩斿洖鎵弿鏉＄爜鍒楄〃淇℃伅
+ [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushedBarCodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "select * from h_v_Gy_BarCodeConfirmBillTempList_singleBill " +
+ "where HInterID = " + HInterID + " and 鍗曟嵁鍙� = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by 鎵爜鏃堕棿 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillTempList_singleBill");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 鍒犻櫎鎵爜璁板綍
+
+ /// <summary>
+ /// 鍒犻櫎鏄庣粏琛ㄤ綋閫変腑琛岃褰�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_BarCodeConfirmBill_DeleteRushedBarCodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_DeleteRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ string sql = "delete from Gy_BarCodeConfirmBillTempList " +
+ "where HInterID = " + HInterID + "" +
+ " and HBillNo = '" + HBillNo + "'" +
+ " and HBillType = '" + HBillType + "'" +
+ " and HStockOrgID = " + HStockOrgID + "" +
+ " and HBarCode = '" + HBarCode + "'";
+ oCn.RunProc(sql);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 杩斿洖缂撳瓨鍒楄〃淇℃伅
+ [Route("WEBSController/Gy_BarCodeConfirmBill_TempList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_TempList(string HBillType, string HMaker, long HStockOrgID)
+ {
+ DataSet ds;
+ try
+ {
+ string sql = "exec h_p_Gy_BarCodeConfirmBill_TempList '" + HBillType + "','" + HMaker + "'," + HStockOrgID;
+ ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_TempList");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁缂撳瓨璁板綍鏌ヨ澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇缂撳瓨淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇缂撳瓨鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 鍒犻櫎缂撳瓨璁板綍
+
+ /// <summary>
+ /// 鍒犻櫎鏄庣粏琛ㄤ綋閫変腑琛岃褰�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_BarCodeConfirmBill_DeleteTempListNote")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_DeleteTempListNote(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鍓嶆帶鍒�============================================================================================================================
+ string sql_beforeDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql_beforeDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細鍒犻櫎鍓嶆帶鍒跺け璐ワ紝璇峰鎵剧綉缁滅鐞嗕汉鍛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=============================================================================================================================================
+
+ //寮�鍚簨鍔�
+ oCn.BeginTran();
+
+ string sql = "delete from Gy_BarCodeConfirmBillTempList where " +
+ " HInterID = " + HInterID + "" +
+ " and HBillNo = '" + HBillNo + "'" +
+ " and HBillType = '" + HBillType + "'" +
+ " and HStockOrgID = " + HStockOrgID + "";
+ oCn.RunProc(sql);
+
+ //鍒犻櫎鍚庢帶鍒�============================================================================================================================
+ string sql_afterDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql_afterDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細鍒犻櫎鍚庢帶鍒跺け璐ワ紝璇峰鎵剧綉缁滅鐞嗕汉鍛�";
+ objJsonResult.data = null;
+
+ oCn.RollBack();
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+
+ oCn.RollBack();
+ return objJsonResult;
+ }
+ //=============================================================================================================================================
+
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 缁存姢鍒楄〃
+
+ /// <summary>
+ /// 杩斿洖缁勬墭缂撳瓨鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_BarCodeConfirmBillList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBillList(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ string sql = "";
+
+ if (sWhere == null || sWhere == "")
+ {
+ sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query order by 鏃ユ湡 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query where 1=1 " + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
+ }
+
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 缁存姢鍒楄〃-鏉＄爜鍒楄〃-鎵爜鍒楄〃
+
+ /// <summary>
+ /// 杩斿洖缁勬墭鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "select * from Gy_BarCodeConfirmBillTempList where HSourceInterID = " + HSourceInterID + " and HSourceEntryID = " + HSourceEntryID + " and HSourceBillType = '" + HSourceBillType + "' and HStockOrgID = " + HOrgID + " Order by HMakeDate desc";
+ ds = oCn.RunProcReturn(sql, "Gy_BarCodeConfirmBillTempList");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 缁存姢鍒楄〃-鏉＄爜鍒楄〃-鏈壂鐮佸垪琛�
+
+ /// <summary>
+ /// 杩斿洖缁勬墭鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "exec h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList " + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillType + "'," + HOrgID;
+ ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+ #endregion
}
}
--
Gitblit v1.9.1