SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -1 +1 @@ 8219c9ee18d6afe5441d3bfa12a5ce870beb22f6 f95e56b5f9755e3380309c272e92c6c4a10dd4c5 SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -344,34 +344,34 @@ return objJsonResult; } //ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl"); //if (ds == null) //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "判断数量失败！"; // objJsonResult.data = null; // return objJsonResult; //} //if (ds.Tables[0].Rows.Count == 0) //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "判断数量失败！"; // objJsonResult.data = null; // return objJsonResult; //} //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); // objJsonResult.data = null; // return objJsonResult; //} ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl"); if (ds == null) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "判断数量失败！"; objJsonResult.data = null; return objJsonResult; } if (ds.Tables[0].Rows.Count == 0) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "判断数量失败！"; objJsonResult.data = null; return objJsonResult; } if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); objJsonResult.data = null; return objJsonResult; } oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1"); //判断是否是 首道工序 ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " + WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -9,6 +9,7 @@ using System.Web.Http; using WebAPI.Models; using System.Windows.Forms; using SyntacticSugar.constant; namespace WebAPI.Controllers { @@ -1843,5 +1844,55 @@ } } #endregion #region 销售出库单下推查询列表 [Route("Kf_SellOutBill/PushList")] [HttpGet] public object PushList(string HBillNo, string user) { try { List<object> columnNameList = new List<object>(); string sql = "select * from h_v_IF_SellOutBillList_EditInit where 单据号 = '" + HBillNo + "' and 状态 = '已审核' and 数量 - 关联数量 > 0"; ds = oCN.RunProcReturn(sql, "h_v_IF_SellOutBillList_EditInit"); if (ds.Tables[0].Rows.Count == 0) { objJsonResult.code = CodeConstant.FAIL; objJsonResult.count = CountConstant.FAIL; objJsonResult.Message = "找不到符合条件单据!"; objJsonResult.data = null; return objJsonResult; } 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));//获取到DataColumn列对象的列名 } objJsonResult.code = CodeConstant.SUCCEED; objJsonResult.count = CountConstant.SUCCEED; objJsonResult.Message = "Sucess！"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = CodeConstant.FAIL; objJsonResult.count = CountConstant.FAIL; objJsonResult.Message = "Exception！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -9,6 +9,7 @@ using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; using SyntacticSugar.constant; namespace WebAPI.Controllers { @@ -1872,5 +1873,54 @@ } } #endregion #region 发货通知单下推查询列表 [Route("Xs_SeOutStockBill/PushList")] [HttpGet] public object PushList(string HBillNo, string user) { try { List<object> columnNameList = new List<object>(); string sql = "select * from h_v_IF_SeOutStockBillList where 单据号 = '" + HBillNo + "' and 状态 = '已审核' and 数量 - 已关联数量 > 0"; ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBillList"); if (ds.Tables[0].Rows.Count == 0) { objJsonResult.code = CodeConstant.FAIL; objJsonResult.count = CountConstant.FAIL; objJsonResult.Message = "找不到符合条件单据!"; objJsonResult.data = null; return objJsonResult; } 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));//获取到DataColumn列对象的列名 } objJsonResult.code = CodeConstant.SUCCEED; objJsonResult.count = CountConstant.SUCCEED; objJsonResult.Message = "Sucess！"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = CodeConstant.FAIL; objJsonResult.count = CountConstant.FAIL; objJsonResult.Message = "Exception！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -330,13 +330,6 @@ return false; } //保存后控制 if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn)) { oCn.RollBack(); return false; } //获取最近的上模单 把工单跟模具进行绑定 ds = oCn.RunProcReturn(@"select HICMOInterID,HICMOEntryID,HSourceInterID,HSourceEntryID,HSourceID from Sc_ICMOBillStatus_Tmp where HInterID=" + omodel.HMainSourceInterID.ToString(), "Sc_ICMOBillStatus_Tmp"); @@ -365,6 +358,13 @@ } } //保存后控制 if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn)) { oCn.RollBack(); return false; } sReturn = omodel.HInterID.ToString(); oCn.Commit(); return true; WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2024-09-06T07:32:52.1865278Z;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> <History>True|2024-09-09T01:26:23.2022383Z;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>09/06/2024 15:32:17</publishTime> <publishTime>09/09/2024 09:25:47</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>09/06/2024 15:32:17</publishTime> <publishTime>09/09/2024 09:25:47</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>09/06/2024 15:32:15</publishTime> <publishTime>09/09/2024 09:25:44</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>09/06/2024 15:32:15</publishTime> <publishTime>09/09/2024 09:25:44</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>09/06/2024 15:32:08</publishTime> <publishTime>09/09/2024 09:25:38</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>09/06/2024 15:32:08</publishTime> <publishTime>09/09/2024 09:25:38</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>09/06/2024 15:32:10</publishTime> <publishTime>09/09/2024 09:25:40</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>09/06/2024 15:32:10</publishTime> <publishTime>09/09/2024 09:25:40</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/15/2024 12:55:45</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>09/06/2024 15:32:06</publishTime> <publishTime>09/09/2024 09:25:35</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>09/06/2024 15:32:06</publishTime> <publishTime>09/09/2024 09:25:35</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>09/06/2024 15:32:07</publishTime> <publishTime>09/09/2024 09:25:36</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>09/06/2024 15:32:07</publishTime> <publishTime>09/09/2024 09:25:36</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>09/06/2024 15:32:07</publishTime> <publishTime>09/09/2024 09:25:36</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>09/06/2024 15:32:07</publishTime> <publishTime>09/09/2024 09:25:36</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>09/06/2024 15:29:00</publishTime> <publishTime>09/09/2024 09:23:27</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>09/06/2024 15:29:00</publishTime> <publishTime>09/09/2024 09:23:27</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +285,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>09/06/2024 15:29:08</publishTime> <publishTime>09/09/2024 09:23:33</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>09/06/2024 15:29:08</publishTime> <publishTime>09/09/2024 09:23:33</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>09/06/2024 15:32:49</publishTime> <publishTime>09/09/2024 09:26:19</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>09/06/2024 15:32:49</publishTime> <publishTime>09/09/2024 09:26:19</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>08/16/2024 16:55:28</publishTime> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
