From ae4902061bc8e34f341d55b85f28acdf24d3b9dc Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:41:51 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 463 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 446 insertions(+), 17 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
index 6e67119..2b3bf08 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -14,6 +14,43 @@
namespace WebAPI.Controllers
{
#region 鍗庤繙璇锋眰鍩虹璧勬枡
+
+ #region 鐐．VRS鍐呭眰鎻愬彇涓婁紶浜岀淮鐮佷綅缃帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSInner_savePNLBarCodePosition_RequestParams
+ {
+ public string HBarCode_PNL; //PNL鏉＄爜缂栧彿
+ public string HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public string HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
+ public class VRSInner_savePNLBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 鐐．VRS鍐呭眰鑾峰彇PNL浜岀淮鐮佷綅缃俊鎭帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSInner_getPNLBarCodePosition_RequestParams
+ {
+ public string HBarCode_PNL; //PNL鏉＄爜缂栧彿
+ }
+
+ public class VRSInner_getPNLBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<VRSInner_getPNLBarCodePosition_RequestResult_data> data;
+ }
+ public class VRSInner_getPNLBarCodePosition_RequestResult_data
+ {
+ public string HBarCode_PNL; //PNL鏉＄爜鍙�
+ public double HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public double HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
+ #endregion
+
#region 鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犳帴鍙� 鐩稿叧妯″瀷绫�
public class VRSInner_saveCheckNote_RequestParams
{
@@ -36,6 +73,42 @@
public string code;
public string msg;
}
+ #endregion
+
+ #region 鐐．VRS澶栧眰鎻愬彇涓婁紶浜岀淮鐮佷綅缃帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSOuter_saveSetBarCodePosition_RequestParams
+ {
+ public string HBarCode_Set; //Set鏉＄爜缂栧彿
+ public string HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public string HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
+ public class VRSOuter_saveSetBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰鑾峰彇set浜岀淮鐮佷綅缃俊鎭帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSOuter_getSetBarCodePosition_RequestParams
+ {
+ public string HBarCode_Set; //set鏉＄爜缂栧彿
+ }
+
+ public class VRSOuter_getSetBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<VRSOuter_getSetBarCodePosition_RequestResult_data> data;
+ }
+ public class VRSOuter_getSetBarCodePosition_RequestResult_data
+ {
+ public string HBarCode_Set; //Set鏉＄爜鍙�
+ public double HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public double HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
#endregion
#region 鐐．VRS澶栧眰鑾峰彇datamapping鎺ュ彛 鐩稿叧妯″瀷绫�
@@ -208,6 +281,97 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ #region 鐐．VRS鍐呭眰鎻愬彇涓婁紶PNL浜岀淮鐮佷綅缃� 鎺ュ彛
+ [Route("VRSInner/VRSInner_savePNLBarCodePosition")]
+ [HttpGet]
+ public VRSInner_savePNLBarCodePosition_RequestResult VRSInner_savePNLBarCodePosition(string HBarCode_PNL,double HPNLPosition_x,double HPNLPosition_y)
+ {
+ VRSInner_savePNLBarCodePosition_RequestResult result = new VRSInner_savePNLBarCodePosition_RequestResult();
+ try
+ {
+ string HLayOutName = ""; //PNL鏉＄爜缂栧彿瀵瑰簲鐨凱NL甯冨眬鍚嶇О
+
+ string sql = @"
+ select b.HLayOutName
+ from Gy_BarCodeBill_PNL_Temp as a
+ inner join Gy_PNLInfo as b on a.HLayOutName = b.HLayOutName
+ where a.HBarCode = '" + HBarCode_PNL + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_PNL_Temp");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ return result;
+ }
+ else
+ {
+ HLayOutName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HLayOutName"]);
+ }
+
+ string sql_save = "" +
+ "update Gy_PNLInfo set HPNLPosition_x = " + HPNLPosition_x + ",HPNLPosition_y = " + HPNLPosition_y + " where HLayOutName = '" + HLayOutName + "'";
+ oCN.RunProc(sql_save);
+
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛";
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS鍐呭眰鑾峰彇PNL浜岀淮鐮佷綅缃俊鎭� 鎺ュ彛
+ [Route("VRSInner/VRSInner_getPNLBarCodePosition")]
+ [HttpGet]
+ public VRSInner_getPNLBarCodePosition_RequestResult VRSInner_getPNLBarCodePosition(string HBarCode_PNL)
+ {
+ VRSInner_getPNLBarCodePosition_RequestResult result = new VRSInner_getPNLBarCodePosition_RequestResult();
+ List<VRSInner_getPNLBarCodePosition_RequestResult_data> dataList = new List<VRSInner_getPNLBarCodePosition_RequestResult_data>();
+ try
+ {
+ string sql = @"
+ select top(1) b.*
+ from Gy_BarCodeBill_PNL_Temp as a
+ inner join Gy_PNLInfo as b on a.HLayOutName = b.HLayOutName
+ where a.HBarCode = '" + HBarCode_PNL + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_PNL_Temp");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "PNL浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠PNL浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
+ result.data = null;
+ return result;
+ }
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ VRSInner_getPNLBarCodePosition_RequestResult_data data = new VRSInner_getPNLBarCodePosition_RequestResult_data();
+ data.HBarCode_PNL = HBarCode_PNL;
+ data.HPosition_x = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HPNLPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HPNLPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
#region 鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犳帴鍙�
[Route("VRSInner/VRSInner_saveCheckNote")]
@@ -292,6 +456,167 @@
}
#endregion
+ #region 鐐．VRS澶栧眰鎻愬彇涓婁紶set浜岀淮鐮佷綅缃� 鎺ュ彛
+ [Route("VRSOuter/VRSOuter_saveSetBarCodePosition")]
+ [HttpGet]
+ public VRSOuter_saveSetBarCodePosition_RequestResult VRSOuter_saveSetBarCodePosition(string HBarCode_Set, double HSetPosition_x, double HSetPosition_y)
+ {
+ VRSOuter_saveSetBarCodePosition_RequestResult result = new VRSOuter_saveSetBarCodePosition_RequestResult();
+ try
+ {
+ string HLayOutName = ""; //Set鏉＄爜缂栧彿瀵瑰簲鐨凱NL甯冨眬鍚嶇О
+ string HSetNo = ""; //set鍙�
+
+ string sql = @"
+ select distinct
+ c.HLayOutName
+ ,d.HSetNo
+ from Gy_BarCodeBill_Set_Temp as a
+ inner join Gy_BarCodeBill_PNL_Temp as b on a.HBarCode_PNL = b.HBarCode
+ inner join Gy_PNLInfo as c on b.HLayOutName = c.HLayOutName
+ inner join Gy_PNLInfoSub as d on c.HInterID = d.HInterID
+ where b.HBarCode + d.HSetNo = a.HBarCode
+ and a.HBarCode = '" + HBarCode_Set + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_Set_Temp");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ return result;
+ }
+ else
+ {
+ HLayOutName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HLayOutName"]);
+ HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ }
+
+ string sql_save = "" +
+ "update b set " +
+ "b.HSetPosition_x = " + HSetPosition_x + " " +
+ ",b.HSetPosition_y = " + HSetPosition_y +" " +
+ "from Gy_PNLInfo as a " +
+ "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
+ "where a.HLayOutName = '" + HLayOutName + "' " +
+ "and b.HSetNo = '" + HSetNo + "'";
+ oCN.RunProc(sql_save);
+
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛";
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰鑾峰彇Set浜岀淮鐮佷綅缃俊鎭� 鎺ュ彛
+ [Route("VRSOuter/VRSOuter_getSetBarCodePosition")]
+ [HttpGet]
+ public VRSOuter_getSetBarCodePosition_RequestResult VRSOuter_getSetBarCodePosition(string HBarCode_Set)
+ {
+ VRSOuter_getSetBarCodePosition_RequestResult result = new VRSOuter_getSetBarCodePosition_RequestResult();
+ List<VRSOuter_getSetBarCodePosition_RequestResult_data> dataList = new List<VRSOuter_getSetBarCodePosition_RequestResult_data>();
+ try
+ {
+ string sql = @"
+ select distinct
+ d.HSetNo
+ ,d.HSetPosition_x
+ ,d.HSetPosition_y
+ from Gy_BarCodeBill_Set_Temp as a
+ inner join Gy_BarCodeBill_PNL_Temp as b on a.HBarCode_PNL = b.HBarCode
+ inner join Gy_PNLInfo as c on b.HLayOutName = c.HLayOutName
+ inner join Gy_PNLInfoSub as d on c.HInterID = d.HInterID
+ where b.HBarCode + d.HSetNo = a.HBarCode
+ and a.HBarCode = '" + HBarCode_Set + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_PNL_Temp");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "Set浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠Set浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
+ result.data = null;
+ return result;
+ }
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ VRSOuter_getSetBarCodePosition_RequestResult_data data = new VRSOuter_getSetBarCodePosition_RequestResult_data();
+ data.HBarCode_Set = HBarCode_Set;
+ data.HPosition_x = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HSetPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HSetPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS鍐呭眰鐢宠PNL鏉＄爜鎺ュ彛
+
+ /// <summary>
+ /// 鐢宠PNL鏉＄爜鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route("VRSInner/VRSInner_getBarCodeBill_PNL")]
+ [HttpGet]
+ public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐欏叆鑾峰彇PNL鏉＄爜鏃跺彂鐢熼敊璇紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = ds.Tables[0].Rows[0]["HBarCode"].ToString();
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢宠PNL鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 鐐．VRS澶栧眰鑾峰彇datamapping鏁版嵁 鎺ュ彛
[Route("VRSOuter/VRSOuter_getDataMapping")]
[HttpGet]
@@ -302,17 +627,19 @@
try
{
string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "'";
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
VRSOuter_getDataMapping_RequestResult_data data = new VRSOuter_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
@@ -414,6 +741,62 @@
}
#endregion
+ #region 鐐．VRS澶栧眰鐢宠set鏉＄爜鎺ュ彛
+
+ /// <summary>
+ /// 鐢宠set鏉＄爜鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route("VRSOuter/VRSOuter_getBarCodeBill_SET")]
+ [HttpGet]
+ public object VRSOuter_getBarCodeBill_SET(string HBarCode_PNL, string HMaker)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_Set_Temp_Insert '" + HBarCode_PNL + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_Set_Temp_Insert");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐欏叆鑾峰彇SET鏉＄爜鏃跺彂鐢熼敊璇紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ List<string> HBarCodeList = new List<string>();
+ for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ HBarCodeList.Add(ds.Tables[0].Rows[i]["HBarCode"].ToString());
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = HBarCodeList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢宠SET鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region AVI鑾峰彇datamapping鏁版嵁 鎺ュ彛
[Route("AVI/AVI_getDataMapping")]
[HttpGet]
@@ -423,18 +806,44 @@
List<AVI_getDataMapping_RequestResult_data> dataList = new List<AVI_getDataMapping_RequestResult_data>();
try
{
- string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string HBarCode_PNL = "";
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "'";
+ "select * from Gy_BarCodeBill_Set_Temp where HBarCode = '" + HBarCode + "' ";
+ ds = oCN.RunProcReturn(sql_PNLBarCode, "Gy_BarCodeBill_Set_Temp");
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
+ }
+ else
+ {
+ result.code = "0";
+ result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
+ result.data = null;
+ return result;
+ }
+
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
+ string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
+
+ //鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
+ string sql = "" +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ //"union " +
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
AVI_getDataMapping_RequestResult_data data = new AVI_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
@@ -556,23 +965,33 @@
{
HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
}
+ else
+ {
+ result.code = "0";
+ result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
+ result.data = null;
+ return result;
+ }
//鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
string HSetNo = HBarCode.Substring(HBarCode.Length-2,2);
//鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' ";
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
DC_getDataMapping_RequestResult_data data = new DC_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
@@ -687,23 +1106,33 @@
{
HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
}
+ else
+ {
+ result.code = "0";
+ result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
+ result.data = null;
+ return result;
+ }
//鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
//鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' ";
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
JGG_getDataMapping_RequestResult_data data = new JGG_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
--
Gitblit v1.9.1