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/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/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
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/x86/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/x86/Release/Model.dllBinary files differ
Model/obj/x86/Release/Model.pdbBinary files differ
Pub_Class/bin/x86/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/x86/Release/Pub_Class.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/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.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.dllBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.pdbBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
WarM/ÌõÂë´òÓ¡/Gy_CusBarCodeBillList.cs
@@ -238,6 +238,7 @@ GridppReport Report; int CurRows = 0; string sBarCodeItemID = ""; //æ¡ç èªå¢å string HBarCodeType = ""; //æ¡ç ç±»å //é¢è§ private void yl_Click(object sender, EventArgs e) @@ -245,6 +246,12 @@ //æå°é¢è§æé if (!DBUtility.ClsPub.Security_Log(ModRightNamePrint, 1, true, DBUtility.ClsPub.CurUserName)) { return; } //æå°å夿æ¡ç æ¯å¦è¶ è¿å è®¸å¯æå°æ¬¡æ° if (ReportPrintBegin()) { MessageBox.Show("æéæ¡ç ä¸åå¨å·²æå°çãè¶ èåå æ ç¾ãæ¡ç ï¼ä¸å è®¸åæ¬¡æå°ï¼"); return; } @@ -269,6 +276,12 @@ { return; } //æå°å夿æ¡ç æ¯å¦è¶ è¿å è®¸å¯æå°æ¬¡æ° if (ReportPrintBegin()) { MessageBox.Show("æéæ¡ç ä¸åå¨å·²æå°çãè¶ èåå æ ç¾ãæ¡ç ï¼ä¸å è®¸åæ¬¡æå°ï¼"); return; } //éæ©æå°æ¨¡æ¿ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp(); @@ -280,6 +293,40 @@ Sub_SetReport(oFrm.sOpenTmp); Report.Print(false); Thread.Sleep(1000); } } //æå°å夿æ¡ç æ¯å¦è¶ è¿å è®¸å¯æå°æ¬¡æ° private bool ReportPrintBegin() { sBarCodeItemID = ""; for (int i = 0; i < grdMain.SelectedRows.Count; i++) { sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString(); if(HBarCodeType != "è¶ èåå æ ç¾" && DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("æ¡ç ç±»å")].Value)== "è¶ èåå æ ç¾") { HBarCodeType = "è¶ èåå æ ç¾"; } } sBarCodeItemID = sBarCodeItemID.Remove(0, 1); if (HBarCodeType == "è¶ èåå æ ç¾") { DataSet DS; DS = oCn.RunProcReturn("select top 1 1 from Gy_BarCodeBill_Cus with(nolock) where HPrintQty >=1 and HBarCodeType = 'è¶ èåå æ ç¾' and HItemID in (" + sBarCodeItemID + ")", "Gy_BarCodeBill_Cus"); if (DS == null || DS.Tables[0].Rows.Count == 0) { return false; } else { return true; } } else { return false; } } @@ -299,6 +346,7 @@ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here . Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord); Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable); Report.PrintBegin += new _IGridppReportEvents_PrintBeginEventHandler(ReportPrintBegin2); Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd); } @@ -331,6 +379,17 @@ } } //æå°å¼å§å夿 private void ReportPrintBegin2() { //æå°å夿æ¡ç æ¯å¦å·²æå°è¿ if (ReportPrintBegin()) { MessageBox.Show("æ¡ç å·²æå°ï¼ä¸å è®¸åæ¬¡æå°ï¼"); Report.AbortPrint(); } } //æå°ç»æååå¡«æ¡ç æå°æ¬¡æ° private void ReportPrintEnd() { WarM/ÌõÂë´òÓ¡/Gy_CusBarCodeBill_KaiBei.cs
@@ -81,6 +81,7 @@ public string sYear4 = ""; //å¹´ï¼4ä½ï¼ public string sPeriod = ""; //æ public string sDay = ""; //æ¥ public string HBarCodeType = "è¶ èåå æ ç¾"; //æ¡ç ç±»å #region åºå®ä»£ç @@ -514,7 +515,6 @@ HCode2 = HCode2.ToUpper(); string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value); // çæ¬å· string HBatchNoNumber = ""; // æ¹æ¬¡çæåç¼ string HBarCodeType = "è¶ èåå æ ç¾"; // æ¡ç ç±»å string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); // 客æ·è®¢åå· if (HMaterID != 0) @@ -604,7 +604,6 @@ Int64 HEntryID = 0; string HBarCode = ""; //æ¡å½¢ç string HBarCodeType = ""; //æ¡ç ç±»å Int64 HMaterID = 0; //ç©æID Int64 HUnitID = 0; //计éåä½ID Int64 HAuxPropID = 0; //è¾ å©å±æ§ID @@ -682,7 +681,6 @@ HEntryID = j + 1; HBarCode = TM.ToUpper(); HBarCodeType = "è¶ èåå æ ç¾"; HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value); HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value); @@ -998,10 +996,17 @@ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber; grdMain.Rows[sRow].Cells[HMaterNameCol].Value = oMater.omodel.HName; grdMain.Rows[sRow].Cells[HMaterModelCol].Value = oMater.omodel.HModel; grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin; grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0; grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = ""; grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = ""; if (HBarCodeType == "è¶ èåå æ ç¾") { grdMain.Rows[sRow].Cells[HMinQtyCol].Value =1; } else { grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin; } if (oUnit.GetInfoByID(oMater.omodel.HUnitID)) { grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString(); @@ -1385,6 +1390,12 @@ return; } //æå°å夿æ¡ç æ¯å¦å·²æå°è¿ if (ReportPrintBegin()) { return; } //éæ©æå°æ¨¡æ¿ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp(); oFrm.sBillName = ModName; @@ -1410,6 +1421,12 @@ return; } //æå°å夿æ¡ç æ¯å¦å·²æå°è¿ if (ReportPrintBegin()) { return; } //éæ©æå°æ¨¡æ¿ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp(); oFrm.sBillName = ModName; @@ -1426,6 +1443,30 @@ #endregion //æå°å夿æ¡ç æ¯å¦è¶ è¿å è®¸å¯æå°æ¬¡æ° private bool ReportPrintBegin() { DataSet DS; if (HBarCodeType == "è¶ èåå æ ç¾") { DS = oCn.RunProcReturn("select top 1 1 from Gy_BarCodeBill_Cus with(nolock) where HPrintQty >=1 and HInterID = " + HInterID, "Gy_BarCodeBill_Cus"); if (DS == null || DS.Tables[0].Rows.Count == 0) { return false; } else { MessageBox.Show("æ¡ç å·²æå°ï¼ä¸å è®¸åæ¬¡æå°ï¼"); return true; } } else { return false; } } private void Sub_SetReport(string sOpenTmp) { //å¤æè¡æ° @@ -1438,6 +1479,7 @@ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here . Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord); Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable); Report.PrintBegin += new _IGridppReportEvents_PrintBeginEventHandler(ReportPrintBegin2); Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd); } @@ -1468,6 +1510,16 @@ } } //æå°å¼å§å夿 private void ReportPrintBegin2() { //æå°å夿æ¡ç æ¯å¦å·²æå°è¿ if (ReportPrintBegin()) { Report.AbortPrint(); } } //æå°ç»æååå¡«æ¡ç æå°æ¬¡æ° private void ReportPrintEnd() { 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-20T06:33:10.9210583Z;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;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> <History>True|2025-06-23T01:46:24.9049910Z;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;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/20/2025 14:32:56</publishTime> <publishTime>06/23/2025 09:46:04</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>06/20/2025 14:32:56</publishTime> <publishTime>06/23/2025 09:46:04</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>06/20/2025 14:32:54</publishTime> <publishTime>06/23/2025 09:46:01</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>06/20/2025 14:32:54</publishTime> <publishTime>06/23/2025 09:46:01</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>06/20/2025 14:32:48</publishTime> <publishTime>06/23/2025 09:45:55</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>06/20/2025 14:32:48</publishTime> <publishTime>06/23/2025 09:45:55</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/20/2025 14:32:49</publishTime> <publishTime>06/23/2025 09:45:56</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>06/20/2025 14:32:49</publishTime> <publishTime>06/23/2025 09:45:56</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/20/2025 14:32:45</publishTime> <publishTime>06/23/2025 09:45:48</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>06/20/2025 14:32:45</publishTime> <publishTime>06/23/2025 09:45:48</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>06/20/2025 14:32:46</publishTime> <publishTime>06/23/2025 09:45:53</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>06/20/2025 14:32:46</publishTime> <publishTime>06/23/2025 09:45:53</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>06/20/2025 14:32:46</publishTime> <publishTime>06/23/2025 09:45:53</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>06/20/2025 14:32:46</publishTime> <publishTime>06/23/2025 09:45:53</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>06/20/2025 14:32:02</publishTime> <publishTime>06/23/2025 09:45:07</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>06/20/2025 14:32:02</publishTime> <publishTime>06/23/2025 09:45:07</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/20/2025 14:32:08</publishTime> <publishTime>06/23/2025 09:45:11</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>06/20/2025 14:32:08</publishTime> <publishTime>06/23/2025 09:45:11</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>06/20/2025 14:33:05</publishTime> <publishTime>06/23/2025 09:46:17</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>06/20/2025 14:33:05</publishTime> <publishTime>06/23/2025 09:46:17</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>06/20/2025 14:33:09</publishTime> <publishTime>06/23/2025 09:46:23</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> sdk_dingding/TopSdk/bin/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ