BLL/bin/Release/BLL.dllBinary files differ
BLL/bin/Release/BLL.pdbBinary files differ
BLL/bin/Release/DAL.dllBinary files differ
BLL/bin/Release/DAL.pdbBinary files differ
BLL/bin/Release/DBUtility.dllBinary files differ
BLL/bin/Release/DBUtility.pdbBinary files differ
BLL/bin/Release/Model.dllBinary files differ
BLL/bin/Release/Model.pdbBinary files differ
BLL/bin/Release/Pub_Class.dllBinary files differ
BLL/bin/Release/Pub_Class.pdbBinary files differ
BLL/bin/Release/Pub_Control.dllBinary files differ
BLL/bin/Release/Pub_Control.pdbBinary files differ
BLL/bin/Release/SQLHelper.dllBinary files differ
BLL/bin/Release/SQLHelper.pdbBinary files differ
BLL/bin/x86/Release/BLL.dllBinary files differ
BLL/bin/x86/Release/BLL.pdbBinary files differ
BLL/bin/x86/Release/DAL.dllBinary files differ
BLL/bin/x86/Release/DAL.pdbBinary files differ
BLL/bin/x86/Release/DBUtility.dllBinary files differ
BLL/bin/x86/Release/DBUtility.pdbBinary files differ
BLL/bin/x86/Release/Model.dllBinary files differ
BLL/bin/x86/Release/Model.pdbBinary files differ
BLL/bin/x86/Release/Pub_Class.dllBinary files differ
BLL/bin/x86/Release/Pub_Class.pdbBinary files differ
BLL/bin/x86/Release/Pub_Control.dllBinary files differ
BLL/bin/x86/Release/Pub_Control.pdbBinary files differ
BLL/bin/x86/Release/SQLHelper.dllBinary files differ
BLL/bin/x86/Release/SQLHelper.pdbBinary files differ
BLL/bin/x86/Release/TopSdk.dllBinary files differ
BLL/bin/x86/Release/TopSdk.pdbBinary files differ
DAL/bin/Release/DAL.dllBinary files differ
DAL/bin/Release/DAL.pdbBinary files differ
DAL/bin/Release/DBUtility.dllBinary files differ
DAL/bin/Release/DBUtility.pdbBinary files differ
DAL/bin/Release/Model.dllBinary files differ
DAL/bin/Release/Model.pdbBinary files differ
DAL/bin/Release/Pub_Class.dllBinary files differ
DAL/bin/Release/Pub_Class.pdbBinary files differ
DAL/bin/Release/Pub_Control.dllBinary files differ
DAL/bin/Release/Pub_Control.pdbBinary files differ
DAL/bin/Release/SQLHelper.dllBinary files differ
DAL/bin/Release/SQLHelper.pdbBinary files differ
DAL/bin/x86/Release/DAL.dllBinary files differ
DAL/bin/x86/Release/DAL.pdbBinary files differ
DAL/bin/x86/Release/DBUtility.dllBinary files differ
DAL/bin/x86/Release/DBUtility.pdbBinary files differ
DAL/bin/x86/Release/Model.dllBinary files differ
DAL/bin/x86/Release/Model.pdbBinary files differ
DAL/bin/x86/Release/Pub_Class.dllBinary files differ
DAL/bin/x86/Release/Pub_Class.pdbBinary files differ
DAL/bin/x86/Release/Pub_Control.dllBinary files differ
DAL/bin/x86/Release/Pub_Control.pdbBinary files differ
DAL/bin/x86/Release/SQLHelper.dllBinary files differ
DAL/bin/x86/Release/SQLHelper.pdbBinary files differ
DBUtility/bin/Release/DBUtility.dllBinary files differ
DBUtility/bin/Release/DBUtility.pdbBinary files differ
DBUtility/bin/Release/Pub_Class.dllBinary files differ
DBUtility/bin/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/Release/Pub_Control.dllBinary files differ
DBUtility/bin/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/Release/SQLHelper.dllBinary files differ
DBUtility/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/bin/x86/Release/DBUtility.dllBinary files differ
DBUtility/bin/x86/Release/DBUtility.pdbBinary files differ
DBUtility/bin/x86/Release/Pub_Class.dllBinary files differ
DBUtility/bin/x86/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/x86/Release/Pub_Control.dllBinary files differ
DBUtility/bin/x86/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/x86/Release/SQLHelper.dllBinary files differ
DBUtility/bin/x86/Release/SQLHelper.pdbBinary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.dllBinary files differ
DBUtility/obj/Release/DBUtility.pdbBinary files differ
Model/bin/Release/DBUtility.dllBinary files differ
Model/bin/Release/DBUtility.pdbBinary files differ
Model/bin/Release/Model.dllBinary files differ
Model/bin/Release/Model.pdbBinary files differ
Model/bin/Release/Pub_Class.dllBinary files differ
Model/bin/Release/Pub_Class.pdbBinary files differ
Model/bin/Release/Pub_Control.dllBinary files differ
Model/bin/Release/Pub_Control.pdbBinary files differ
Model/bin/Release/SQLHelper.dllBinary files differ
Model/bin/Release/SQLHelper.pdbBinary files differ
Model/bin/x86/Release/DBUtility.dllBinary files differ
Model/bin/x86/Release/DBUtility.pdbBinary files differ
Model/bin/x86/Release/Model.dllBinary files differ
Model/bin/x86/Release/Model.pdbBinary files differ
Model/bin/x86/Release/Pub_Class.dllBinary files differ
Model/bin/x86/Release/Pub_Class.pdbBinary files differ
Model/bin/x86/Release/Pub_Control.dllBinary files differ
Model/bin/x86/Release/Pub_Control.pdbBinary files differ
Model/bin/x86/Release/SQLHelper.dllBinary files differ
Model/bin/x86/Release/SQLHelper.pdbBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/Release/Model.dllBinary files differ
Model/obj/Release/Model.pdbBinary files differ
Model/obj/x86/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@ cf1de7c5db7452fbe8feec75166c542ccdbc3c25 8cff70c790e796f956039e7b524ea3be46f8106b Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt
@@ -13,3 +13,18 @@ D:\æºäºMES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CopyComplete D:\æºäºMES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.dll D:\æºäºMES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Model.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Model.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\DBUtility.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Class.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\SQLHelper.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Control.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\DBUtility.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Class.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\SQLHelper.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Control.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.csproj.AssemblyReference.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CopyComplete D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.pdb Model/obj/x86/Release/Model.dllBinary files differ
Model/obj/x86/Release/Model.pdbBinary files differ
Pub_Class/bin/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/Release/Pub_Class.pdbBinary files differ
Pub_Class/bin/x86/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/x86/Release/Pub_Class.pdbBinary files differ
Pub_Class/bin/x86/Release/SyntacticSugar.dllBinary files differ
Pub_Class/bin/x86/Release/SyntacticSugar.pdbBinary files differ
Pub_Control/bin/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/Release/Pub_Control.pdbBinary files differ
Pub_Control/bin/x86/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/x86/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/x86/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/x86/Release/Pub_Control.pdbBinary files differ
SQLHelper/bin/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/Release/SQLHelper.pdbBinary files differ
SQLHelper/bin/x86/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/x86/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/x86/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/x86/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@ e8ec5326fcce7dca1a8665f7df1eeeb575e7a0a1 6e8752cea1563effc4e21d288e42a2d4215b13f8 SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt
@@ -7,3 +7,12 @@ D:\æºäºMES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CopyComplete D:\æºäºMES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.dll D:\æºäºMES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.AssemblyReference.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CopyComplete D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.pdb SQLHelper/obj/x86/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.pdbBinary files differ
SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs
File was deleted SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
File was deleted SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
File was deleted SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,15 +1,6 @@ <<<<<<< HEAD D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb ======= D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb >>>>>>> 9b54060aab13ef42f1d251dad16bef4d0c9264d9 D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache WebAPI/Controllers/»ªÔ¶datamapping/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; //äºç»´ç xåæ public string HPosition_y; //äºç»´ç 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; //äºç»´ç xåæ public string HPosition_y; //äºç»´ç 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; //äºç»´ç xåæ public string HPosition_y; //äºç»´ç 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; //äºç»´ç xåæ public string HPosition_y; //äºç»´ç 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æ¡ç ç¼å·å¯¹åºçPNLå¸å±åç§° 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æ¡ç ç¼å·å¯¹åºçPNLå¸å±åç§° 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] WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</_PublishTargetUrl> <History>True|2025-06-09T08:45:52.0865612Z;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History> <History>True|2025-06-16T08:13:03.2956026Z;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>06/09/2025 16:45:33</publishTime> <publishTime>06/16/2025 16:12:43</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>06/09/2025 16:45:33</publishTime> <publishTime>06/16/2025 16:12:43</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>06/09/2025 16:45:32</publishTime> <publishTime>06/16/2025 16:12:41</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>06/09/2025 16:45:32</publishTime> <publishTime>06/16/2025 16:12:41</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>06/09/2025 16:45:27</publishTime> <publishTime>06/16/2025 16:12:36</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>06/09/2025 16:45:27</publishTime> <publishTime>06/16/2025 16:12:36</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>06/09/2025 16:45:28</publishTime> <publishTime>06/16/2025 16:12:37</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>06/09/2025 16:45:28</publishTime> <publishTime>06/16/2025 16:12:37</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>06/09/2025 16:45:25</publishTime> <publishTime>06/16/2025 16:12:34</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>06/09/2025 16:45:25</publishTime> <publishTime>06/16/2025 16:12:34</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>06/09/2025 16:45:26</publishTime> <publishTime>06/16/2025 16:12:35</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>06/09/2025 16:45:26</publishTime> <publishTime>06/16/2025 16:12:35</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>06/09/2025 16:45:27</publishTime> <publishTime>06/16/2025 16:12:35</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>06/09/2025 16:45:27</publishTime> <publishTime>06/16/2025 16:12:35</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>06/09/2025 16:45:23</publishTime> <publishTime>06/16/2025 16:11:25</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>06/09/2025 16:45:23</publishTime> <publishTime>06/16/2025 16:11:25</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,22 +285,22 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>06/09/2025 16:45:28</publishTime> <publishTime>06/16/2025 16:11:27</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>06/09/2025 16:45:28</publishTime> <publishTime>06/16/2025 16:11:27</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>06/09/2025 16:45:41</publishTime> <publishTime>06/16/2025 16:12:57</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>06/09/2025 16:45:41</publishTime> <publishTime>06/16/2025 16:12:57</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>06/09/2025 16:45:45</publishTime> <publishTime>06/16/2025 16:13:01</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -492,7 +492,7 @@ <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web.config"> <publishTime>06/09/2025 16:45:51</publishTime> <publishTime>06/16/2025 11:00:02</publishTime> </File> </ItemGroup> </Project> sdk_dingding/TopSdk/bin/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache
File was deleted sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
File was deleted sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,15 +1,6 @@ D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb <<<<<<< HEAD ======= ======= D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb edcd7574e709748c5d3ccc0bd54930414ddcfc9a >>>>>>> 9b54060aab13ef42f1d251dad16bef4d0c9264d9 sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ