PayM/bin/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/BLL.dllBinary files differ
PayM/bin/x86/Debug/BLL.pdbBinary files differ
PayM/bin/x86/Debug/DAL.dllBinary files differ
PayM/bin/x86/Debug/DAL.pdbBinary files differ
PayM/bin/x86/Debug/DBUtility.dllBinary files differ
PayM/bin/x86/Debug/DBUtility.pdbBinary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dllBinary files differ
PayM/bin/x86/Debug/Model.dllBinary files differ
PayM/bin/x86/Debug/Model.pdbBinary files differ
PayM/bin/x86/Debug/Newtonsoft.Json.dllBinary files differ
PayM/bin/x86/Debug/PayM.dllBinary files differ
PayM/bin/x86/Debug/PayM.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Class.dllBinary files differ
PayM/bin/x86/Debug/Pub_Class.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Control.dllBinary files differ
PayM/bin/x86/Debug/Pub_Control.pdbBinary files differ
PayM/bin/x86/Debug/SQLHelper.dllBinary files differ
PayM/bin/x86/Debug/SQLHelper.pdbBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
New file @@ -0,0 +1 @@ f95e56b5f9755e3380309c272e92c6c4a10dd4c5 SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary 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() { 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.csproj.CoreCompileInputs.cache
New file @@ -0,0 +1 @@ b7766d0cccdf2c98a5ed7c86257ed2f2c0c84c8a sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ