From a220689a643d52604fd1fb391618fa2d79a5db74 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期一, 16 六月 2025 16:15:59 +0800 Subject: [PATCH] 2.增加PNL二维码烧蚀位置提取上传接口(递入PNL条码编号、x坐标、y坐标,更新PNL条码编号对应PNL布局信息中的PNL二维码位置x坐标、y坐标) 3.PNL二维码烧蚀位置加载接口(递入PNL条码编号,获取PNL条码编号对应PNL布局信息中的PNL二维码位置x坐标、y坐标) 4.增加Set二维码烧蚀位置提取上传接口(递入set条码编号、x坐标、y坐标,更新set条码编号对应PNL布局信息中的set二维码位置x坐标、y坐标) 5.Set二维码烧蚀位置加载接口(递入set条码编号,获取set条码编号对应PNL布局信息中的PNL二维码位置x坐标、y坐标) --- WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 275 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 275 insertions(+), 0 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..6ebbcff 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 string HPosition_x; //浜岀淮鐮亁鍧愭爣 + public string 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 string HPosition_x; //浜岀淮鐮亁鍧愭爣 + public string 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,string HPNLPosition_x,string 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.isStrNull(ds.Tables[0].Rows[i]["HPNLPosition_x"]); + data.HPosition_y = DBUtility.ClsPub.isStrNull(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,117 @@ } #endregion + #region 鐐.VRS澶栧眰鎻愬彇涓婁紶set浜岀淮鐮佷綅缃� 鎺ュ彛 + [Route("VRSOuter/VRSOuter_saveSetBarCodePosition")] + [HttpGet] + public VRSOuter_saveSetBarCodePosition_RequestResult VRSOuter_saveSetBarCodePosition(string HBarCode_Set, string HSetPosition_x, string 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.isStrNull(ds.Tables[0].Rows[i]["HSetPosition_x"]); + data.HPosition_y = DBUtility.ClsPub.isStrNull(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澶栧眰鑾峰彇datamapping鏁版嵁 鎺ュ彛 [Route("VRSOuter/VRSOuter_getDataMapping")] [HttpGet] -- Gitblit v1.9.1