From 95e9366dac3b7713e1d3595384761da8de3a7c47 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 18 一月 2022 11:02:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_RepairBillController.cs | 8
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 4
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 4
WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs | 6
EAM/模具管理/模具日常管理/Sc_MouldMaintainRuleBill.designer.cs | 1548 ++++++++++---------
WebAPI/Properties/Settings.Designer.cs | 2
WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs | 4
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs | 2
WebAPI/Controllers/BLL/Xt_UserController.cs | 2
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 22
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 12
WebAPI/Controllers/生产管理/报工台工序/Sc_MESEndStepWorkBillController.cs | 6
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.resx | 82
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 34
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 10
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 2
WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs | 2
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 6
Model/仓库管理/条码管理/ClsGy_BarCodeEdit_Model.cs | 17
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs | 2
WebAPI/Controllers/BaseSet/Gy_EquipMentController.cs | 4
WebAPI/WebAPI.csproj | 4
WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs | 2
WebAPI/Web References/WebS/WebService1.wsdl | 4
WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs | 6
WebAPI/Controllers/生产管理/报工台工序/Sc_MESStopStepWorkBillController.cs | 6
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 2
WebAPI/Controllers/工资管理/Pay_OtherBalBillController.cs | 2
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 6
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 4
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.Designer.cs | 603 ++++---
WebAPI/Controllers/基础资料/基础资料/Gy_DotCheckBillController.cs | 8
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 6
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.cs | 259 +++
WebAPI/Web.config | 2
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 6
WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs | 2
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 2
WebAPI/Controllers/生产管理/报工台工序/Sc_MaterToSourceStepBillController.cs | 6
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 8
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 2
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 8
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 2
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs | 2
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 10
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 4
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 4
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 12
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 10
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 2
WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs | 2
WebAPI/Controllers/QC_ManagementController.cs | 10
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 8
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 4
WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs | 2
WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 2
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 4
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 2
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 8
WebAPI/Controllers/Kf_ICStockBillMainController.cs | 2
WebAPI/Controllers/Sc_MouldRepairOutBillController.cs | 2
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 4
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBackBillController.cs | 10
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 106
WebAPI/Controllers/WebAPIController.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 8
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs | 4
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 18
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs | 6
WebAPI/Web References/WebS/WebService1.disco | 6
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 4
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 8
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 4
WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs | 4
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 2
EAM/模具管理/模具日常管理/Sc_MouldMaintainRuleBill.resx | 1111 ++++++--------
DAL/DAL.csproj | 1
WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs | 2
WebAPI/Controllers/GG_NoticeController.cs | 6
WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs | 4
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 10
WebAPI/Controllers/工资管理/Gy_ClassTimePrjBillController.cs | 4
WebAPI/Properties/Settings.settings | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 152
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12
WebAPI/Controllers/LMESController.cs | 2
WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs | 2
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs | 4
WebAPI/Controllers/生产管理/报工台工序/Sc_QualityReportStepBillController.cs | 4
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 4
WebAPI/Controllers/基础资料/基础资料/Gy_RepairCheckBillController.cs | 8
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 8
WebAPI/Controllers/基础资料/基础资料/Gy_MaintainBillController.cs | 8
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 8
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 123
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 10
WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs | 6
DAL/仓库管理/条码管理/ClsGy_BarCodeBill_ChaiMa.cs | 67
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs | 2
WebAPI/Web References/WebS/Reference.map | 4
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 4
WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs | 4
WebAPI/Controllers/Sc_ProcessMangementController.cs | 4
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 4
105 files changed, 2,446 insertions(+), 2,141 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index b709dc8..d17010e 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -76,6 +76,7 @@
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
<Compile Include="MES\ClsSc_MESMaterToSourceBill .cs" />
+ <Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsGy_BarCodeBill_ChaiMa.cs" />
<Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList.cs" />
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeBill_ChaiMa.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeBill_ChaiMa.cs"
new file mode 100644
index 0000000..78f0f0e
--- /dev/null
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeBill_ChaiMa.cs"
@@ -0,0 +1,67 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DAL
+{
+ public class ClsGy_BarCodeBill_ChaiMa : DBUtility.ClsGy_Base_Ctl
+ {
+ public Model.ClsGy_BarCodeEdit_Model omodel = new Model.ClsGy_BarCodeEdit_Model();
+ public List<Model.ClsGy_BarCodeEdit_Model> DetailColl_Mater = new List<Model.ClsGy_BarCodeEdit_Model>();
+ public List<Model.ClsGy_BarCodeEdit_Model> DetailColl_Pay = new List<Model.ClsGy_BarCodeEdit_Model>();
+
+
+ public bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ string sql = "delete Gy_BarCodeBill where HBarCode='" + omodel.HBarCode + "'";
+ oCn.RunProc(sql);
+ ////鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_BarCodeEdit_Model oSub in DetailColl_Mater)
+ {
+ string sql2 = "Insert Into Gy_BarCodeBill " +
+ "(HInterID,HEntryID,HBillType,HProcID,HBarCode,HBarCodeType,HItemSubID" +
+ ",HMaterID,HUnitID,HPieceQty,HQty,HBatchNo,HSupID,HGroupID,HDeptID,HEmpID" +
+ ",HMaker,HMakeDate,HPrintQty,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HRemark,HUseFlag,HEndQty,HWei,HStopflag,HBarCodeStatus,HReadyQty,HinitQty,HAuxPropID" +
+ ",HMTONo,HSupflag,HEndDate,HSourceID,HCusType,HWorkLineName,HCusID,HSTOCKORGID,HOWNERID" +
+ ",HJiaYe,HPressModel,HCusModel,HMaterialModel,HColor,HLogo,HPackageSize,HMaterialJQty" +
+ ",HMaterialMQty,HCustomBatchNo,HBarCodeDate,HGBBarCode,HOLDBarCodeFlag,HOldSourceInterID" +
+ ",HOldSourceEntryID,HOldSourceBillNo,HOrderInterID,HOrderEntryID,HOrderBillNo,HOrderBillType" +
+ ",HRelationNum,HLabelQty,HMinQty,HNowQty,HStopMan,HInStockDate_XF,HExpressNumber,POOrderBillNo" +
+ ",HICMOReportBillNo,HInStockCounts,HReportCounts,HOutStockCounts,HInStockBillNo,HOutStockBillNo" +
+ ",HSendGoodsBillNo,HServerItemID,HBadReasonList,HProdLev,HInnerBillNo,HCusBarCode,HStatus,HInitSourceEntryID" +
+ ",HOldSourceBillType,HMZ,HGiveAwayFlag" +
+ ") " +
+ " values("+ oSub.HInterID + ",1,'3710',0," + oSub.HBarCode + ",'" + oSub.HBarCodeType + "','" + oSub.HItemSubID+
+ "'," + oSub.HMaterID + ","+ oSub.HUnitID + ",0,"+ oSub.HQty + ","+ oSub.HBatchNo + ","+ oSub.HSupID + "," + oSub.HGroupID + "," + oSub.HDeptID + "," + oSub.HEmpID +
+ "," + oSub.HMaker + ",'" + oSub.HMakeDate + "',0," + oSub.HSourceInterID + ","+ oSub.HSourceEntryID + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," +
+ "'','" + oSub.HUseFlag + "','',''," + oSub.HStopflag + ",'',0,"+ oSub.HInitQty+",0"+
+ ",'',0,'',"+ oSub.HSourceID+",'','',"+ oSub.HCusID+","+ oSub.HSTOCKORGID+","+ oSub.HOWNERID +
+ ",'','','','','','','',0,"+
+ "0,'','"+oSub.HBarCodeDate+"','',0,0"+
+ ",0,'',0,0,'',''"+
+ ",'',0,0,0,'','','',''"+
+ ",'',0,0,0,'',''"+
+ ",'',0,'','','"+oSub.HInnerBillNo+"','','',0,''"+
+ ","+ oSub.HMZ+",0"+
+ ") ";
+ oCn.RunProc(sql2);
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ }
+}
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.designer.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.designer.cs"
index c86d64c..5db0c98 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.designer.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.designer.cs"
@@ -28,9 +28,10 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_MouldMaintainRuleBill));
- this.Tool = new System.Windows.Forms.ToolStrip();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.timer1 = new System.Windows.Forms.Timer();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
this.set = new System.Windows.Forms.ToolStripButton();
this.dy = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
@@ -76,125 +77,102 @@
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
- this.lblCaption = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.txtHBillNo = new System.Windows.Forms.TextBox();
- this.P1 = new System.Windows.Forms.Panel();
- this.pic1 = new System.Windows.Forms.PictureBox();
- this.gbUp = new System.Windows.Forms.GroupBox();
- this.txtHCheckCycle = new System.Windows.Forms.TextBox();
- this.cmbHCycleUnit = new System.Windows.Forms.ComboBox();
- this.label26 = new System.Windows.Forms.Label();
- this.label12 = new System.Windows.Forms.Label();
- this.txtHExplanation = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
- this.txtHInnerBillNo = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.txtHRemark = new System.Windows.Forms.TextBox();
- this.label20 = new System.Windows.Forms.Label();
- this.dtpHDate = new System.Windows.Forms.DateTimePicker();
- this.label9 = new System.Windows.Forms.Label();
- this.cmdSourceBillNo = new System.Windows.Forms.Button();
- this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
- this.textBox2 = new System.Windows.Forms.TextBox();
- this.label24 = new System.Windows.Forms.Label();
- this.label22 = new System.Windows.Forms.Label();
- this.panel2 = new System.Windows.Forms.Panel();
- this.txtHDeleteDate = new System.Windows.Forms.Label();
- this.label25 = new System.Windows.Forms.Label();
- this.txtHDeleteMan = new System.Windows.Forms.Label();
- this.label27 = new System.Windows.Forms.Label();
- this.txtHUpDateDate = new System.Windows.Forms.Label();
- this.label23 = new System.Windows.Forms.Label();
- this.txtHUpDater = new System.Windows.Forms.Label();
- this.label21 = new System.Windows.Forms.Label();
- this.txtHCloseDate = new System.Windows.Forms.Label();
- this.label19 = new System.Windows.Forms.Label();
- this.txtHCloseMan = new System.Windows.Forms.Label();
- this.label17 = new System.Windows.Forms.Label();
- this.txtHCheckDate = new System.Windows.Forms.Label();
- this.label15 = new System.Windows.Forms.Label();
- this.txtHChecker = new System.Windows.Forms.Label();
- this.label13 = new System.Windows.Forms.Label();
- this.txtHMakeDate = new System.Windows.Forms.Label();
- this.label11 = new System.Windows.Forms.Label();
- this.txtHMaker = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
- this.panel1 = new System.Windows.Forms.Panel();
+ this.Tool = new System.Windows.Forms.ToolStrip();
this.panel3 = new System.Windows.Forms.Panel();
- this.grdPrint = new System.Windows.Forms.DataGridView();
- this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.panel1 = new System.Windows.Forms.Panel();
this.tabPage1 = new System.Windows.Forms.TabPage();
- this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
- this.grdMain_Pay = new System.Windows.Forms.DataGridView();
this.grdSum_Pay = new System.Windows.Forms.DataGridView();
- this.Tool.SuspendLayout();
- this.P1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
- this.gbUp.SuspendLayout();
- this.panel2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.label22 = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
+ this.cmdSourceBillNo = new System.Windows.Forms.Button();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.txtHRemark = new System.Windows.Forms.TextBox();
+ this.lblCaption = new System.Windows.Forms.Label();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.grdMain_Pay = new System.Windows.Forms.DataGridView();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label20 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMakeDate = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.txtHChecker = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHCheckDate = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHCloseMan = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHCloseDate = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.txtHUpDater = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHDeleteMan = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.txtHDeleteDate = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHInnerBillNo = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txtHExplanation = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.label26 = new System.Windows.Forms.Label();
+ this.cmbHCycleUnit = new System.Windows.Forms.ComboBox();
+ this.txtHCheckCycle = new System.Windows.Forms.TextBox();
+ this.txtHUpDateDate = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
this.tabControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.Tool.SuspendLayout();
this.tabPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.tabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdMain_Pay)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.grdSum_Pay)).BeginInit();
+ this.gbUp.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+ this.P1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain_Pay)).BeginInit();
+ this.panel2.SuspendLayout();
this.SuspendLayout();
//
- // Tool
+ // tabControl1
//
- this.Tool.AutoSize = false;
- this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
- this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
- this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.set,
- this.dy,
- this.yl,
- this.toolStripSeparator2,
- this.xz,
- this.xg,
- this.sc,
- this.toolStripSeparator7,
- this.js,
- this.toolStripSeparator8,
- this.AddRow,
- this.DelRow,
- this.toolStripSeparator4,
- this.bc,
- this.fq,
- this.toolStripSeparator5,
- this.sh,
- this.qsh,
- this.toolStripSeparator1,
- this.sz,
- this.syz,
- this.xyz,
- this.mz,
- this.toolStripSeparator3,
- this.fz,
- this.xx,
- this.toolStripSeparator9,
- this.qt,
- this.toolStripSeparator6,
- this.tc,
- this.toolStripSeparator12,
- this.mrlk,
- this.toolStripSeparator11,
- this.bclk,
- this.toolStripSeparator10});
- this.Tool.Location = new System.Drawing.Point(0, 0);
- this.Tool.Name = "Tool";
- this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1017, 50);
- this.Tool.Stretch = true;
- this.Tool.TabIndex = 17;
- this.Tool.Text = "toolStrip1";
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(55, 291);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1249, 303);
+ this.tabControl1.TabIndex = 47;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(1079, 679);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.TabIndex = 46;
+ this.grdPrint.Visible = false;
//
// set
//
@@ -241,7 +219,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// xz
//
@@ -288,7 +266,7 @@
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// js
//
@@ -307,7 +285,7 @@
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// AddRow
//
@@ -340,7 +318,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// bc
//
@@ -373,7 +351,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// sh
//
@@ -406,7 +384,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// sz
//
@@ -467,7 +445,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
this.toolStripSeparator3.Visible = false;
//
// fz
@@ -503,7 +481,7 @@
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// qt
//
@@ -523,7 +501,7 @@
this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.qt.ImageTransparentColor = System.Drawing.Color.White;
this.qt.Name = "qt";
- this.qt.Size = new System.Drawing.Size(42, 47);
+ this.qt.Size = new System.Drawing.Size(53, 59);
this.qt.Text = "鍏朵粬";
this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -531,71 +509,71 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(127, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(221, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(127, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(221, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(127, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(221, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -615,7 +593,7 @@
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -625,7 +603,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(57, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -635,7 +613,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -645,7 +623,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(57, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -655,63 +633,222 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
- // lblCaption
+ // Tool
//
- this.lblCaption.AutoSize = true;
- this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(424, 17);
- this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(89, 19);
- this.lblCaption.TabIndex = 18;
- this.lblCaption.Text = "鍗曟嵁缂栬緫";
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.set,
+ this.dy,
+ this.yl,
+ this.toolStripSeparator2,
+ this.xz,
+ this.xg,
+ this.sc,
+ this.toolStripSeparator7,
+ this.js,
+ this.toolStripSeparator8,
+ this.AddRow,
+ this.DelRow,
+ this.toolStripSeparator4,
+ this.bc,
+ this.fq,
+ this.toolStripSeparator5,
+ this.sh,
+ this.qsh,
+ this.toolStripSeparator1,
+ this.sz,
+ this.syz,
+ this.xyz,
+ this.mz,
+ this.toolStripSeparator3,
+ this.fz,
+ this.xx,
+ this.toolStripSeparator9,
+ this.qt,
+ this.toolStripSeparator6,
+ this.tc,
+ this.toolStripSeparator12,
+ this.mrlk,
+ this.toolStripSeparator11,
+ this.bclk,
+ this.toolStripSeparator10});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1356, 62);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 17;
+ this.Tool.Text = "toolStrip1";
//
- // label2
+ // panel3
//
- this.label2.AutoSize = true;
- this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(33, 26);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
- this.label2.TabIndex = 19;
- this.label2.Text = "鍗� 鎹� 鍙�";
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel3.Location = new System.Drawing.Point(1304, 62);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(52, 648);
+ this.panel3.TabIndex = 34;
//
- // txtHBillNo
+ // panel1
//
- this.txtHBillNo.BackColor = System.Drawing.Color.Beige;
- this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(92, 22);
- this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(188, 21);
- this.txtHBillNo.TabIndex = 20;
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(55, 648);
+ this.panel1.TabIndex = 33;
//
- // P1
+ // tabPage1
//
- this.P1.BackColor = System.Drawing.Color.Lavender;
- this.P1.Controls.Add(this.pic1);
- this.P1.Controls.Add(this.lblCaption);
- this.P1.Controls.Add(this.gbUp);
- this.P1.Controls.Add(this.cmdSourceBillNo);
- this.P1.Controls.Add(this.cmbSourceBillType);
- this.P1.Controls.Add(this.textBox2);
- this.P1.Controls.Add(this.label24);
- this.P1.Controls.Add(this.label22);
- this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(41, 50);
- this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(937, 183);
- this.P1.TabIndex = 31;
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Controls.Add(this.grdSum);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Size = new System.Drawing.Size(1241, 274);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "椤�1";
+ this.tabPage1.UseVisualStyleBackColor = true;
//
- // pic1
+ // grdSum
//
- this.pic1.Location = new System.Drawing.Point(313, 3);
- this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(78, 41);
- this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pic1.TabIndex = 36;
- this.pic1.TabStop = false;
- this.pic1.Visible = false;
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(4, 246);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(1233, 24);
+ this.grdSum.TabIndex = 46;
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 30;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(1233, 242);
+ this.grdMain.TabIndex = 47;
+ this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+ this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.grdMain_Pay);
+ this.tabPage2.Controls.Add(this.grdSum_Pay);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Size = new System.Drawing.Size(1241, 274);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "椤�2";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // grdSum_Pay
+ //
+ this.grdSum_Pay.AllowUserToAddRows = false;
+ this.grdSum_Pay.AllowUserToDeleteRows = false;
+ this.grdSum_Pay.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum_Pay.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum_Pay.Location = new System.Drawing.Point(4, 246);
+ this.grdSum_Pay.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum_Pay.Name = "grdSum_Pay";
+ this.grdSum_Pay.ReadOnly = true;
+ this.grdSum_Pay.RowHeadersWidth = 51;
+ this.grdSum_Pay.RowTemplate.Height = 23;
+ this.grdSum_Pay.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum_Pay.Size = new System.Drawing.Size(1233, 24);
+ this.grdSum_Pay.TabIndex = 48;
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.ForeColor = System.Drawing.Color.Black;
+ this.label22.Location = new System.Drawing.Point(1020, 22);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(68, 15);
+ this.label22.TabIndex = 128;
+ this.label22.Text = "閫� 鍗� 鍙�";
+ this.label22.Visible = false;
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.ForeColor = System.Drawing.Color.Black;
+ this.label24.Location = new System.Drawing.Point(643, 21);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(67, 15);
+ this.label24.TabIndex = 126;
+ this.label24.Text = "婧愬崟绫诲瀷";
+ this.label24.Visible = false;
+ //
+ // textBox2
+ //
+ this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textBox2.Location = new System.Drawing.Point(1111, 15);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(220, 25);
+ this.textBox2.TabIndex = 129;
+ this.textBox2.Visible = false;
+ //
+ // cmbSourceBillType
+ //
+ this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbSourceBillType.FormattingEnabled = true;
+ this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbSourceBillType.Items.AddRange(new object[] {
+ "妯″叿澶栧姞宸ヨ鍒掑崟",
+ "鎵嬪伐褰曞叆"});
+ this.cmbSourceBillType.Location = new System.Drawing.Point(725, 16);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbSourceBillType.Name = "cmbSourceBillType";
+ this.cmbSourceBillType.Size = new System.Drawing.Size(248, 23);
+ this.cmbSourceBillType.TabIndex = 127;
+ this.cmbSourceBillType.Visible = false;
+ //
+ // cmdSourceBillNo
+ //
+ this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
+ this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(1332, 15);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
+ this.cmdSourceBillNo.TabIndex = 130;
+ this.cmdSourceBillNo.UseVisualStyleBackColor = true;
+ this.cmdSourceBillNo.Visible = false;
+ this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
//
// gbUp
//
@@ -730,187 +867,297 @@
this.gbUp.Controls.Add(this.label20);
this.gbUp.Controls.Add(this.dtpHDate);
this.gbUp.Controls.Add(this.label9);
- this.gbUp.Location = new System.Drawing.Point(14, 39);
+ this.gbUp.Location = new System.Drawing.Point(19, 49);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(892, 134);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1189, 168);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
- //
- // txtHCheckCycle
- //
- this.txtHCheckCycle.BackColor = System.Drawing.Color.White;
- this.txtHCheckCycle.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCheckCycle.Location = new System.Drawing.Point(92, 49);
- this.txtHCheckCycle.Name = "txtHCheckCycle";
- this.txtHCheckCycle.Size = new System.Drawing.Size(188, 21);
- this.txtHCheckCycle.TabIndex = 155;
- //
- // cmbHCycleUnit
- //
- this.cmbHCycleUnit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbHCycleUnit.FormattingEnabled = true;
- this.cmbHCycleUnit.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbHCycleUnit.Items.AddRange(new object[] {
- "澶�",
- "鍛�",
- "鏈�"});
- this.cmbHCycleUnit.Location = new System.Drawing.Point(377, 49);
- this.cmbHCycleUnit.Name = "cmbHCycleUnit";
- this.cmbHCycleUnit.Size = new System.Drawing.Size(188, 20);
- this.cmbHCycleUnit.TabIndex = 131;
- //
- // label26
- //
- this.label26.AutoSize = true;
- this.label26.ForeColor = System.Drawing.Color.Black;
- this.label26.Location = new System.Drawing.Point(33, 53);
- this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(53, 12);
- this.label26.TabIndex = 154;
- this.label26.Text = "淇濆吇鍛ㄦ湡";
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(316, 53);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(53, 12);
- this.label12.TabIndex = 152;
- this.label12.Text = "鍛ㄦ湡鍗曚綅";
- //
- // txtHExplanation
- //
- this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHExplanation.Location = new System.Drawing.Point(92, 76);
- this.txtHExplanation.Multiline = true;
- this.txtHExplanation.Name = "txtHExplanation";
- this.txtHExplanation.Size = new System.Drawing.Size(763, 21);
- this.txtHExplanation.TabIndex = 91;
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(33, 80);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(53, 12);
- this.label6.TabIndex = 90;
- this.label6.Text = "鎽� 瑕�";
- //
- // txtHInnerBillNo
- //
- this.txtHInnerBillNo.BackColor = System.Drawing.Color.White;
- this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHInnerBillNo.Location = new System.Drawing.Point(667, 22);
- this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(188, 21);
- this.txtHInnerBillNo.TabIndex = 89;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(595, 26);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(65, 12);
- this.label4.TabIndex = 88;
- this.label4.Text = "鍐呴儴鍗曟嵁鍙�";
- //
- // txtHRemark
- //
- this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(92, 103);
- this.txtHRemark.Multiline = true;
- this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(763, 21);
- this.txtHRemark.TabIndex = 57;
- //
- // label20
- //
- this.label20.AutoSize = true;
- this.label20.ForeColor = System.Drawing.Color.Black;
- this.label20.Location = new System.Drawing.Point(33, 107);
- this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(53, 12);
- this.label20.TabIndex = 56;
- this.label20.Text = "澶� 娉�";
- //
- // dtpHDate
- //
- this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHDate.Location = new System.Drawing.Point(377, 22);
- this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(188, 21);
- this.dtpHDate.TabIndex = 32;
//
// label9
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(316, 26);
+ this.label9.Location = new System.Drawing.Point(421, 32);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(53, 12);
+ this.label9.Size = new System.Drawing.Size(69, 15);
this.label9.TabIndex = 31;
this.label9.Text = "鏃� 鏈�";
//
- // cmdSourceBillNo
+ // txtHRemark
//
- this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
- this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(999, 12);
- this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
- this.cmdSourceBillNo.TabIndex = 130;
- this.cmdSourceBillNo.UseVisualStyleBackColor = true;
- this.cmdSourceBillNo.Visible = false;
- this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
+ this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHRemark.Location = new System.Drawing.Point(123, 129);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHRemark.Multiline = true;
+ this.txtHRemark.Name = "txtHRemark";
+ this.txtHRemark.Size = new System.Drawing.Size(1016, 25);
+ this.txtHRemark.TabIndex = 57;
//
- // cmbSourceBillType
+ // lblCaption
//
- this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbSourceBillType.FormattingEnabled = true;
- this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Items.AddRange(new object[] {
- "妯″叿澶栧姞宸ヨ鍒掑崟",
- "鎵嬪伐褰曞叆"});
- this.cmbSourceBillType.Location = new System.Drawing.Point(544, 13);
- this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(187, 20);
- this.cmbSourceBillType.TabIndex = 127;
- this.cmbSourceBillType.Visible = false;
+ this.lblCaption.AutoSize = true;
+ this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblCaption.Location = new System.Drawing.Point(565, 21);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
+ this.lblCaption.TabIndex = 18;
+ this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
- // textBox2
+ // pic1
//
- this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textBox2.Location = new System.Drawing.Point(833, 12);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(166, 21);
- this.textBox2.TabIndex = 129;
- this.textBox2.Visible = false;
+ this.pic1.Location = new System.Drawing.Point(417, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(104, 51);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 36;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
//
- // label24
+ // P1
//
- this.label24.AutoSize = true;
- this.label24.ForeColor = System.Drawing.Color.Black;
- this.label24.Location = new System.Drawing.Point(482, 17);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(53, 12);
- this.label24.TabIndex = 126;
- this.label24.Text = "婧愬崟绫诲瀷";
- this.label24.Visible = false;
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.pic1);
+ this.P1.Controls.Add(this.lblCaption);
+ this.P1.Controls.Add(this.gbUp);
+ this.P1.Controls.Add(this.cmdSourceBillNo);
+ this.P1.Controls.Add(this.cmbSourceBillType);
+ this.P1.Controls.Add(this.textBox2);
+ this.P1.Controls.Add(this.label24);
+ this.P1.Controls.Add(this.label22);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(55, 62);
+ this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(1249, 229);
+ this.P1.TabIndex = 31;
//
- // label22
+ // grdMain_Pay
//
- this.label22.AutoSize = true;
- this.label22.ForeColor = System.Drawing.Color.Black;
- this.label22.Location = new System.Drawing.Point(765, 18);
- this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(53, 12);
- this.label22.TabIndex = 128;
- this.label22.Text = "閫� 鍗� 鍙�";
- this.label22.Visible = false;
+ this.grdMain_Pay.AllowUserToAddRows = false;
+ this.grdMain_Pay.AllowUserToDeleteRows = false;
+ this.grdMain_Pay.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain_Pay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain_Pay.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain_Pay.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain_Pay.Location = new System.Drawing.Point(4, 4);
+ this.grdMain_Pay.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain_Pay.Name = "grdMain_Pay";
+ this.grdMain_Pay.ReadOnly = true;
+ this.grdMain_Pay.RowHeadersWidth = 30;
+ this.grdMain_Pay.RowTemplate.Height = 23;
+ this.grdMain_Pay.Size = new System.Drawing.Size(1233, 242);
+ this.grdMain_Pay.TabIndex = 49;
+ this.grdMain_Pay.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_Pay_RowHeadersWidthChanged);
+ this.grdMain_Pay.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_Pay_CellBeginEdit);
+ this.grdMain_Pay.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_Pay_CellEndEdit);
+ this.grdMain_Pay.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_Pay_CellLeave);
+ this.grdMain_Pay.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_Pay_ColumnWidthChanged);
+ this.grdMain_Pay.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_Pay_EditingControlShowing);
+ this.grdMain_Pay.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Pay_Scroll);
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.dtpHDate.Location = new System.Drawing.Point(503, 28);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHDate.TabIndex = 32;
+ //
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.ForeColor = System.Drawing.Color.Black;
+ this.label20.Location = new System.Drawing.Point(44, 134);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(69, 15);
+ this.label20.TabIndex = 56;
+ this.label20.Text = "澶� 娉�";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.ForeColor = System.Drawing.Color.Black;
+ this.label2.Location = new System.Drawing.Point(44, 32);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(68, 15);
+ this.label2.TabIndex = 19;
+ this.label2.Text = "鍗� 鎹� 鍙�";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.BackColor = System.Drawing.Color.Transparent;
+ this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label8.Location = new System.Drawing.Point(16, 20);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(52, 15);
+ this.label8.TabIndex = 0;
+ this.label8.Text = "鍒跺崟浜�";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMaker.Location = new System.Drawing.Point(95, 16);
+ this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(131, 19);
+ this.txtHMaker.TabIndex = 1;
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label11.Location = new System.Drawing.Point(16, 62);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(67, 15);
+ this.label11.TabIndex = 2;
+ this.label11.Text = "鍒跺崟鏃ユ湡";
+ //
+ // txtHMakeDate
+ //
+ this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
+ this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMakeDate.Name = "txtHMakeDate";
+ this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHMakeDate.TabIndex = 3;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.BackColor = System.Drawing.Color.Transparent;
+ this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label13.Location = new System.Drawing.Point(233, 20);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(52, 15);
+ this.label13.TabIndex = 4;
+ this.label13.Text = "瀹℃牳浜�";
+ //
+ // txtHChecker
+ //
+ this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHChecker.Location = new System.Drawing.Point(312, 16);
+ this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHChecker.Name = "txtHChecker";
+ this.txtHChecker.Size = new System.Drawing.Size(131, 19);
+ this.txtHChecker.TabIndex = 5;
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.BackColor = System.Drawing.Color.Transparent;
+ this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label15.Location = new System.Drawing.Point(233, 62);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.TabIndex = 6;
+ this.label15.Text = "瀹℃牳鏃ユ湡";
+ //
+ // txtHCheckDate
+ //
+ this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
+ this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCheckDate.Name = "txtHCheckDate";
+ this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCheckDate.TabIndex = 7;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.BackColor = System.Drawing.Color.Transparent;
+ this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label17.Location = new System.Drawing.Point(451, 20);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(52, 15);
+ this.label17.TabIndex = 8;
+ this.label17.Text = "鍏抽棴浜�";
+ //
+ // txtHCloseMan
+ //
+ this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
+ this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseMan.Name = "txtHCloseMan";
+ this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseMan.TabIndex = 9;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.BackColor = System.Drawing.Color.Transparent;
+ this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label19.Location = new System.Drawing.Point(451, 62);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(67, 15);
+ this.label19.TabIndex = 10;
+ this.label19.Text = "鍏抽棴鏃ユ湡";
+ //
+ // txtHCloseDate
+ //
+ this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
+ this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseDate.Name = "txtHCloseDate";
+ this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseDate.TabIndex = 11;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.BackColor = System.Drawing.Color.Transparent;
+ this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label21.Location = new System.Drawing.Point(671, 15);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(52, 15);
+ this.label21.TabIndex = 12;
+ this.label21.Text = "淇敼浜�";
+ //
+ // txtHUpDater
+ //
+ this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
+ this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDater.Name = "txtHUpDater";
+ this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDater.TabIndex = 13;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.BackColor = System.Drawing.Color.Transparent;
+ this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label23.Location = new System.Drawing.Point(671, 59);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(67, 15);
+ this.label23.TabIndex = 14;
+ this.label23.Text = "淇敼鏃ユ湡";
//
// panel2
//
@@ -936,361 +1183,171 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(41, 475);
+ this.panel2.Location = new System.Drawing.Point(55, 594);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(937, 93);
+ this.panel2.Size = new System.Drawing.Size(1249, 116);
this.panel2.TabIndex = 32;
//
- // txtHDeleteDate
+ // txtHDeleteMan
//
- this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
- this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
- this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
- this.txtHDeleteDate.TabIndex = 19;
+ this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
+ this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteMan.Name = "txtHDeleteMan";
+ this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteMan.TabIndex = 17;
//
// label25
//
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(666, 50);
+ this.label25.Location = new System.Drawing.Point(888, 62);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(53, 12);
+ this.label25.Size = new System.Drawing.Size(67, 15);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
- // txtHDeleteMan
+ // txtHDeleteDate
//
- this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
- this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
- this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
- this.txtHDeleteMan.TabIndex = 17;
+ this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
+ this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteDate.Name = "txtHDeleteDate";
+ this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteDate.TabIndex = 19;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.ForeColor = System.Drawing.Color.Black;
+ this.label4.Location = new System.Drawing.Point(793, 32);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(82, 15);
+ this.label4.TabIndex = 88;
+ this.label4.Text = "鍐呴儴鍗曟嵁鍙�";
+ //
+ // txtHInnerBillNo
+ //
+ this.txtHInnerBillNo.BackColor = System.Drawing.Color.White;
+ this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(889, 28);
+ this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Name = "txtHInnerBillNo";
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHInnerBillNo.TabIndex = 89;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.ForeColor = System.Drawing.Color.Black;
+ this.label6.Location = new System.Drawing.Point(44, 100);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(69, 15);
+ this.label6.TabIndex = 90;
+ this.label6.Text = "鎽� 瑕�";
+ //
+ // txtHExplanation
+ //
+ this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHExplanation.Location = new System.Drawing.Point(123, 95);
+ this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHExplanation.Multiline = true;
+ this.txtHExplanation.Name = "txtHExplanation";
+ this.txtHExplanation.Size = new System.Drawing.Size(1016, 25);
+ this.txtHExplanation.TabIndex = 91;
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.ForeColor = System.Drawing.Color.Black;
+ this.label12.Location = new System.Drawing.Point(421, 66);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(67, 15);
+ this.label12.TabIndex = 152;
+ this.label12.Text = "鍛ㄦ湡鍗曚綅";
+ //
+ // label26
+ //
+ this.label26.AutoSize = true;
+ this.label26.ForeColor = System.Drawing.Color.Black;
+ this.label26.Location = new System.Drawing.Point(44, 66);
+ this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label26.Name = "label26";
+ this.label26.Size = new System.Drawing.Size(67, 15);
+ this.label26.TabIndex = 154;
+ this.label26.Text = "淇濆吇鍛ㄦ湡";
+ //
+ // cmbHCycleUnit
+ //
+ this.cmbHCycleUnit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHCycleUnit.FormattingEnabled = true;
+ this.cmbHCycleUnit.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbHCycleUnit.Items.AddRange(new object[] {
+ "澶�",
+ "鍛�",
+ "鏈�"});
+ this.cmbHCycleUnit.Location = new System.Drawing.Point(503, 61);
+ this.cmbHCycleUnit.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHCycleUnit.Name = "cmbHCycleUnit";
+ this.cmbHCycleUnit.Size = new System.Drawing.Size(249, 23);
+ this.cmbHCycleUnit.TabIndex = 131;
+ //
+ // txtHCheckCycle
+ //
+ this.txtHCheckCycle.BackColor = System.Drawing.Color.White;
+ this.txtHCheckCycle.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHCheckCycle.Location = new System.Drawing.Point(123, 61);
+ this.txtHCheckCycle.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCheckCycle.Name = "txtHCheckCycle";
+ this.txtHCheckCycle.Size = new System.Drawing.Size(249, 25);
+ this.txtHCheckCycle.TabIndex = 155;
+ //
+ // txtHUpDateDate
+ //
+ this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
+ this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDateDate.Name = "txtHUpDateDate";
+ this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDateDate.TabIndex = 15;
//
// label27
//
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(666, 12);
+ this.label27.Location = new System.Drawing.Point(888, 15);
+ this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(41, 12);
+ this.label27.Size = new System.Drawing.Size(52, 15);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
- // txtHUpDateDate
+ // txtHBillNo
//
- this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
- this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
- this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
- this.txtHUpDateDate.TabIndex = 15;
- //
- // label23
- //
- this.label23.AutoSize = true;
- this.label23.BackColor = System.Drawing.Color.Transparent;
- this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(503, 47);
- this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(53, 12);
- this.label23.TabIndex = 14;
- this.label23.Text = "淇敼鏃ユ湡";
- //
- // txtHUpDater
- //
- this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
- this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
- this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
- this.txtHUpDater.TabIndex = 13;
- //
- // label21
- //
- this.label21.AutoSize = true;
- this.label21.BackColor = System.Drawing.Color.Transparent;
- this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(503, 12);
- this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(41, 12);
- this.label21.TabIndex = 12;
- this.label21.Text = "淇敼浜�";
- //
- // txtHCloseDate
- //
- this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
- this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
- this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
- this.txtHCloseDate.TabIndex = 11;
- //
- // label19
- //
- this.label19.AutoSize = true;
- this.label19.BackColor = System.Drawing.Color.Transparent;
- this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(338, 50);
- this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(53, 12);
- this.label19.TabIndex = 10;
- this.label19.Text = "鍏抽棴鏃ユ湡";
- //
- // txtHCloseMan
- //
- this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
- this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
- this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
- this.txtHCloseMan.TabIndex = 9;
- //
- // label17
- //
- this.label17.AutoSize = true;
- this.label17.BackColor = System.Drawing.Color.Transparent;
- this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(338, 16);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(41, 12);
- this.label17.TabIndex = 8;
- this.label17.Text = "鍏抽棴浜�";
- //
- // txtHCheckDate
- //
- this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
- this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
- this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
- this.txtHCheckDate.TabIndex = 7;
- //
- // label15
- //
- this.label15.AutoSize = true;
- this.label15.BackColor = System.Drawing.Color.Transparent;
- this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(175, 50);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(53, 12);
- this.label15.TabIndex = 6;
- this.label15.Text = "瀹℃牳鏃ユ湡";
- //
- // txtHChecker
- //
- this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
- this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(234, 13);
- this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(98, 15);
- this.txtHChecker.TabIndex = 5;
- //
- // label13
- //
- this.label13.AutoSize = true;
- this.label13.BackColor = System.Drawing.Color.Transparent;
- this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(175, 16);
- this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(41, 12);
- this.label13.TabIndex = 4;
- this.label13.Text = "瀹℃牳浜�";
- //
- // txtHMakeDate
- //
- this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
- this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
- this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
- this.txtHMakeDate.TabIndex = 3;
- //
- // label11
- //
- this.label11.AutoSize = true;
- this.label11.BackColor = System.Drawing.Color.Transparent;
- this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(12, 50);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
- this.label11.TabIndex = 2;
- this.label11.Text = "鍒跺崟鏃ユ湡";
- //
- // txtHMaker
- //
- this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
- this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(71, 13);
- this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(98, 15);
- this.txtHMaker.TabIndex = 1;
- //
- // label8
- //
- this.label8.AutoSize = true;
- this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(12, 16);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(41, 12);
- this.label8.TabIndex = 0;
- this.label8.Text = "鍒跺崟浜�";
- //
- // timer1
- //
- this.timer1.Enabled = true;
- this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
- //
- // panel1
- //
- this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 50);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(41, 518);
- this.panel1.TabIndex = 33;
- //
- // panel3
- //
- this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(978, 50);
- this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(39, 518);
- this.panel3.TabIndex = 34;
- //
- // grdPrint
- //
- this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(809, 543);
- this.grdPrint.Name = "grdPrint";
- this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
- this.grdPrint.TabIndex = 46;
- this.grdPrint.Visible = false;
- //
- // tabControl1
- //
- this.tabControl1.Controls.Add(this.tabPage1);
- this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(41, 233);
- this.tabControl1.Name = "tabControl1";
- this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(937, 242);
- this.tabControl1.TabIndex = 47;
- //
- // tabPage1
- //
- this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Controls.Add(this.grdSum);
- this.tabPage1.Location = new System.Drawing.Point(4, 21);
- this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(929, 217);
- this.tabPage1.TabIndex = 0;
- this.tabPage1.Text = "椤�1";
- this.tabPage1.UseVisualStyleBackColor = true;
- //
- // grdMain
- //
- this.grdMain.AllowUserToAddRows = false;
- this.grdMain.AllowUserToDeleteRows = false;
- this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
- this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
- this.grdMain.Name = "grdMain";
- this.grdMain.ReadOnly = true;
- this.grdMain.RowHeadersWidth = 30;
- this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(923, 192);
- this.grdMain.TabIndex = 47;
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
- this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
- this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
- this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
- this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
- this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
- //
- // grdSum
- //
- this.grdSum.AllowUserToAddRows = false;
- this.grdSum.AllowUserToDeleteRows = false;
- this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
- this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(3, 195);
- this.grdSum.Name = "grdSum";
- this.grdSum.ReadOnly = true;
- this.grdSum.RowTemplate.Height = 23;
- this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(923, 19);
- this.grdSum.TabIndex = 46;
- //
- // tabPage2
- //
- this.tabPage2.Controls.Add(this.grdMain_Pay);
- this.tabPage2.Controls.Add(this.grdSum_Pay);
- this.tabPage2.Location = new System.Drawing.Point(4, 21);
- this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(929, 217);
- this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "椤�2";
- this.tabPage2.UseVisualStyleBackColor = true;
- //
- // grdMain_Pay
- //
- this.grdMain_Pay.AllowUserToAddRows = false;
- this.grdMain_Pay.AllowUserToDeleteRows = false;
- this.grdMain_Pay.BackgroundColor = System.Drawing.Color.WhiteSmoke;
- this.grdMain_Pay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.grdMain_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdMain_Pay.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain_Pay.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain_Pay.Location = new System.Drawing.Point(3, 3);
- this.grdMain_Pay.Name = "grdMain_Pay";
- this.grdMain_Pay.ReadOnly = true;
- this.grdMain_Pay.RowHeadersWidth = 30;
- this.grdMain_Pay.RowTemplate.Height = 23;
- this.grdMain_Pay.Size = new System.Drawing.Size(923, 192);
- this.grdMain_Pay.TabIndex = 49;
- this.grdMain_Pay.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Pay_Scroll);
- this.grdMain_Pay.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_Pay_CellBeginEdit);
- this.grdMain_Pay.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_Pay_CellLeave);
- this.grdMain_Pay.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_Pay_CellEndEdit);
- this.grdMain_Pay.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_Pay_RowHeadersWidthChanged);
- this.grdMain_Pay.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_Pay_EditingControlShowing);
- this.grdMain_Pay.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_Pay_ColumnWidthChanged);
- //
- // grdSum_Pay
- //
- this.grdSum_Pay.AllowUserToAddRows = false;
- this.grdSum_Pay.AllowUserToDeleteRows = false;
- this.grdSum_Pay.BackgroundColor = System.Drawing.Color.Khaki;
- this.grdSum_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSum_Pay.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum_Pay.Location = new System.Drawing.Point(3, 195);
- this.grdSum_Pay.Name = "grdSum_Pay";
- this.grdSum_Pay.ReadOnly = true;
- this.grdSum_Pay.RowTemplate.Height = 23;
- this.grdSum_Pay.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum_Pay.Size = new System.Drawing.Size(923, 19);
- this.grdSum_Pay.TabIndex = 48;
+ this.txtHBillNo.BackColor = System.Drawing.Color.Beige;
+ this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBillNo.Location = new System.Drawing.Point(123, 28);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHBillNo.TabIndex = 20;
//
// Sc_MouldMaintainRuleBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1017, 568);
+ this.ClientSize = new System.Drawing.Size(1356, 710);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.P1);
@@ -1300,102 +1357,72 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_MouldMaintainRuleBill";
this.Text = "妯″叿鎴愭湰鏍哥畻缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Sc_MouldMaintainRuleBill_FormClosing);
this.Load += new System.EventHandler(this.Sc_MouldMaintainRuleBill_Load);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.Sc_MouldMaintainRuleBill_Paint);
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Sc_MouldMaintainRuleBill_FormClosing);
+ this.tabControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
- this.P1.ResumeLayout(false);
- this.P1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum_Pay)).EndInit();
this.gbUp.ResumeLayout(false);
this.gbUp.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.P1.ResumeLayout(false);
+ this.P1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain_Pay)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
- this.tabControl1.ResumeLayout(false);
- this.tabPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
- this.tabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdMain_Pay)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.grdSum_Pay)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DataGridView grdMain_Pay;
+ private System.Windows.Forms.DataGridView grdSum_Pay;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.ToolStripButton set;
+ private System.Windows.Forms.ToolStripButton dy;
private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton xz;
private System.Windows.Forms.ToolStripButton xg;
private System.Windows.Forms.ToolStripButton sc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton js;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripButton AddRow;
+ private System.Windows.Forms.ToolStripButton DelRow;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripButton bc;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripButton fq;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripButton sh;
private System.Windows.Forms.ToolStripButton qsh;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton sz;
private System.Windows.Forms.ToolStripButton syz;
private System.Windows.Forms.ToolStripButton xyz;
private System.Windows.Forms.ToolStripButton mz;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
- private System.Windows.Forms.Label lblCaption;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox txtHBillNo;
- private System.Windows.Forms.Panel P1;
- private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.Label txtHMaker;
- private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Label txtHUpDateDate;
- private System.Windows.Forms.Label label23;
- private System.Windows.Forms.Label txtHUpDater;
- private System.Windows.Forms.Label label21;
- private System.Windows.Forms.Label txtHCloseDate;
- private System.Windows.Forms.Label label19;
- private System.Windows.Forms.Label txtHCloseMan;
- private System.Windows.Forms.Label label17;
- private System.Windows.Forms.Label txtHCheckDate;
- private System.Windows.Forms.Label label15;
- private System.Windows.Forms.Label txtHChecker;
- private System.Windows.Forms.Label label13;
- private System.Windows.Forms.Label txtHMakeDate;
- private System.Windows.Forms.Label label11;
- private System.Windows.Forms.Label txtHDeleteDate;
- private System.Windows.Forms.Label label25;
- private System.Windows.Forms.Label txtHDeleteMan;
- private System.Windows.Forms.Label label27;
- private System.Windows.Forms.Timer timer1;
- private System.Windows.Forms.ToolStripButton AddRow;
- private System.Windows.Forms.ToolStripButton DelRow;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
- private System.Windows.Forms.DateTimePicker dtpHDate;
- private System.Windows.Forms.Label label9;
- private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripButton fz;
+ private System.Windows.Forms.ToolStripButton xx;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
- private System.Windows.Forms.ToolStripButton tc;
- private System.Windows.Forms.TextBox txtHRemark;
- private System.Windows.Forms.Label label20;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
- private System.Windows.Forms.ToolStripButton mrlk;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
- private System.Windows.Forms.ToolStripButton bclk;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
- private System.Windows.Forms.PictureBox pic1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.DataGridView grdPrint;
- private System.Windows.Forms.ToolStripButton set;
- private System.Windows.Forms.ToolStripButton dy;
private System.Windows.Forms.ToolStripDropDownButton qt;
private System.Windows.Forms.ToolStripMenuItem 鍏抽棴ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 鍙嶅叧闂璗oolStripMenuItem;
@@ -1407,28 +1434,59 @@
private System.Windows.Forms.ToolStripMenuItem 鎾ら攢浣滃簾ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 闅愯棌鍒楄缃甌oolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.Label label24;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.ComboBox cmbSourceBillType;
+ private System.Windows.Forms.Button cmdSourceBillNo;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.TextBox txtHCheckCycle;
+ private System.Windows.Forms.ComboBox cmbHCycleUnit;
+ private System.Windows.Forms.Label label26;
+ private System.Windows.Forms.Label label12;
private System.Windows.Forms.TextBox txtHExplanation;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtHInnerBillNo;
private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Button cmdSourceBillNo;
- private System.Windows.Forms.TextBox textBox2;
- private System.Windows.Forms.Label label22;
- private System.Windows.Forms.ComboBox cmbSourceBillType;
- private System.Windows.Forms.Label label24;
- private System.Windows.Forms.ToolStripButton xx;
- private System.Windows.Forms.Label label26;
- private System.Windows.Forms.Label label12;
- private System.Windows.Forms.TabControl tabControl1;
- private System.Windows.Forms.TabPage tabPage1;
- private System.Windows.Forms.DataGridView grdMain;
- private System.Windows.Forms.DataGridView grdSum;
- private System.Windows.Forms.TabPage tabPage2;
- private System.Windows.Forms.DataGridView grdMain_Pay;
- private System.Windows.Forms.DataGridView grdSum_Pay;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
- private System.Windows.Forms.ToolStripButton js;
- private System.Windows.Forms.ComboBox cmbHCycleUnit;
- private System.Windows.Forms.TextBox txtHCheckCycle;
+ private System.Windows.Forms.TextBox txtHBillNo;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtHRemark;
+ private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label lblCaption;
+ private System.Windows.Forms.PictureBox pic1;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label txtHMaker;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label txtHMakeDate;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label txtHChecker;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label txtHCheckDate;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label txtHCloseMan;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label txtHCloseDate;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Label txtHUpDater;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label txtHDeleteDate;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label txtHDeleteMan;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.Label txtHUpDateDate;
}
}
\ No newline at end of file
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.resx" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.resx"
index f3a86d2..bbe2472 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.resx"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\227\245\345\270\270\347\256\241\347\220\206/Sc_MouldMaintainRuleBill.resx"
@@ -112,15 +112,283 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
+ TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
+ wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
+ /zMAK+AEvIh14aZmAHgzuloBzZ1fFA0vxpT+sRXMCLq81bkAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
+</value>
+ </data>
+ <data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
+ cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
+ 6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
+ ArrI3Rmmkq3NDWRK40o13XiAxYXPsltBkAb7YbIRN6HoyVyEDyt51rhSV67dRTL5EcqgxV5yn91GQvI4
+ 1BjFViHBEeCNI98qqGu+ibnEB7h8UaiqWaiLlo3Jpd9w8J15BC6ZzVdWQX3LbfSPPBUPjY4jqJ2cXxDg
+ YENE4LkdoMi/mF3AOlvhwonSM+JjJeUYHhkT+EBDzAbLsYr7ZabRbM08p6sg5bjf/hVm6Xi2eOirVv8H
+ x2foKkhcgFcV/4YnQhFkOnDJvF+Bd74D2zEp2YO/pJZtefqFO/Dy9Xu8iCQQin1CgEHSXoHLocSs+LQh
+ Gc4yw6w676yRL37ccRpHS87hfqUZPnKqzCzRmhoz0EYzznCWmQvOWvwCAklSiLgvRB8AAAAASUVORK5C
+ YII=
+</value>
+ </data>
+ <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
+ wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
+ GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
+ gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
+ vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
+ mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
+ 954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="js.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
+ CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
+ tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
+ cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="fq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
+ TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
+ 4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
+ RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
+ GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
+ XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
+ PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
+ wFhjqaXQDyGEn/8QZ6Sf6TgSn8x83phl5For+iDsSOPW2uRNgJzzsARfLPVKKXsAC8OXcYKrVoBreHU6
+ lQd4DW8BvPAWIISgPaX7d4AYo33KAYL54zvovWthNoh5yAzyAE+H6ApB3wZABkEtAdLeLhnE/RMhXBqC
+ KO8tQIC4b+FPInoA2b1WbweybUAAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
+ H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
+ GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
+ ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
+ 8HpVcPCyWAAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
+ NIlgxA9B6c97iGj4JTHuQLcq2F2Hju+hAsYYagG7DQC2A9ZOa01L1hItSIkUlFJswexNiU9gSNxPICV+
+ AUnwbFbfBAznnP0ChlNKUGv1CSTsegcWzN0rwbwoGPNKMLNACWNYzvMkCL13BXPw+0cQx/wXvieEEzaJ
+ cBFxK5ZNAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
+ WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
+ MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
+ GGcDdAsRKTA13koF0oKdAl2jzCC24JAFiwxMC7GCRAs2Fg5bMCFyC9YZJFsIKcTUFmjkg+2eAgj+eMnq
+ 3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="xx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
+ WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
+ MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
+ GGcDdAsRKTA13koF0oKdAl2jzCC24JAFiwxMC7GCRAs2Fg5bMCFyC9YZJFsIKcTUFmjkg+2eAgj+eMnq
+ 3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
+ EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
+ CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
+ 1Y8kyzxsWRZHJ0kDmOi/SNTxM3w1XINh3AF00QUlYhBzgwAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -142,634 +410,237 @@
cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
- H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/tCS5QaG90b3Nob3AgMy4wADhCSU0EJQAA
- AAAAEAAAAAAAAAAAAAAAAAAAAAA4QklNA+0AAAAAABAASAAAAAEAAgBIAAAAAQACOEJJTQQmAAAAAAAO
- AAAAAAAAAAAAAD+AAAA4QklNBA0AAAAAAAQAAAB4OEJJTQQZAAAAAAAEAAAAHjhCSU0D8wAAAAAACQAA
- AAAAAAAAAQA4QklNBAoAAAAAAAEAADhCSU0nEAAAAAAACgABAAAAAAAAAAI4QklNA/UAAAAAAEgAL2Zm
- AAEAbGZmAAYAAAAAAAEAL2ZmAAEAoZmaAAYAAAAAAAEAMgAAAAEAWgAAAAYAAAAAAAEANQAAAAEALQAA
- AAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////
- ////////////////A+gAAAAA/////////////////////////////wPoAAAAAP//////////////////
- //////////8D6AAAOEJJTQQAAAAAAAACAAE4QklNBAIAAAAAAAQAAAAAOEJJTQQIAAAAAAAQAAAAAQAA
- AkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAAz8AAAAGAAAAAAAAAAAAAABoAAAEAAAA
- AAVnKmgHmJgALQAxAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAaAAAAAAAAAAA
- AAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2Jq
- YwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21s
- b25nAAAAaAAAAABSZ2h0bG9uZwAABAAAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNl
- AAAAEgAAAAdzbGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAM
- RVNsaWNlT3JpZ2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJ
- bWcgAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRs
- b25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdodGxvbmcAAAQAAAAAA3VybFRFWFQAAAABAAAAAAAA
- bnVsbFRFWFQAAAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxs
- VGV4dElzSFRNTGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VT
- bGljZUhvcnpBbGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWdu
- AAAAB2RlZmF1bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUA
- AAAJdG9wT3V0c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxv
- bmcAAAAAAAAAC3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQRAAAAAAABAQA4QklNBBQAAAAAAAQAAAAC
- OEJJTQQMAAAAAANsAAAAAQAAAIAAAAANAAABgAAAE4AAAANQABgAAf/Y/+AAEEpGSUYAAQIBAEgASAAA
- /+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMV
- ExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4O
- FBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEB
- AxEB/90ABAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAAB
- AAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0
- coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZm
- doaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRSh
- sUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU
- 5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8A
- mvg/uZn/AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1
- wP8Amvg/uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/bt
- X/klvpJcWbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1
- /wDkkv8Amvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx
- +xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/ZOEJJTQQhAAAAAABV
- AAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgA
- bwB0AG8AcwBoAG8AcAAgADcALgAwAAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hEkhodHRwOi8vbnMu
- YWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0n77u/JyBpZD0nVzVNME1wQ2VoaUh6cmVT
- ek5UY3prYzlkJz8+DQo8P2Fkb2JlLXhhcC1maWx0ZXJzIGVzYz0iQ1IiPz4NCjx4OnhhcG1ldGEgeG1s
- bnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eGFwdGs9IlhNUCB0b29sa2l0IDIuOC4yLTMzLCBmcmFtZXdv
- cmsgMS41Ij4NCgk8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjIt
- cmRmLXN5bnRheC1ucyMiIHhtbG5zOmlYPSJodHRwOi8vbnMuYWRvYmUuY29tL2lYLzEuMC8iPg0KCQk8
- cmRmOkRlc2NyaXB0aW9uIGFib3V0PSIiIHhtbG5zOnhhcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hh
- cC8xLjAvbW0vIj4NCgkJCTx4YXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDozOWZj
- MWM4NC0xZGIyLTExZDktYTU2YS1lOGQ1YmIxNTEyYjU8L3hhcE1NOkRvY3VtZW50SUQ+DQoJCTwvcmRm
- OkRlc2NyaXB0aW9uPg0KCTwvcmRmOlJERj4NCjwveDp4YXBtZXRhPg0KICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSd3Jz8+/9sAQwACAQECAQEC
- AgICAgICAgMFAwMDAwMGBAQDBQcGBwcHBgcHCAkLCQgICggHBwoNCgoLDAwMDAcJDg8NDA4LDAwM/9sA
- QwECAgIDAwMGAwMGDAgHCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM
- DAwMDAwM/8AAEQgAKgQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//E
- ALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX
- GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SV
- lpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5
- +v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMR
- BAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ
- SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5
- usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9YH7anicf8w3
- RB/3DbT/AOM0v/Da3ig/8w/Rf/Bbaf8AxmuL/wCEOHpR/wAIcPSv1/8As+n/ACn5x9cn3OyP7anig5B0
- 7RT/ANwy0/8AjNH/AA2l4n76boo/7hlp/wDGa43/AIQ4f3cUf8IcPSmsvh/KH1yf8x2X/DaPib/oHaJ/
- 4LLT/wCM0f8ADafiZeum6IR/2DbT/wCM1xv/AAhw9KP+EOH900v7Pp/yoFjJ/wAx2R/bV8S/9A3RP/Bb
- af8Axmj/AIbV8S/9A3RP/BbZ/wDxmuM/4Q0f3KX/AIQ4DopFH1Cn/KP67P8AmZ2X/DaviX/oG6J/4LbP
- /wCM0f8ADaviX/oG6J/4LbP/AOM1xv8Awhw/umj/AIQ4f3TT/s+H8ovrk/5jsx+2r4kx/wAg7RR/3DbT
- /wCM0H9tTxLnjTtEP/cNtP8A4zXFnweo6rR/wiK/3TS/s+n/ACh9dn/Mdl/w2p4l76bov/gttP8A4zSr
- +2j4l76doo/7htp/8ZrjP+ERX+6aB4QB6KaP7Ph/KH1yf8x2f/DafiX/AKB2if8AgttP/jNH/DafiX/o
- HaJ/4LbT/wCM1xv/AAhw/umj/hDh/dNH9nw/lQfXJ/zHY/8ADaniX/oG6L/4LbT/AOM0f8NqeJf+gbov
- /gttP/jNcd/whw/umk/4Q0f3KP7Ph/KH1yf8x2Y/bW8Sjrp2jf8AgttP/jNKP21vEp6aboxP/YNtP/jN
- cX/whwH8J/Kj/hEB/dP5ULL6f8ofW5/zHaD9tPxKeumaIP8AuG2n/wAZoP7afiUf8w3RBj/qG2f/AMZr
- jP8AhD1/ut+VIfByn+E/lT/s+n/KNYyp/MztD+2n4m6jTNE/8Fln/wDGaVf20vE2P+Qdog/7htn/APGa
- 4r/hDx6H8qP+EPHofypf2fT/AJQWMn3Z2zfto+JjwdO0TH/YNs//AIzQv7aXiUtk6don/gts/wD4zXE/
- 8IePQ/lQPB44+Vvyo/s+n/KJ4yfdnbN+2n4k/wCgbop/7htn/wDGab/w2r4l/wCgXov/AILbT/4zXF/8
- IgP7jflR/wAIgP7jflR/Z9P+UPrk+7O0/wCG1fEn/QN0b/wW2n/xmj/htTxGP+Ybow/7hlp/8Zri/wDh
- EfRDj6Uf8Ij/ALLD6Cj+z6f8qD63Puzsx+2p4k/6B+in/uG2n/xmg/tq+JQONP0P8dMtP/jNcYPCB9G/
- KlHg1j0ViPdaFl9P+Uf1yfc7L/htTxN/0DtD/wDBZaf/ABmj/htTxN/0DtD/APBZaf8AxmuO/wCENb+4
- f++aT/hDj/d/ShZfT/lBY2f8zOy/4bV8S/8AQP0XHtptp/8AGaP+G1vE3/QP0X/wW2f/AMZrjT4OP90/
- lSf8Icf7p/Kn/Z9P+UX1ufc7L/htXxN/0DtF/wDBbZ//ABml/wCG1fE//QO0X/wW2f8A8ZrjP+EPH90/
- lR/wiA/un8qX9n0/5R/XKnc7P/htTxL/ANA/Rv8AwW2f/wAZo/4bW8TdtO0XH/YNs/8A4zXGf8IgP7p/
- KlHg4H+EihZfT/lF9bn3Z2R/bV8THrp+iD/uGWf/AMZo/wCG1vE//QP0T/wW2n/xmuN/4Q4elL/wh3+z
- +lCy+n/KgWMn/Mdj/wANreJ/+gfon/gttP8A4zR/w2p4m/6B+if+C20/+M1x48G5/hA/Cj/hDPYflR/Z
- 9P8AlH9dn/Mdef21fEvfTtFJ/wCwbaf/ABmlH7aviT/oHaKD/wBg20/+M1x58Gf7NN/4Q4elCy+n/KH1
- yp/Mdmf20/Eo4+waL/4LbT/4zQf20vEpBIsNEJHb+zbT/wCM1xn/AAhw9KX/AIQ4f3R+VH9n0/5RfW6n
- 8zOx/wCG1PE3/QO0P/wWWn/xmj/htTxL307RD9NNtP8A4zXHf8IeP7o/Kl/4Q0f3T+VCy+n/ACgsZU/m
- Z2B/bU8Sj/mHaL/4LbT/AOM0n/Davibdn+ztFP00y0/+M1x58Gj+6fyo/wCEMH91h+FH9n0/5Q+uVP5j
- sf8AhtbxL0OnaKB/2DLT/wCM0n/DaviX/oHaL/4LLP8A+M1x3/CHDONpFH/CHD0o/s+H8oLGVO52X/Da
- viX/AKB2if8AgttP/jNH/DaniX/oHaJ/4LbT/wCM1xv/AAhw9KX/AIQ8f3R+VCy+n/KCxdTudl/w2r4l
- PTTtGH/cNtP/AIzR/wANqeJz00/RTn/qGWn/AMZrjf8AhDx/dH5Un/CGjrsJzQsvp/yj+uVP5jsz+2n4
- nPTT9FP/AHDLQf8AtGk/4bT8T/8AQP0X/wAFlp/8Zrjf+EN/2DR/whv+waf9n0/5UCxs/wCZnZf8NpeJ
- /wDoH6Kf+4Zaf/GaUftqeJwONO0T/wAFdp/8Zrjf+EM/2TR/whn+yaX9nw/lQvrs/wCY7D/htLxP/wBA
- 7Rf/AAWWn/xml/4bT8Tjpp+if+Cu0/8AjNcd/wAIZ/smj/hDP9k0/qEP5UH12p/Mdj/w2l4n/wCgbov/
- AIK7T/4zS/8ADanif/oH6J/4LLT/AOM1xv8Awhn+yaP+EM/2TSWX0/5UH12f8x2X/DaXifOf7O0Q/wDc
- LtP/AIzR/wANpeJ+2naIf+4Xaf8AxmuM/wCEN/2DR/whv+waFl9P+VB9cn/Mdl/w2l4mIx/Z2i5/7Blp
- /wDGaP8AhtPxP/0DtF/8Flp/8Zrjf+EN/wBg0f8ACG/7BprL4fyoPrk/5jsf+G0fE/8A0DdE/wDBbaf/
- ABmnf8Np+J+c6dov/gttP/jNcX/wiQ/uH8qUeEQeqED6UPL6f8qH9cqdzs/+G1PE/bTtF/8ABZaf/GaU
- /tqeJyB/oGij/uGWn/xmuM/4RBfQ/wDfNJ/wh6/3Sfwpf2fT/lF9cqdzs/8AhtTxOBzp+jYP/UMtP/jN
- Iv7afiX/AJ8NFH/cLtP/AIzXG/8ACHr/AHW/Kl/4Q1fQ/lR/Z9P+VD+uVO7Oy/4bV8Sj/lw0X/wWWeP/
- AETSn9tXxKf+XDRcf9gyz/8AjNcZ/wAIavofypP+EOX0OPpR/Z9P+VC+t1O7Oz/4bQ8S/wDQP0Qj30y0
- /wDjNB/bQ8TAZGnaIT/2DbT/AOM1xh8Hr6E/hR/wh6/3W/Kj+z6f8qD65U7s7L/htTxP/wBA7Rf/AAW2
- n/xmj/htPxP/ANA7Rf8AwW2n/wAZrjf+ERH90/lR/wAIiOyn8qP7Pp/yh9cqdzsv+G0vE/U6bov/AILb
- T/4zSf8ADaniXvp+ij/uHWn/AMZrjf8AhER/cPPtR/wiA/uN+VP+z6f8oLGVO7Oz/wCG1PEp6afoh/7h
- 1n/8Zo/4bS8S/wDQO0T/AMF1p/8AGa4weDwf4CKP+EQH90/lS/s+n/Kg+t1O52f/AA2r4m/6B2i/+C20
- /wDjNH/Danibvp+iEf8AYNtP/jNcZ/wiA/un8qP+EQH90/lTWX0/5QWMqdzs/wDhtbxN/wBA7Rf/AAW2
- n/xmgftq+Jh/zDtFH/cNtP8A4zXGf8IgP7p/KlHg4H+Eil/Z1P8AlQ1jKn8zOzH7afiY8DTtEx/2DbT/
- AOM0H9tTxL0On6Jn/sG2f/xmuM/4Q4elH/CHD0o/s+n/ACoHjJ/zM7L/AIbW8T/9A/RP/BZZ/wDxmlP7
- avibvp+ij/uGWf8A8ZrjP+ENA6LR/wAIcP7po/s+n0igeMn/ADM7M/tp+Jj10/ReP+oZZ/8AxmkH7afi
- bd/yD9Ez/wBg20/+M1xo8Gg9Ril/4Q0ego/s+H8qEsZP+Y7D/htLxPnjTtE/8Ftp/wDGaU/tpeJ8c6fo
- mP8AsG2n/wAZrjf+EOHpR/whw9KP7Pp/yof1up3Z2X/Dafib/oHaLj1/sy0/+M0f8Np+Jen9n6Jj/sGW
- n/xmuN/4Q4elH/CHD0p/2fT/AJQ+uVO52X/DaXiX/oH6J/4LLT/4zR/w2l4k/wCgfon/AILLT/4zXG/8
- IcPSj/hDh6UfUKf8ofW6ndnZj9tXxKvTT9E/8Flp/wDGaX/htfxN2sNF5/6hlp/8Zri/+EOHpR/whw9K
- Fl9P+UPrdTuzs/8AhtXxN/0D9E/8Flp/8ZoP7aviY8DT9FJ/7Btp/wDGa4z/AIQ4elH/AAhw9KP7Pp/y
- h9bqd2dl/wANqeJ/+gdov/gttP8A4zR/w2p4o/6B2if+Cy0/+M1xv/CHD0o/4Q4elL+z6f8AKgWLqd2d
- kP20/E4znTtEH/cNtP8A4zTv+G1PEwH/ACDtF/8ABbaf/Ga4s+Dh2Wj/AIQ4eh/Kh4Cn/Kg+uVO52f8A
- w2n4lxzp+ij/ALhtp/8AGaD+2j4lPXTtG/8ABbaf/Ga4weDQe2Pwo/4Q0emfwoWX0/5UJYyp/Mdn/wAN
- oeJP+gfov/gttP8A4zR/w2l4lGcadop/7hlp/wDGa43/AIQ1fQ/lSf8ACHD+6fyo/s+n/Kg+uVP5jsz+
- 2p4m/wCgdop/7hlp/wDGaT/htTxP/wBA3Rv/AAW2n/xmuN/4Q4f3T+VKPBo9AKP7Pp/yoaxk+7OyH7af
- iYjnTtGH/cNtP/jNO/4bR8Sk5/s/RR/3DLQ/+0a4v/hDR6Cj/hDR6Cj+z6f8qD63U7s7P/htPxKP+Ydo
- 3/gstB/7RpD+2j4l7adop/7hlp/8ZrjP+EOHpR/whw9KP7Pp/wAqD65U7s7M/tp+J+2naKR/2DLT/wCM
- 0n/DaniYddO0Uf8AcMtP/jNcb/whw9KD4OA/hJo/s+n/ACoPrk+7Oy/4bW8Rjrp+ij/uGWn/AMZo/wCG
- 1vEh4/s/Ref+obaf/Ga4z/hEB/dP5Uf8IgP7p/Kmsvp/ygsZU7s7I/treJAf+Qfo3/gstP8A4zR/w2r4
- l/6B2i/+Cyz/APjNcb/wiA/un8qX/hEB/d/Sl9Qp/wAofXJ92dj/AMNreJRk/wBn6KMf9Qyz/wDjNJ/w
- 2r4l/wCgdo3/AILbT/4zXH/8IgP7v6Uf8IgP7v6U1gKf8oLGT7s9W/4V5f8A/PhP+a/40f8ACvr7/nwn
- /Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMK8N8aUP+fL/wDAl/ken/qxV/5+L7n/AJn5
- Lf8ACvr7/nwn/Nf8aP8AhX19/wA+E/5r/jX60/8ACCaH/wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FL
- /XSh/wA+X/4Ev8g/1Yq/8/V9z/zPyW/4V9ff8+E/5r/jSH4eX2ObCf8ANf8AGv1q/wCEE0P/AKAukf8A
- gJH/AIUf8IJof/QF0j/wEj/woXGlD/ny/wDwJf5B/qxV/wCfq+5/5n5Kj4dXxGRYT/mv+NL/AMK8vl4+
- wT/mv+NfrT/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FP8A10of8+X/AOBL/IX+rFX/AJ+r7n/mfkt/
- wr6+/wCfCf8ANf8AGj/hX19/z4T/AJr/AI1+tP8Awgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FL/
- AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+fCf81/xr9af+EE0P/oC6R/4CR/4U
- f8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/Jb/hX19/z4T/AJr/AI0f8K+vv+fC
- f81/xr9af+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXSh/z5f3r/IP9WKv/P1fc/8AM/Jb/hX1
- 9/z4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH/gJH/hR/wgmh/wDQF0j/AMBI/wDCj/XSh/z5f3r/
- ACD/AFYq/wDP1fc/8z8lR8PL8g50+c/iv+NH/Cu77/oH3H/jv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6A
- ukf+Akf+FC40of8APl/ev8g/1Yq/8/V9z/zPyVHw7vu2n3H5r/jS/wDCu7//AJ8Lj81/xr9af+EE0P8A
- 6Aukf+Akf+FH/CCaH/0BdI/8BI/8Kf8ArpQ/58v/AMCX+Q/9WKv/AD9X3P8AzPyW/wCFd3//AD4XB/Ff
- 8aT/AIV3ff8APjcf99L/AI1+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf
- 5C/1Yq/8/V9z/wAz8lf+Fd33/Pjcf99L/jR/wrq+I/48Jz+K/wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hB
- ND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qf6sVf+fq+5/5n5K/8K6vv+gfP+a/40D4d6gOBYTAfVf8AGv1q
- /wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/wo/10of8APl/+BL/Ia4Yq/wDP1fc/8z8lv+Fd3/8A
- z4zf+O/40f8ACvL/AP58J/zX/Gv1p/4QTQ/+gLpH/gJH/hR/wgmh/wDQF0j/AMBI/wDCj/XSh/z5f/gS
- /wAg/wBWav8Az9X3P/M/JY/Dq/J50+f81/xpP+Fd3wPGnz5/4Cc/rX61f8IJof8A0BdI/wDASP8Awo/4
- QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kP/Vmr/z9X3P/ADPyV/4V7f8A/PhPx/u/40f8K9v/APnwn/8A
- Hf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny/wDwJf5C/wBWav8Az9X3P/M/
- JX/hXt//AM+E/wD47/jS/wDCv7//AKB83/jv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8A
- hR/rpQ/58v8A8CX+Qf6sVf8An4vuf+Z+S3/Cv7//AKB83/jv+NH/AAr+/wD+gfN/47/jX60/8IJof/QF
- 0j/wEj/wo/4QTQ/+gLpH/gJH/hR/rpQ/58v/AMCX+Qf6sVf+fi+5/wCZ+S3/AAr+/wD+gfN/47/jR/wr
- +/8A+gfN/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rF
- X/n4vuf+Z+S3/Cv7/wD6B83/AI7/AI0f8K/v/wDnwmH/AHz/AI1+tP8Awgmh/wDQF0j/AMBI/wDCj/hB
- ND/6Aukf+Akf+FL/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1+f8AlxmH/fJ/rSf8K71A8iyuB/3z
- /jX61f8ACCaH/wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FNcaUP+fL/APAl/kJcMVf+fq+5/wCZ+Sv/
- AArvUP8Anxn/APHf8aT/AIV3f/8APhP/AOO/41+tf/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf66U
- P+fL/wDAl/kP/Vir/wA/V9z/AMz8lB8Or/r9gnx/wH/Gl/4V7fY/5B835r/jX61f8IJof/QF0j/wEj/w
- o/4QTQ/+gLpH/gJH/hR/rpQ/58v/AMCX+Qv9WKv/AD9X3P8AzPyW/wCFe3+f+PCfP/Af8aP+FeX/APz4
+ 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
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ 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
- 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
- /9k=
-</value>
- </data>
- <data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAARhJREFUOE+FkjEO
- gzAMReFMvVOvgIQYEUdAytahB2Fiys7EIdjY3HwnP03AVSNZgeD//B3cjuMoTVjDMLTY+Y7ndN5M08TX
- pu97zcuLAuxXcZEmx3HIeZ4SYBomYF1X/YCdUUAVgNj3HXkxkJCEemCImQx2Kc4mMg3W2EqqLMuy1BVj
- 5XqxL9jL1kIizruuUwgC37DjDKEUJLEv9saWvPeybZsmp4u7AiQDeEHJgfbrm4cAgkBlOqUzzaUD2vQu
- iEIoIInneRYEAUULX4AmR6EutvF6vW/imwMQ0SsB4p/ZhXNOAaWD4qJjNRIBgNgC8BIhTn+g+p16SRYA
- LbBiZd2YBxMA8T9hnirLQWn9NoE/DqppLObCTP8Amli/Fc7RUbQAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAQBJREFUOE+Nk0EO
- REAQRTnT3GmuIHEAR5DYWcwJnMAB7K2s7Ozs7Hq8Gr81PQT5EVL/1e+uliYPrqIonMryPE8fWPYSzPM8
- m5ZlcbyHwFsYheM4ummaPADIMAwkkmKGuvR9b8UABAnM10a6ZFnm2rY1YSLJpVkdFY/OiO8hiNgA+YYs
- AkUyWof1fleJ67rOBIjibePOAOcBQJC6r3jXJS8PorOSKpltpBJovQIpAc+yLE0CBEvYATKEoKqqXF1/
- InOUACLRzxDMQM4JojMgIqAQEgK0iZi3CfjjzTD8zLU+QACQOh6i/07i4bLCpmn8qJ4a/4LCsd2e+5u/
- 6f6H2YxfBiPVyjOawA8AAAAASUVORK5CYII=
-</value>
- </data>
- <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAaBJREFUOE+dks9L
- AkEUx2elY9Sx+gOijoHHoO7RIQwPCUKCRNEPBIs8hEQESgj9EsKKiiI6dA8hIgr7AXmQugVRERUhZa7t
- 6rrqt53JXTdZJXrwgZm38z7zeDucL7gFWZZJoQCiBmfiSE2NidTX1pERh5XTPhgtvHMrMIqF+SuWDm7u
- l8xGAs/sAjuYV1pQoftA4FLzVpWMTwfYwayc06D71bUjdFvtsNic8PqXKnfhmvIxgZDJQiySlmTkaU7M
- QM5mGRXnMDo5wwS8ICEllshIxcKBKIiectOg28sEH7yIRCrNENPSz61KoSVc+AWT6cM55mGCt8QX4p8C
- Qy32XyuzEXi8igBZBBr2gImYstZL+ofGmeA5nsRLnGfoBWIyiZ5DwHGh/JlbA4GjKNC/BVWw9ghkUinY
- z4HtJ+CuAIQ/yzro6rWj1dyJFnOHhirYvbzH6ekZlh+Ag3fgxkhQ9ZmaQ6BdnKSBiDIHuiZKbtjWhh13
- Y/UXqomVAlqk4uprRi5CEFsn2HA1/VGia9PWThANEfDH/xRQF5VQ/tVB+cy+AXUcyorbVh62AAAAAElF
- TkSuQmCC
-</value>
- </data>
- <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAcRJREFUOE99Ussr
- RFEYPx5JmZ38BxbKyiPKRllaSWOhCCmZjIi8M5maEmW8LRSyUIqNrUKUKISF7JU853FnxriPmfk557vN
- 3LnccepX936/x/nOd07WzOo2tFicMYBZrizGcnOyma3AxpwdTfzv13J71zM4DeHS4hVpVrb2/mpds2tU
- TCQSsILgvN6LlPFPyMT0MpGxeBxWENz8/KVpZ1PImGeBSFWLwQoJABubx2ho7oC9pQuHR6fmYwy756gg
- KxqsoKga4jxFikThC0ikvSkvwHkh04MGXLP0EZVV/AdxPKGzOW8QLeZ3dg3c1hSB9U9MExGOKohkgKoZ
- 5p3HiL4hD7ks4l30jnqoEPySIVlA4bMRfL7jGsJ8rwJlK0/UBQX0DE2RwB/6RiBshqzq5jzHncnMNvir
- q9zWZ9A9MEkfnxIfUsiAzIcn6jk9D5nNQtDVN07C98AXPoIGRG25jf1vFqJO5wgFvPrCePNHCOI2kgG4
- aqQzp7d9cma8TNbuGCTx84eE588QIWVWXwDlDiIkdWZOJj00g/ZuPeD3Eu2DB7TWMEI6b/LU29tQWl2H
- 0ioDQlxSUQsRkjTu7h/oGq4VnmT9B7PhA1VqEsXiAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAf1JREFUOE+dkU9I
- VFEUxs9LsEB36cK9CxehWW6cFm1S0EWBIBPI9A+RbJKhCLGMmgoJxBbT6JNAF6bTRheiO1MpxwGhmRoZ
- mmIsNC1TAyNQYyb065z7xpn3ZmzTgW/x3v1+373nHI1M1eHpQ662R4cPEWma+YQIIIrvapQgjdpdjRmn
- 7L3f2Yvf8T9w+tn6lNWdIf7nCuwpj3it8fx1p8ODn5u/4JzcwuA6DlTL1LbyiDcroNXdhc0fG6AnwPOv
- QP0roGCQX+FNSl7kgfKINyvg5t3HWF/9pkyXAkDREAO9rGcmccjO9hbMlQpqaXuE5cUv6sYi3wEwB+kR
- Aw2dyEPgKM+VKxVw7dY9xGKfQDr/7GP1W6VHDTj/egg7xQwHgXe2wnRAk+s25qMLcHhDoPNzoIa09Jdr
- Kdj3wWhBQuYKKR1w9UY7BobHlYZGxuBLKvZ5UQFHmoMQeD4BlHcvZwdILzV1Dhw/Va1UWnkGL4ZHFZzb
- HLbAqr2KAesMMtcy/ZpXwZXjfP9P2DLEzAA59F6k/4Mj07yKZADe1Kmezc+23DzhD8KsngvGfuV2JL4D
- 8TAkZL/nldUNi59a3Z2YffsRM8Eo/OEl9AhoCnDYCCKpyJSuPOIVRlg6a7+sJl5mq8Kxylo8qDfMJSdP
- G69I1uSojod8Jh7xCnPOfgV/AczzQTmYyEpvAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAcFJREFUOE+Vkdsr
- g3EYx+fepT/AlXDpcOtwzS1RCsWFQzRJMhFCzaKFnObQmONok5RWlLAMLRlyikYj07Y3VnP8en+Pd29e
- e6f21Ld+z/P7fT89z/OLUsiEsqEdv8s9HaoouXeyNWb2+T/g5gIkdv4LDDGyB5FIAmDGSMLuOJd2xADe
- l3dc3rlxfOWC/fQG1sMzbNgcWNuyw2SxYnp5HSOzK9COzkMzZAgF1DSpcX5xhcmZRYwZjBjWz6FfZ0D3
- wDg6tSNo0QygWd0P/cIqVB3a0J0oGztpCqv9FP7AKx68fuiml3F27YLF6kDfxALMlh3qqK6lS/JDtI/K
- ulYCbO05wD2/4M7NYXjKhJNLJ5z3T+KKnC43tncPQgFlNU2yAA/3DHx9wZagIAUjmIu/UVJVLwtgRTLu
- 8wdeIuhXTpCi8tqwgF4FD2iL/ZFgDObsjgAFpdXhR+BvCFIZI5FoZoC84op/ATRGdrRErCbuILewjACb
- tiP4+F+4ffRhUL9ENXEHDJIsSNiLCMkXOmCGwCfg8b/h5oEjALUvmNmZcgbia5IxMrNyEJeUhviUdCSk
- ZCAxNQOzRrMIISMfrO0giJ2/AdmpV0f9bZ1lAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="js.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAQZJREFUOE+Nk7ER
- gzAMRTMTA4QByADJUbOAB2AIqlClClU6BqBLRZfKA8AAMMCPJSOwAzhwpzMH+u9bH3M6hS9svEaaYuv5
- qhXjO6NGt5nFXQs8VR+EYGyVqcyFeGICRFG9CQE+iovcCUSr6+yIVwBPLJDDYnITEXTOzmhznldq2vba
- mQKT7WLUIMBdRQwQiCP2ABia2xwWi021xSKme4LRjroqQfeIl6+jlA1paJbEXYAIRcxrGUOX5x2IAQmU
- mgnQVxcuFht3EU999gCJqK+vDKCScWgNiuUMzpCXcTTFX8ET29k9598DLBAbVnLMeQ+ip7A2Z/7zF86Z
- 6MKmHdz2HkzGCYm/8G1yNYUE0BgAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAATFJREFUOE9j/A8E
- DJQAOzu7/6RikKUwwADS7LHjPxg7bfn533rNp/+GS1/+15z74L/C1Bv/xfvO/+drO/afuWYPGIPUU9+A
- gvz8/8RirC5YtXLl/zevXxOFCRpw+dKl/3t27/6/dcuW/yCDly5ZAscKCgr/YRglEJFdADLg6MVj/1ft
- WI2BQZpL7jb8t7a2Ro0FkAEwmxeuX/S/b/3E/1VL6/9nTc77H9OcCLdVol3tv9U5n/8gGuYScDTCDADZ
- vPX8jv9Lz6/6P+vc/P9Tzs/+37qvG6wYZDMIh1xLAdOTns4Gi6MYAPI7yAVTN8z437is9X/R9LL/qR1Z
- KC4AacbqAlgswMJg4+4N/9ExyEaYzXgDETkWQN5bsXw5GOOMhbNnzvwnFmNNBxRlJpScQQYHACuzpmIX
- 0+URAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAOZJREFUOE+Vk8EN
- gzAMRekwLJApEGNwZY+MxBnlHgZggAzAAi7fql2TOrS1ZCFM/ovzYx4hBOr+jJzzWwHAcRzNLKWQTay3
- 0QlgXVdKKWlu20Z17vtOTcA3MWA/AVo7Q3wL8ISonW6x0AJQk2APYJJ3Xl44zwoRIA0D1xAuALuJmPpe
- IVw7xZJ4/wDYdi8QgCrxpQMrdCGOWAEtsQyQbd0a2ATYyavPbQ1UQIyRxnGkaZouY+uJ2YfTD70FUGSc
- AVmWhSGu47iF160IRCcCEHQCgIy1QPDEv4JvXKs7kKkCpE4IvJpontP/sosnmtSWAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgRJREFUOE+Nk81L
- VGEUxs9EFthOhEoIMXShhRFuWkStFARX/gP5bQRuIjfVZnb2oYmaqwJtETgURYniwqU6Y5OTGVM5NQ0p
- DoM4OB86eq/O03PmOoyJXjzwcO899zm/e85939chrV6IYUqk6JpsQo4V+Q6RsytukVN59DfNYnwNSAD4
- dUypV2u0VqTtM+R8F1OAYRowTdNW6tGQc13I1ErzLKpGMzlMTQHuGXupR6PDm+2gyYOr76xkMpXCxpa9
- 1KNRM0FAo4cd7ANMT/PrbnupR6PUpR0cAKzGEliLJ22lHo0TLwlo3gNUZUeIxbERT9gqSU/mJw7sA1z/
- CJx+wcRj7oSebUivebj0Xfc2LnR+g/QZkBZdRs5xg6tQMETAo3VI/SSk5CnkYs//KulmwSdIgxvOiSS9
- sQOAYQIehK0/dETILX6xwYM33+l1Rg4B3AtZ8xU9gXQu4+9va0XmfLsIBXeQBbj89NxfgrSyI23r5hhH
- eMVkxw8LUPaMgCD8X4D5r7vw/zQQXuH8ex1kAHcDFsBR7UKxcxGFr5lsm0d6k9didtC+gACNWhz4k0I0
- msoBdIQ7C/TzIGqcrBnBmYdBEn2IRYDQIhDmNMtLvEZ2EF03kE5vceNw77d48T5IQLsPcnsud34dtW8h
- lc8hlwYgFf05lfNZVUFdGbR0mfeVVN0H/AOvtdivEoOgFQAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="fq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKxJREFUOE+dk7EN
- gDAMBFOxELPQQwENw9DQMBANIhIT0DEGMn7AKELIOIn0ovHfO45xznCy1pOhTCmpZ3INK/mUE+1ECRCk
- QsVIvacICEzVlSoCwAZh88ZGqFu47eFD+aDMgwGSdppRjCEKyGJ+kqVYAKoZT3Snn2nhswHwa9YAJrMG
- MC9QcIU1aXGQxO3iFTCHByILZerkBoQQgOI6wtCgryWK+qkE9P4GVzkA9kn+IyNshpgAAAAASUVORK5C
- YII=
-</value>
- </data>
- <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAa9JREFUOE+VU0sr
- hFEYfmU/mhU1xoIFspiS2A1hwc4PYDkbxcKlGckoURYuCyVsNJMsNOZDyCg1TFi4psZtQ3LNnTFKTY9z
- mW985hs13np6v/N+53ne57ynk0KaaKgiaNfq99ASpSSq/6pFybBkCxGBArPMfwnHBGyVqTGSSo7P0T2J
- jfCfh27C9RwBJxJf64SrWcLxBGG1n5C0wOsKIeQnPPj+KbAzSjhi3c48hAuFcD4t19usvtiVhAMusDtG
- OBgnBNlxeN4aSVKAT6ai1Iq1ARIIDBL8fRK+bsLczEzC69VNlIsoDhLwtErwmthYx65Ui3h2Z98IFlx2
- cee1xRKB+WGowcmAhBDSRlv3IDb3T/EcltuN9nMBHtqunJw5naV30tzRi429Y9w+hRD+/ES7cgnn7GVM
- QO3Mc55iQu5yzm8njY4u5uAEd88feHsPoaQnKKA64MRUlxEGtwEZkwaYptKQ7jX+HKW+2SkErh+Zg3AY
- ZNsWEAL8gZXJc9cErShcMEliJUN1dBaqAy5w//iCJs8NWrx3iEQiuiFals36IfKB5heV4S/EnJTHdWa8
- b8WEiEJRKrTYAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAaNJREFUOE+Vks0r
- hFEUxs9ka6NslewmCwtih2Jh4U+wnY2wMGQklI+yGGYxJWxEysIwRhEL5SMU4yM1zCiZxDD5Zowa0zzu
- ue/HvDONjFtP955z7/N7zz33NZFhNNcRjLG2dq6SKVM+JaeaUVIkIVLFBcr8G1gHWGpzdJNmTp/VM5kL
- 4c2zaUJoiYCAotgO4dZD8M8QNocJWQPe1gmRDcLj2j8Bh+OEc/G1Kxfh2k0IziuxV+RX+rKogAFHE4TT
- SYJPXIfng7EsAdyZmqpKbI2Q1LaDsGFXdO0dBY8/n1GDuG0ElqudcLkrzIkE9s0kpUHSY5nvtY9heapD
- vnlDuSIefBhesRDSjMZYmjsHHNg7ucBLVHqQ1xGU4uEUPxL6CxWpIC3mPQmwdg9h99iP++cIol9f6HLf
- oMdzg+94PAlpygcM0s0MaLH1iQoCCL984v0jgopBn1QsFkteoz4XMMjYE2q09khA6ElUEI2CLF6plB5w
- L0pVqX3RIVoFDHh4ekWr6w5tC+Fk+aqZy5Y9YZDIpVzDXFaNdM3OLeoQ42ENxNf/AaPYqIITEusDAAAA
- AElFTkSuQmCC
-</value>
- </data>
- <data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKZJREFUOE+tk0EK
- xSAMRL1rD+RSCoJLj+AR3JS/9ThpJxBQm35MqRBcxHmOJnHuq7VtkXYi2g+ii0mlFOzDwhnkaq23nJsB
- KaXhEPIXmwE5ZxtAxHAIwAxnm08OerE8bxkwi00ATWwCeO/5vTH+uDISy38QQpBSDpBlAD6qtcbROzEB
- pIt6yCsAQAL5C0BSQqu1QNROxC3ofwgR2iyIE3UWvhpKM+cE2b1Wbx4Y++gAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKJJREFUOE+1k8EJ
- wCAMRburUxUEj47gCF5Kr47hCGl/ICWorU2hQg7K/y8ak2X5eZHwnfOkY5oX4lNEOWeGYL8S0boRn6eU
- LngHg/jUsTDGOASEEMYAMSMbACJsbzAEaLNc9TWgNZsAI7MJUGvl93q/c5UlTDUopXQQEwB/2ULMgBby
- CaAhnwEaojsRQInbTtR9jZrILOAc/Q8j4nEWppOmBAchmmS+kk6cBAAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALBJREFUOE+tk7EO
- wyAMRPOv+RhG5kiVGPkERkaW7nzONVfFqdsQ7KGRLEWR7+Uw52X5x7OuD+gSJr+5+GzcAGxPUIBSylt4
- ANB7n4N+ASmlEyDQKWQG2E2dzm4hJsCCmIDdhp7RxYkLcECGg/UCRBxjRK31czMegIhDCMg5f1+tBZiK
- JTB6SDoHptgCMJlD2zrj8hc2s8QB33ney5lHC8L8U8iSXWBfa83eBdfG3TS9ANPwelUbvzJtAAAAAElF
- TkSuQmCC
-</value>
- </data>
- <data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKBJREFUOE+tkzEK
- wCAMRXtXD+PoXCg4egSP4NLd46T9xYDYXzBthUzJfybhZ1n+eM5t8sRBrg9a1wBSa72BkFtFZN0FOck5
- 3z+7ilrBCBkBMUYOOPUUYgMQiA1wttHPi3HsgAbRxb4CqDiEYO9Axd57SSnZAKPYtAMmhuumdwCXadu9
- maYAEGNeBHMi8hrUiWi1lEJvATn4H0IEvYUvF30ANolwESk5LjwAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAS1JREFUOE9jZACC
- MzON/x8+dhbExAleSJQzdHZ2MmJVADLg//8z/3//PPT/+/st/z89Xfr/7a0p/5+fb/n/6Gjp//54hv9A
- jf/Ly8tBNCaAGfAHbMBWoAFL/r+5CTKgFW7A1TUBuA1BNQDiArABF1r+PwS6AGQ7MsZwCdyAHxAXfAS5
- AOSFC0AXHCv9f2dXyv/r60P/X1ruht0VKC74ADTgCcIAkAvuggzYADLAHb8ByIEICQNIIN7Zlfr/2oaQ
- /5eXETDgz8/D0FiAugAUiCAv7E4FeiHk/yXCBkBj4QkwEOHRWAZ2AdgLhA0AuQAajeBAhHkhBegFIsLg
- DywWYC7AiAWCYQD0AnIswAMRFAtEhwFSQoIacBcYiHhjAT2lEeJjzRMgQVIw3qxLiiQAKVD0n6hfbsMA
- AAAASUVORK5CYII=
-</value>
- </data>
- <data name="xx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAS1JREFUOE9jZACC
- MzON/x8+dhbExAleSJQzdHZ2MmJVADLg//8z/3//PPT/+/st/z89Xfr/7a0p/5+fb/n/6Gjp//54hv9A
- jf/Ly8tBNCaAGfAHbMBWoAFL/r+5CTKgFW7A1TUBuA1BNQDiArABF1r+PwS6AGQ7MsZwCdyAHxAXfAS5
- AOSFC0AXHCv9f2dXyv/r60P/X1ruht0VKC74ADTgCcIAkAvuggzYADLAHb8ByIEICQNIIN7Zlfr/2oaQ
- /5eXETDgz8/D0FiAugAUiCAv7E4FeiHk/yXCBkBj4QkwEOHRWAZ2AdgLhA0AuQAajeBAhHkhBegFIsLg
- DywWYC7AiAWCYQD0AnIswAMRFAtEhwFSQoIacBcYiHhjAT2lEeJjzRMgQVIw3qxLiiQAKVD0n6hfbsMA
- AAAASUVORK5CYII=
-</value>
- </data>
- <data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAO9JREFUOE/NU00K
- gkAU9ghzDldexFt4qrYuqk3RwnUQgSsJEhEXETEQQmQREdFivnxPBy3UhFokPBhm5vt7bzSMX36u68Jx
- HAghuGhNe7006HJ+EZZlYeanGEzXvNZEnSSlCoPCAxAfgcVWwYsV7xFJpxNSJ7XkBMgrkN4KkvlGYRIq
- PisdNhshBbItL0B2B86PisSLKhetMTRBkuUOcpL9mwMdo5VARwhScA8i6sGu6MEw6BGh3sSlVPAlGDxa
- FfZpOmW1D6M+RgLpMWowxgK2bXe/iaaHRAQENk2T6yNJi0eO8F8kvf6Pjjjf4F+xT3TRBSVkUXpHAAAA
- AElFTkSuQmCC
-</value>
- </data>
- <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAMhJREFUOE+lk1EO
- gyAQRNszcSSTnmD9tt/6XROTJvYoHMA7TRnCEoqgtDVuUJJ5O7sL10vhMeaG0n7zHgF9LxiGO8ZpxPyY
- 8VpXQtF1TwCbe32SciICJAAmB8iF22LA2AHUuncgUhUWAUHsLXkHAUC7KsjX6IACV5XPyG8N/p8CVExA
- Hs2AhU39FRBmC0JCTR+rlmCtBSPtQz6FOJZ0CgpQ+BGAZuIUeJCaelA7yiL9fwC1XBtj0q/DK7I7B61C
- pUbAt8IIOBO+AeYPhuSqUd/MAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhBJREFUOE99kt9L
- U2Ecxr9Hy4K6C/+DLsybLItgQXVTd94IFjFKDnTRdCYr7AcWXuzCQcJws0OJXkR0I2JQEEgxKbVWbrQf
- rR3DRBPJQS10WUxkT+/3Pds5O9H2wsML7/t8nvd533MUKg5fYBS1VKBdNSBFKa3aZ4AoX1CooOygG12q
- 5fL6hzE1HUb3rLAEhIYqSOx53gIvX70BM2b8bV8QGxs5uEObeJRBVXVPbSInvMyYATe9fqxns6ABYCYH
- +OYB5zTQOC6aaELBorjZIKSXGTOgp+8ufmQyID+gLQIXZ4CmJ4AyLID7Qg8saUl+iX+Gp7cfa6urMt31
- rgqcMuDo4T2Y3UdW0JVbXqwsLcuqx55WOLkI73VH8Xs/ARHgg6PeCOno6cPiwhf5+jtH/lO7DH6c/iUh
- DgnXF1tc9vRCT382HowDRi1paaP2blcEDMe3gENDX2ULM+CS+zqiCR3OQAR0PgxyGtJerEm4zhWzwfKA
- Iw+tN1A7ruJ9cgFzIiT+UUcipeN79qc01HamqsNsalM70dB8AgeOnjLF68F2qghPhl4bDa7d6cf6n22b
- 8tsFuckBmGuVdy6vzfvMMCsDYvoSBu+NmLMJb30D8jEZUrpzIvkJ8fll6ZcBXeITtpxVZWJpLg+44CCw
- eO35ZMjmY5YYOug4jabjZ0yxuaH5JPgKpZ92bOKZzcNMyzkVfwGQBzbV1O0cRgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
+ 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
</value>
</data>
<data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- R0lGODlhEAAQAPYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
/yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
/73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
/6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAQABAAAAeYgEGC
- g4IBhgGEiUGGERETE4aKiwwxFyYtEDMQiIkBOCACLCcfDg6cgwEMKiE0MDoIPAgIp5M7LjYoHgs9Cwu0
- ABIyGSI1OQ8kDz4AhMAcGjcpKwYdBgbLzBUVP0AYBhQU14IEBAACAiUWIy/m4QQKGwUA5eYC8oPuCQUH
- A0Hy9vcK8h1owE9SEAICCRoUNECfwoUMBxSEGAgAOw==
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>93, 17</value>
- </metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeEdit_Model.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeEdit_Model.cs"
index 28e30c9..6a94241 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeEdit_Model.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsGy_BarCodeEdit_Model.cs"
@@ -28,5 +28,22 @@
public long HSourceEntryID;
public string HSourceBillType;
public long HSourceItemID;
+ public long HUnitID;
+ public long HSupID;
+ public long HDeptID;
+ public long HEmpID;
+ public long HItemSubID;
+ public int HPieceQty;
+ public string HSourceBillNo;
+ public string HUseFlag;
+ public bool HStopflag;
+ public double HInitQty;
+ public long HSourceID;
+ public long HCusID;
+ public long HSTOCKORGID;
+ public long HOWNERID;
+ public DateTime HBarCodeDate;
+ public string HInnerBillNo;
+ public double HMZ;
}
}
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
index 552e310..0a204ed 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
@@ -31,148 +31,87 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill_ChaiMa));
- this.pic1 = new System.Windows.Forms.PictureBox();
- this.gbUp = new System.Windows.Forms.GroupBox();
- this.label2 = new System.Windows.Forms.Label();
- this.txtHNum = new System.Windows.Forms.TextBox();
- this.label10 = new System.Windows.Forms.Label();
- this.panel6 = new System.Windows.Forms.Panel();
- this.lblHStockQty = new System.Windows.Forms.Label();
- this.P1 = new System.Windows.Forms.Panel();
- this.lblCaption = new System.Windows.Forms.Label();
- this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.panel1 = new System.Windows.Forms.Panel();
- this.panel3 = new System.Windows.Forms.Panel();
- this.grdPrint = new System.Windows.Forms.DataGridView();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
- this.yl = new System.Windows.Forms.ToolStripButton();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.grdMain_Pay = new System.Windows.Forms.DataGridView();
+ this.grdSum_Pay = new System.Windows.Forms.DataGridView();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cmdSourceBillNo = new System.Windows.Forms.Button();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.dy = new System.Windows.Forms.ToolStripButton();
- this.Tool = new System.Windows.Forms.ToolStrip();
- this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bc = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.xz = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
this.txtHBillNo = new System.Windows.Forms.TextBox();
- this.btnOK = new System.Windows.Forms.Button();
+ this.txtNum = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
- this.txtHMarker = new System.Windows.Forms.TextBox();
- ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
- this.gbUp.SuspendLayout();
- this.panel6.SuspendLayout();
- this.P1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.button1 = new System.Windows.Forms.Button();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain_Pay)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum_Pay)).BeginInit();
+ this.P1.SuspendLayout();
+ this.gbUp.SuspendLayout();
this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
this.SuspendLayout();
//
- // pic1
+ // grdSum
//
- this.pic1.Location = new System.Drawing.Point(417, 1);
- this.pic1.Margin = new System.Windows.Forms.Padding(4);
- this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(84, 40);
- this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pic1.TabIndex = 36;
- this.pic1.TabStop = false;
- this.pic1.Visible = false;
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(4, 476);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(1340, 16);
+ this.grdSum.TabIndex = 46;
//
- // gbUp
+ // tabControl1
//
- this.gbUp.BackColor = System.Drawing.Color.Transparent;
- this.gbUp.Controls.Add(this.txtHMarker);
- this.gbUp.Controls.Add(this.label1);
- this.gbUp.Controls.Add(this.btnOK);
- this.gbUp.Controls.Add(this.label2);
- this.gbUp.Controls.Add(this.txtHBillNo);
- this.gbUp.Controls.Add(this.txtHNum);
- this.gbUp.Controls.Add(this.label10);
- this.gbUp.Location = new System.Drawing.Point(34, 49);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4);
- this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1189, 83);
- this.gbUp.TabIndex = 33;
- this.gbUp.TabStop = false;
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 185);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1356, 525);
+ this.tabControl1.TabIndex = 54;
//
- // label2
+ // tabPage1
//
- this.label2.AutoSize = true;
- this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(30, 28);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
- this.label2.TabIndex = 19;
- this.label2.Text = "鏉＄爜缂栧彿锛�";
- //
- // txtHNum
- //
- this.txtHNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHNum.Location = new System.Drawing.Point(451, 22);
- this.txtHNum.Margin = new System.Windows.Forms.Padding(4);
- this.txtHNum.Name = "txtHNum";
- this.txtHNum.Size = new System.Drawing.Size(205, 25);
- this.txtHNum.TabIndex = 80;
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(371, 28);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(82, 15);
- this.label10.TabIndex = 35;
- this.label10.Text = "鎷嗗垎鏉℃暟锛�";
- //
- // panel6
- //
- this.panel6.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.panel6.Controls.Add(this.lblHStockQty);
- this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel6.Location = new System.Drawing.Point(55, 894);
- this.panel6.Margin = new System.Windows.Forms.Padding(4);
- this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1249, 10);
- this.panel6.TabIndex = 63;
- //
- // lblHStockQty
- //
- this.lblHStockQty.AutoSize = true;
- this.lblHStockQty.Location = new System.Drawing.Point(11, 8);
- this.lblHStockQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lblHStockQty.Name = "lblHStockQty";
- this.lblHStockQty.Size = new System.Drawing.Size(0, 15);
- this.lblHStockQty.TabIndex = 0;
- //
- // P1
- //
- this.P1.BackColor = System.Drawing.Color.Lavender;
- this.P1.Controls.Add(this.pic1);
- this.P1.Controls.Add(this.lblCaption);
- this.P1.Controls.Add(this.gbUp);
- this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(55, 62);
- this.P1.Margin = new System.Windows.Forms.Padding(4);
- this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1249, 128);
- this.P1.TabIndex = 57;
- //
- // lblCaption
- //
- this.lblCaption.Dock = System.Windows.Forms.DockStyle.Top;
- this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(0, 0);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(1249, 30);
- this.lblCaption.TabIndex = 18;
- this.lblCaption.Text = "鏉＄爜鎷嗙爜";
- this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Controls.Add(this.grdSum);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Size = new System.Drawing.Size(1348, 496);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "椤�1";
+ this.tabPage1.UseVisualStyleBackColor = true;
//
// grdMain
//
@@ -183,78 +122,121 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(55, 62);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1249, 842);
- this.grdMain.TabIndex = 61;
+ this.grdMain.Size = new System.Drawing.Size(1340, 472);
+ this.grdMain.TabIndex = 47;
//
- // grdSum
+ // tabPage2
//
- this.grdSum.AllowUserToAddRows = false;
- this.grdSum.AllowUserToDeleteRows = false;
- this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
- this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(55, 904);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
- this.grdSum.Name = "grdSum";
- this.grdSum.ReadOnly = true;
- this.grdSum.RowHeadersWidth = 51;
- this.grdSum.RowTemplate.Height = 23;
- this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1249, 24);
- this.grdSum.TabIndex = 64;
+ this.tabPage2.Controls.Add(this.grdMain_Pay);
+ this.tabPage2.Controls.Add(this.grdSum_Pay);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Size = new System.Drawing.Size(1348, 496);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "椤�2";
+ this.tabPage2.UseVisualStyleBackColor = true;
//
- // panel1
+ // grdMain_Pay
//
- this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(55, 866);
- this.panel1.TabIndex = 59;
+ this.grdMain_Pay.AllowUserToAddRows = false;
+ this.grdMain_Pay.AllowUserToDeleteRows = false;
+ this.grdMain_Pay.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain_Pay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain_Pay.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain_Pay.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain_Pay.Location = new System.Drawing.Point(4, 4);
+ this.grdMain_Pay.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain_Pay.Name = "grdMain_Pay";
+ this.grdMain_Pay.ReadOnly = true;
+ this.grdMain_Pay.RowHeadersWidth = 30;
+ this.grdMain_Pay.RowTemplate.Height = 23;
+ this.grdMain_Pay.Size = new System.Drawing.Size(1340, 464);
+ this.grdMain_Pay.TabIndex = 49;
//
- // panel3
+ // grdSum_Pay
//
- this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1304, 62);
- this.panel3.Margin = new System.Windows.Forms.Padding(4);
- this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(52, 866);
- this.panel3.TabIndex = 60;
+ this.grdSum_Pay.AllowUserToAddRows = false;
+ this.grdSum_Pay.AllowUserToDeleteRows = false;
+ this.grdSum_Pay.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum_Pay.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum_Pay.Location = new System.Drawing.Point(4, 468);
+ this.grdSum_Pay.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum_Pay.Name = "grdSum_Pay";
+ this.grdSum_Pay.ReadOnly = true;
+ this.grdSum_Pay.RowHeadersWidth = 51;
+ this.grdSum_Pay.RowTemplate.Height = 23;
+ this.grdSum_Pay.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum_Pay.Size = new System.Drawing.Size(1340, 24);
+ this.grdSum_Pay.TabIndex = 48;
//
- // grdPrint
+ // label2
//
- this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1079, 679);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
- this.grdPrint.Name = "grdPrint";
- this.grdPrint.RowHeadersWidth = 51;
- this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
- this.grdPrint.TabIndex = 62;
- this.grdPrint.Visible = false;
+ this.label2.AutoSize = true;
+ this.label2.ForeColor = System.Drawing.Color.Black;
+ this.label2.Location = new System.Drawing.Point(61, 32);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.TabIndex = 19;
+ this.label2.Text = "鏉＄爜缂栧彿锛�";
//
- // timer1
+ // cmdSourceBillNo
//
- this.timer1.Enabled = true;
+ this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
+ this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(1332, 15);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
+ this.cmdSourceBillNo.TabIndex = 130;
+ this.cmdSourceBillNo.UseVisualStyleBackColor = true;
+ this.cmdSourceBillNo.Visible = false;
//
- // yl
+ // P1
//
- this.yl.AutoSize = false;
- this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
- this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yl.Name = "yl";
- this.yl.Size = new System.Drawing.Size(35, 47);
- this.yl.Text = "棰勮";
- this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.gbUp);
+ this.P1.Controls.Add(this.cmdSourceBillNo);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(0, 62);
+ this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(1356, 123);
+ this.P1.TabIndex = 49;
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.txtHMaker);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.button1);
+ this.gbUp.Controls.Add(this.label1);
+ this.gbUp.Controls.Add(this.txtNum);
+ this.gbUp.Controls.Add(this.txtHBillNo);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Location = new System.Drawing.Point(79, 15);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1189, 97);
+ this.gbUp.TabIndex = 33;
+ this.gbUp.TabStop = false;
+ //
+ // toolStripSeparator12
+ //
+ this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator12.Name = "toolStripSeparator12";
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
//
// dy
//
@@ -269,51 +251,6 @@
this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
//
- // Tool
- //
- this.Tool.AutoSize = false;
- this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
- this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
- this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.dy,
- this.yl,
- this.toolStripSeparator4,
- this.bc,
- this.toolStripSeparator5,
- this.tc,
- this.toolStripSeparator13});
- this.Tool.Location = new System.Drawing.Point(0, 0);
- this.Tool.Name = "Tool";
- this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1356, 62);
- this.Tool.Stretch = true;
- this.Tool.TabIndex = 56;
- this.Tool.Text = "toolStrip1";
- //
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
- //
- // bc
- //
- this.bc.AutoSize = false;
- this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
- this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.bc.Name = "bc";
- this.bc.Size = new System.Drawing.Size(35, 47);
- this.bc.Text = "鐢熸垚";
- this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- //
- // toolStripSeparator5
- //
- this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
- //
// tc
//
this.tc.AutoSize = false;
@@ -327,105 +264,187 @@
this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
//
- // toolStripSeparator13
+ // yl
//
- this.toolStripSeparator13.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(6, 62);
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 47);
+ this.yl.Text = "棰勮";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dy,
+ this.yl,
+ this.toolStripSeparator2,
+ this.xz,
+ this.toolStripSeparator6,
+ this.tc,
+ this.toolStripSeparator12});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1356, 62);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 48;
+ this.Tool.Text = "toolStrip1";
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ //
+ // xz
+ //
+ this.xz.AutoSize = false;
+ this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
+ this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xz.ImageTransparentColor = System.Drawing.Color.White;
+ this.xz.Name = "xz";
+ this.xz.Size = new System.Drawing.Size(35, 47);
+ this.xz.Text = "鐢熸垚";
+ this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xz.Click += new System.EventHandler(this.xz_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(1079, 679);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.TabIndex = 53;
+ this.grdPrint.Visible = false;
//
// txtHBillNo
//
- this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(116, 22);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(146, 29);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(219, 25);
- this.txtHBillNo.TabIndex = 80;
+ this.txtHBillNo.Size = new System.Drawing.Size(181, 25);
+ this.txtHBillNo.TabIndex = 20;
//
- // btnOK
+ // txtNum
//
- this.btnOK.Location = new System.Drawing.Point(692, 23);
- this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(75, 23);
- this.btnOK.TabIndex = 81;
- this.btnOK.Text = "纭畾";
- this.btnOK.UseVisualStyleBackColor = true;
+ this.txtNum.Location = new System.Drawing.Point(442, 29);
+ this.txtNum.Name = "txtNum";
+ this.txtNum.Size = new System.Drawing.Size(186, 25);
+ this.txtNum.TabIndex = 21;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(838, 28);
+ this.label1.Location = new System.Drawing.Point(357, 32);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
- this.label1.TabIndex = 82;
- this.label1.Text = "鍒跺崟浜猴細";
+ this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.TabIndex = 22;
+ this.label1.Text = "鎷嗗垎鏉℃暟锛�";
//
- // txtHMarker
+ // button1
//
- this.txtHMarker.Location = new System.Drawing.Point(902, 22);
- this.txtHMarker.Name = "txtHMarker";
- this.txtHMarker.Size = new System.Drawing.Size(169, 25);
- this.txtHMarker.TabIndex = 83;
+ this.button1.Location = new System.Drawing.Point(656, 25);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(84, 31);
+ this.button1.TabIndex = 23;
+ this.button1.Text = "纭� 瀹�";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(794, 33);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.TabIndex = 24;
+ this.label3.Text = "鍒跺崟浜猴細";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.Location = new System.Drawing.Point(867, 29);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.ReadOnly = true;
+ this.txtHMaker.Size = new System.Drawing.Size(182, 25);
+ this.txtHMaker.TabIndex = 25;
//
// Gy_BarCodeBill_ChaiMa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1356, 928);
- this.Controls.Add(this.panel6);
+ this.ClientSize = new System.Drawing.Size(1356, 710);
+ this.Controls.Add(this.tabControl1);
this.Controls.Add(this.P1);
- this.Controls.Add(this.grdMain);
- this.Controls.Add(this.grdSum);
- this.Controls.Add(this.panel1);
- this.Controls.Add(this.panel3);
- this.Controls.Add(this.grdPrint);
this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
this.Name = "Gy_BarCodeBill_ChaiMa";
- this.Text = "鏉＄爜鎷嗙爜";
+ this.Text = "Gy_BarCodeBill_ChaiMa";
this.Load += new System.EventHandler(this.Gy_BarCodeBill_ChaiMa_Load);
- ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain_Pay)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum_Pay)).EndInit();
+ this.P1.ResumeLayout(false);
this.gbUp.ResumeLayout(false);
this.gbUp.PerformLayout();
- this.panel6.ResumeLayout(false);
- this.panel6.PerformLayout();
- this.P1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
this.ResumeLayout(false);
}
#endregion
-
- private System.Windows.Forms.PictureBox pic1;
- private System.Windows.Forms.GroupBox gbUp;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox txtHNum;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.Panel panel6;
- private System.Windows.Forms.Label lblHStockQty;
- private System.Windows.Forms.Panel P1;
- private System.Windows.Forms.Label lblCaption;
- private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.DataGridView grdSum;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.DataGridView grdPrint;
- private System.Windows.Forms.Timer timer1;
- private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DataGridView grdMain_Pay;
+ private System.Windows.Forms.DataGridView grdSum_Pay;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Button cmdSourceBillNo;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripButton dy;
- private System.Windows.Forms.ToolStrip Tool;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
- private System.Windows.Forms.ToolStripButton bc;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripButton tc;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
- private System.Windows.Forms.TextBox txtHBillNo;
- private System.Windows.Forms.TextBox txtHMarker;
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton xz;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.TextBox txtHMaker;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.TextBox txtNum;
+ private System.Windows.Forms.TextBox txtHBillNo;
}
}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
index 04b19b3..2cd9c33 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Pub_Class;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -15,24 +16,260 @@
{
InitializeComponent();
}
+
//瀹氫箟鍒�
public const Int16 HTagCol = 0;
- public const Int16 HBarCode = 1;
- public const Int16 HQty = 2;
- public const Int16 HNum = 3;
- public const Int16 HMaterCol = 4;
- public const Int16 HMaterName = 5;
- public const Int16 HMaterMould = 6;
- public const Int16 HBatchNo = 7;
- //
- private void txtHBillNo_TextChanged(object sender, EventArgs e)
- {
+ public const Int16 HSnoCol = 1;
+ public const Int16 HInterID = 2;
+ public const Int16 HBarCode = 3;
+ public const Int16 HQty = 4;
+ public const Int16 HNum = 5;
+ public const Int16 HMaterCol = 6;
+ public const Int16 HMaterName = 7;
+ public const Int16 HMaterMould = 8;
+ public const Int16 HBatchNo =9;
+ //=======================================================================
+ public const Int16 HTagCol2 = 0;
+ public const Int16 HSnoCol2 = 1;
+ public const Int16 HInterID2 = 2;
+ public const Int16 HBarCode2 = 3;
+ public const Int16 HQty2 = 4;
+ public const Int16 HNum2 = 5;
+ public const Int16 HMaterCol2 = 6;
+ public const Int16 HMaterName2 = 7;
+ public const Int16 HMaterMould2 = 8;
+ public const Int16 HBatchNo2 = 9;
+ public const string ModName = ""; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鏉＄爜鎷嗙爜"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Gy_BarCodeBill_ChaiMa";
+ ClsGridViewSum oSumGrid_Mater = new ClsGridViewSum();
+ ClsGridViewSum oSumGrid_Pay = new ClsGridViewSum();
+ public DAL.ClsGy_BarCodeBill_ChaiMa BillNew = new DAL.ClsGy_BarCodeBill_ChaiMa(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsGy_BarCodeBill_ChaiMa BillOld = new DAL.ClsGy_BarCodeBill_ChaiMa(); //瀵瑰簲鍗曟嵁绫�
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ //
+ txtHMaker.Text = DBUtility.ClsPub.CurUserName;
+ initGrid();
+ initGrid_Pay();
}
+ #region 绐椾綋澶勭悊鏂规硶
+
+ //鍒濆鍖栭〉绛�1
+ private void initGrid()
+ {
+ grdMain.ColumnCount = 9; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name + "1");
+ grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
+ grdMain.Columns[HInterID].HeaderText = "HInterID";
+ grdMain.Columns[HBarCode].HeaderText = "鏉＄爜缂栧彿";
+ grdMain.Columns[HQty].HeaderText = "鏉＄爜鏁伴噺";
+ grdMain.Columns[HNum].HeaderText = "鎷嗗垎鏁伴噺";
+ grdMain.Columns[HMaterCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain.Columns[HMaterName].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterMould].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HBatchNo].HeaderText = "鎵瑰彿";
+ //=============================================================================
+
+ ////闅愯棌鍒�
+ grdMain.Columns[HTagCol].Visible = false;
+ grdMain.Columns[HInterID].Visible = false;
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HNum.ToString();
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HTagCol.ToString() + "0";
+ //鏍煎紡鍖栫綉鏍�
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid_Mater);
+ }
+
+ //鍒濆鍖栭〉绛�2
+ private void initGrid_Pay()
+ {
+ grdMain.ColumnCount = 9; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name + "1");
+ grdMain.Columns[HSnoCol2].HeaderText = "搴忓彿";
+ grdMain.Columns[HInterID2].HeaderText = "HInterID";
+ grdMain.Columns[HBarCode2].HeaderText = "鏉＄爜缂栧彿";
+ grdMain.Columns[HQty2].HeaderText = "鏉＄爜鏁伴噺";
+ grdMain.Columns[HNum2].HeaderText = "鎷嗗垎鏁伴噺";
+ grdMain.Columns[HMaterCol2].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain.Columns[HMaterName2].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterMould2].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HBatchNo2].HeaderText = "鎵瑰彿";
+ //=============================================================================
+ ////闅愯棌鍒�
+ grdMain.Columns[HTagCol].Visible = false;
+ grdMain.Columns[HInterID].Visible = false;
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HNum2.ToString();
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HTagCol2.ToString() + "0";
+ //鏍煎紡鍖栫綉鏍�
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid_Pay);
+ }
+
+ // 鍩烘湰涓嶅彉
+
+ private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid_Mater);
+ }
+
+ #endregion
+
+ //椤甸潰鍔犺浇
private void Gy_BarCodeBill_ChaiMa_Load(object sender, EventArgs e)
{
+ txtHBillNo.Text = "";
+ txtNum.Text = "";
+ txtHMaker.Text = DBUtility.ClsPub.CurUserName;
+ }
+ //鏁版嵁楠岃瘉
+ private bool Sub_AllowSave()
+ {
+ int i = 0;
+ while (grdMain_Pay.Rows[i].Cells[HSnoCol].Value.ToString() != "")
+ {
+ if (grdMain_Pay.Rows[i].Cells[HNum2].Value.ToString() == "")
+ {
+ MessageBox.Show("璇峰皢琛ㄦ牸鎷嗗垎鏁伴噺濉啓瀹屾暣", "鎻愮ず");
+ return false;
+ }
+ }
+ return true;
+ }
+ private bool SeverDate()
+ {
+ Int32 i;
+ bool bResult;
+ BillNew = new DAL.ClsGy_BarCodeBill_ChaiMa();
+
+ if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
+ return false;
+
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ string HBillNo = txtHBillNo.Text;
+ DataSet Ds;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Ds = oCn.RunProcReturn("select top 1* from h_v_Gy_BarCodeBill_ChaiMa where HBarCode='" + HBillNo + "'", "h_v_Gy_BarCodeBill_ChaiMa");
+
+ for (i = 0; i <= grdMain_Pay.RowCount - 1; i++)
+ {
+ if (ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HBarCode].Value) != 0)
+ {
+
+ Model.ClsGy_BarCodeEdit_Model model = new Model.ClsGy_BarCodeEdit_Model();
+ //鍥哄畾璧嬪��========================================
+ model.HEntryID = i + 1;
+ model.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
+ model.HBarCode = DBUtility.ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HBarCode].Value);
+ model.HQty = DBUtility.ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HQty].Value);
+ model.HPieceQty = DBUtility.ClsPub.isInt(grdMain_Pay.Rows[i].Cells[HNum2].Value);
+ model.HBatchNo = DBUtility.ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HBatchNo].Value);
+ model.HMaterID = DBUtility.ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HMaterCol].Value);
+ model.HUnitID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HUnitID"].ToString());
+ model.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"].ToString());
+ model.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"].ToString());
+ model.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"].ToString());
+ model.HBarCodeType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBarCodeType"].ToString());
+ model.HItemSubID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemSubID"].ToString());
+ model.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"].ToString());
+ model.HSourceInterID= DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceInterID"].ToString());
+ model.HSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceEntryID"].ToString());
+ model.HSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillNo"].ToString());
+ model.HSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillType"].ToString());
+ model.HUseFlag = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUseFlag"].ToString());
+ model.HStopflag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HStopflag"].ToString());
+ model.HInitQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HInitQty"].ToString());
+ model.HSourceID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInitQty"].ToString());
+ model.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"].ToString());
+ model.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSTOCKORGID"].ToString());
+ model.HOWNERID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOWNERID"].ToString());
+ model.HBarCodeDate= DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HBarCodeDate"].ToString());
+ model.HInnerBillNo= DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString());
+ model.HMZ= DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMZ"].ToString());
+
+ model.HMakeDate = DateTime.Now;
+ model.HMaker = ClsPub.CurUserName;
+
+ if (model.HPieceQty <= 0|| model.HPieceQty.ToString() =="")
+ {
+ MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝鎷嗗垎鏁伴噺蹇呴』澶т簬0锛�");
+ return false;
+ }
+ BillNew.DetailColl_Mater.Add(model);
+ }
+ }
+ return true;
+ //淇濆瓨
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ MessageBox.Show("鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + this.txtHBillNo.Text.Trim(), "鎻愮ず");
+ return true;
+ }
+ else
+ {
+ MessageBox.Show("淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ return false;
+ }
+ }
+ //鐢熸垚鎸夐挳
+ private void xz_Click(object sender, EventArgs e)
+ {
+ this.SeverDate();
+ }
+ //纭畾鎸夐挳
+ private void button1_Click(object sender, EventArgs e)
+ {
+ if (DBUtility.ClsPub.isStrNull(txtHBillNo.Text) != ""|| DBUtility.ClsPub.isStrNull(txtNum.Text) != "")
+ {
+ string HBillNo = txtHBillNo.Text;
+ int HNum = int.Parse(txtNum.Text);
+ DataSet Ds;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Ds = oCn.RunProcReturn("select top 1* from h_v_Gy_BarCodeBill_ChaiMa where HBarCode='" + HBillNo + "'", "h_v_Gy_BarCodeBill_ChaiMa");
+ grdMain.Rows[0].Cells[HTagCol].Value = "*";
+ grdMain.Rows[0].Cells[HInterID].Value = Ds.Tables[0].Rows[0]["HInterID"].ToString();
+ grdMain.Rows[0].Cells[HBarCode].Value = Ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
+ grdMain.Rows[0].Cells[HQty].Value = Ds.Tables[0].Rows[0]["鏉＄爜鏁伴噺"].ToString();
+ grdMain.Rows[0].Cells[HNum].Value = 0;
+ grdMain.Rows[0].Cells[HMaterCol].Value = Ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[0].Cells[HMaterName].Value = Ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[0].Cells[HMaterMould].Value = Ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[0].Cells[HBatchNo].Value = Ds.Tables[0].Rows[0]["鎵瑰彿"].ToString();
+ for (int i = 0; i < HNum; i++)
+ {
+ int Code = 65 + i;
+ System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
+ byte[] byteArray = new byte[] { (byte)Code };
+ string A = asciiEncoding.GetString(byteArray);
+ string No = Ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
+ grdMain_Pay.Rows[i].Cells[HTagCol2].Value = "*";
+ grdMain_Pay.Rows[0].Cells[HInterID2].Value = Ds.Tables[0].Rows[0]["HInterID"].ToString();
+ grdMain_Pay.Rows[0].Cells[HBarCode2].Value = No + A;
+ grdMain_Pay.Rows[0].Cells[HQty2].Value = Ds.Tables[0].Rows[0]["鏉＄爜鏁伴噺"].ToString();
+ grdMain_Pay.Rows[0].Cells[HMaterCol2].Value = Ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain_Pay.Rows[0].Cells[HMaterName2].Value = Ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain_Pay.Rows[0].Cells[HMaterMould2].Value = Ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain_Pay.Rows[0].Cells[HBatchNo2].Value = Ds.Tables[0].Rows[0]["鎵瑰彿"].ToString();
+ }
+ }
+ else
+ {
+ MessageBox.Show("璇峰～鍐欐潯鐮佺紪鍙峰拰鎷嗗垎鏉℃暟", "鎻愮ず");
+ }
+
}
}
}
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx"
index cb2ec69..e2a76dc 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx"
@@ -117,10 +117,42 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>198, 17</value>
- </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -134,16 +166,9 @@
AABJRU5ErkJggg==
</value>
</data>
- <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
- jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
- grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
- FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
- u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
-</value>
- </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>198, 17</value>
+ </metadata>
<metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>303, 17</value>
</metadata>
@@ -383,29 +408,18 @@
+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
</value>
</data>
- <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
- /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
- mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
- ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
- rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
- BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
- rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
- ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
- eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
- SUVORK5CYII=
-</value>
- </data>
- <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
- bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
- rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
- wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
- gg==
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
</value>
</data>
</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 617716e..43cf6eb 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -76,7 +76,7 @@
try
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_UserByUserRelation_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Gy_UserByUserRelation_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index d8d44cf..2fbc50f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -126,7 +126,7 @@
DAL.ClsGy_QCCheckItem_View oDeptHlp = new DAL.ClsGy_QCCheckItem_View();
try
{
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -313,7 +313,7 @@
//鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs b/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
index 275bca6..377f7f9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
@@ -313,7 +313,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index ee9a7f6..df3bb8f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -360,7 +360,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -453,7 +453,7 @@
DAL.ClsGy_Customer_View oDeptHlp = new DAL.ClsGy_Customer_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index e9a1c8e..357293e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -110,7 +110,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -400,7 +400,7 @@
long HEntityID = 1;
//鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index e6ffb06..5047ff9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -364,7 +364,7 @@
DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1");
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -802,7 +802,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_EquipMentController.cs b/WebAPI/Controllers/BaseSet/Gy_EquipMentController.cs
index 8a323ce..88cf119 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EquipMentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EquipMentController.cs
@@ -109,7 +109,7 @@
DAL.ClsGy_EquipMent_View oDeptHlp = new DAL.ClsGy_EquipMent_View();
try
{
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true,User))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false,User))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -361,7 +361,7 @@
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index 12eeffb..22e0ba4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -254,7 +254,7 @@
//var HProcID = "";
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -365,7 +365,7 @@
// var HProcID = list[0].HProcID;
// //鍒ゆ柇鏉冮檺
- // //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ // //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -440,7 +440,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -558,7 +558,7 @@
DAL.ClsGy_Group_View oDeptHlp = new DAL.ClsGy_Group_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
index 3cbd624..7a2c41f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
@@ -123,7 +123,7 @@
DAL.ClsGy_RepairCheck_View oDeptHlp = new DAL.ClsGy_RepairCheck_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -315,7 +315,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
index b6c240b..d9cca81 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
@@ -118,7 +118,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -290,7 +290,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
index 6c2baa4..db3f653 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
@@ -128,7 +128,7 @@
DAL.ClsGy_RepairType_View oDeptHlp = new DAL.ClsGy_RepairType_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -312,7 +312,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 41081e7..6ecfc85 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -283,7 +283,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -353,7 +353,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -517,7 +517,7 @@
string msg4 = sArray[2].ToString();//褰撳墠浜�
oCN.BeginTran();
- if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -675,7 +675,7 @@
string msg4 = sArray[2].ToString();//褰撳墠浜�
try
{
- if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -855,7 +855,7 @@
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -972,7 +972,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
index 77dd97b..6a850d8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -34,7 +34,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -128,7 +128,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -231,7 +231,7 @@
bool HEndFlag = list[0].HEndFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg4, 1, true, msg3))
+ if (!ClsPub.Security_Log(msg4, 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -316,7 +316,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -449,7 +449,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
index ac5da5a..aa0f926 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
@@ -252,7 +252,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
index 814dedf..cf4015b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
@@ -126,7 +126,7 @@
DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -310,7 +310,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index fc0a163..d0a35c5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -167,7 +167,7 @@
// long HProcID = list[0].HProcID;
// //鍒ゆ柇鏉冮檺
- // //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ // //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -311,7 +311,7 @@
long HProcID = list[0].HProcID;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -507,7 +507,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
index 11109f9..de922ca 100644
--- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -126,7 +126,7 @@
DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -309,7 +309,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index a4ee1b4..f72e812 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -287,7 +287,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs b/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
index e7b33fa..09b5cc9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
@@ -59,7 +59,7 @@
DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true,User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false,User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -332,7 +332,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 4e10ae8..87a95d2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -299,7 +299,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -389,7 +389,7 @@
DAL.ClsGy_Supplier_View oGroupHlp = new DAL.ClsGy_Supplier_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index 792754c..8aa4810 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -302,7 +302,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index f43c15d..a4e2e57 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -305,7 +305,7 @@
string HUpDater = list[0].HUpDater;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -402,7 +402,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 713e589..33cf622 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -257,7 +257,7 @@
var HWorkTimes = list[0].HWorkTimes;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -375,7 +375,7 @@
//var HWorkTimes = list[0].HWorkTimes;
// //鍒ゆ柇鏉冮檺
- // //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ // //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -450,7 +450,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -568,7 +568,7 @@
DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
index 98d001b..d13893c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
@@ -285,7 +285,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
index f1cc28a..a36240d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
@@ -290,7 +290,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs b/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
index d5cd288..e8a2aa3 100644
--- a/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
+++ b/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
@@ -205,7 +205,7 @@
string HUseFlag = list[0].HUseFlag;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -293,7 +293,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
index 75c4796..8ccac8b 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
@@ -118,7 +118,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
index 45e70b1..f7fef97 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
@@ -118,7 +118,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
index f4b8ec3..a4f68bd 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
@@ -118,7 +118,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index b41c069..c763c47 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -156,7 +156,7 @@
bool HStopflag = list[0].HStopflag;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -244,7 +244,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 575a61d..333e99e 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -150,7 +150,7 @@
string HUpDater = list[0].HUpDater;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 2289d0a..2185301 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -33,7 +33,7 @@
try
{
//鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
- bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, false, user);
if (!isCgjl)
{
sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
diff --git a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
index 8e378ca..796b6e2 100644
--- a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
@@ -66,7 +66,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index 6093f7a..dee19ee 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -43,7 +43,7 @@
//}
//鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
- bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, true, user);
+ bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
if (!isCgjl)
{
sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 23c5b43..ab7d2b1 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -481,7 +481,7 @@
//}
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log_second("MES_StationEntrustInBill_Edit", 1, true, CurUserName))
+ if (!ClsPub.Security_Log_second("MES_StationEntrustInBill_Edit", 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -546,7 +546,7 @@
try
{
//瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Check", 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Check", 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -745,7 +745,7 @@
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_StationEntrustInBill_Delete", 1, true, HDeleteMan))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_StationEntrustInBill_Delete", 1, false, HDeleteMan))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
index 3016d45..fc70373 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -405,7 +405,7 @@
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustOutBill_Delete", 1, true, HDeleteMan))
+ if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustOutBill_Delete", 1, false, HDeleteMan))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -519,7 +519,7 @@
}
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("MES_StationEntrustOutBill_Edit", 1, true, CurUserName))
+ if (!ClsPub.Security_Log("MES_StationEntrustOutBill_Edit", 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -585,7 +585,7 @@
{
//string ModRightNameCheck = "MES_StationEntrustOutBill_Check";
////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 02eb9ec..a3e5a06 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -494,7 +494,7 @@
{
string ModRightNameCheck = "MES_StationInBill_Check";
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false,CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -791,7 +791,7 @@
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("MES_StationInBill_Delete", 1, true, HDeleteMan))
+ if (!DBUtility.ClsPub.Security_Log("MES_StationInBill_Delete", 1, false, HDeleteMan))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 8969ddf..d3874e3 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -682,7 +682,7 @@
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("MES_StationOutBill_Delete", 1, true, HDeleteMan))
+ if (!DBUtility.ClsPub.Security_Log("MES_StationOutBill_Delete", 1, false, HDeleteMan))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -824,7 +824,7 @@
{
//string ModRightNameCheck = "MES_StationOutBill_Check";
////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
index e52323c..8bbdb6e 100644
--- a/WebAPI/Controllers/GG_NoticeController.cs
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -29,7 +29,7 @@
try
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, false, user))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -114,7 +114,7 @@
try
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg3))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, false, msg3))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -263,7 +263,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("", 1, true, user))
+ //if (!DBUtility.ClsPub.Security_Log_second("", 1, false, user))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
index de21de0..3ef75d4 100644
--- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs
+++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -68,7 +68,7 @@
{
//IsAudit=1 瀹℃牳锛� IsAudit=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 5549c82..c57bd54 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -227,7 +227,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index b2aa15a..1cc764d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -89,7 +89,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -225,7 +225,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -360,7 +360,7 @@
public object DeltetMouldMoveStockStepInBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -437,7 +437,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index 90a0e9b..8c0db55 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -89,7 +89,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -226,7 +226,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -361,7 +361,7 @@
public object DeltetMouldMoveStockStepOutBil(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -438,7 +438,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 71dc105..3549af8 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -89,7 +89,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -224,7 +224,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -359,7 +359,7 @@
public object DeltetMouldOtherOutBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, true,user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, false,user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -436,7 +436,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index c58cd4d..91200a4 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -29,7 +29,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -92,7 +92,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -186,7 +186,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -293,7 +293,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -484,7 +484,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -665,7 +665,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index 76c827b..17f3eeb 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -89,7 +89,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -226,7 +226,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -361,7 +361,7 @@
public object DeltetMouldProdMoveBilll(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -438,7 +438,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 3ae5837..938f895 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -29,7 +29,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -93,7 +93,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, false, user))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -198,7 +198,7 @@
try
{
////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -305,7 +305,7 @@
try
{
////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -438,7 +438,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, true, msg3))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -582,7 +582,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index 8eb3244..dbb768a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -32,7 +32,7 @@
if (ds == null)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -92,7 +92,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -193,7 +193,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -373,7 +373,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index a7baf96..cbbc96e 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -29,7 +29,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -136,7 +136,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -239,7 +239,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -322,7 +322,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -408,7 +408,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 0e51805..80f446a 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -620,7 +620,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -695,7 +695,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -902,7 +902,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -1105,7 +1105,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -1307,7 +1307,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 44ddf03..bd25fd3 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -27,7 +27,7 @@
{
try
{
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
index fe94d5b..ba11fb0 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -223,7 +223,7 @@
public object DeltetEquipDotCheckBillList(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
index b36ced9..302c7ba 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
@@ -218,7 +218,7 @@
public object DeltetEquipDotCheckPlanBillList(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index eef42ac..494ec2a 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -243,7 +243,7 @@
public object DeltetEquipMaintainBillList(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index d1e3917..13391af 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -326,7 +326,7 @@
public object DeltetMouldLifeChangeBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -420,7 +420,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index d44c377..2131d79 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -205,7 +205,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -292,7 +292,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -476,7 +476,7 @@
string refSav = sArray[2].ToString();
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -722,7 +722,7 @@
{
try
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ICMOBillWorkQtyStatus_Tmp with (nolock)" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadCount),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ICMOBillWorkQtyStatus_Tmp with (nolock)" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
if (ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
@@ -915,7 +915,7 @@
{
string StrMessage = "";
//瀹℃牳鏉冮檺
- if (!WebClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName,ref StrMessage))
+ if (!WebClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName,ref StrMessage))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
index 9c88759..82c05ac 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
@@ -200,7 +200,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -287,7 +287,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -432,7 +432,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
index 0f5460d..0e0a441 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
@@ -192,7 +192,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -280,7 +280,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -425,7 +425,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 96e2e45..380e2ec 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -46,7 +46,7 @@
string refSav = sArray[2].ToString();
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -241,7 +241,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -469,7 +469,7 @@
public object Get_DeleteTransFerBill(string HInterID,string HEntryID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs b/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
index c8db589..d354a67 100644
--- a/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
@@ -146,7 +146,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -419,7 +419,7 @@
string refSav = sArray[2].ToString();
//淇濆瓨鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -645,7 +645,7 @@
try
{
//瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
index eae2ec4..aae18f6 100644
--- a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -80,7 +80,7 @@
try
{
//鍒ゆ柇鏄惁鏈夊鏍告潈闄�
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index 1e2e0b0..7eb545f 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -14,6 +14,8 @@
using NPOI.SS.UserModel;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
+using System.Web;
+using System.Net.Http.Headers;
namespace WebAPI.Controllers.SCGL
{
@@ -103,7 +105,7 @@
try
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_PackUnionBill", 1, true, user))
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_PackUnionBill", 1, false, user))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -269,81 +271,58 @@
#endregion
#region 鏍囧噯宸ユ椂瀵煎嚭Excel琛ㄦ牸鏁版嵁
+ private System.IO.Stream ExcelStream()
+ {
+ HSSFWorkbook hssfworkbook = new HSSFWorkbook();
+ ISheet sheet1 = hssfworkbook.CreateSheet("sheet1");
+ IRow row1 = sheet1.CreateRow(0);
+ ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
+ row1.CreateCell(0).SetCellValue("杩涚珯鐢熶骇璁㈠崟鍙�");
+ row1.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
+ row1.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
+ row1.CreateCell(3).SetCellValue("宸ユ椂");
+ row1.CreateCell(4).SetCellValue("涓嶈壇鏁伴噺");
+ row1.CreateCell(5).SetCellValue("鎶ュ簾鏁伴噺");
+ row1.CreateCell(6).SetCellValue("杩涚珯鏁伴噺");
+ row1.CreateCell(7).SetCellValue("鍑虹珯鏁伴噺");
+ row1.CreateCell(8).SetCellValue("鍑虹珯鏃堕棿");
+ row1.CreateCell(9).SetCellValue("杩涚珯鏃堕棿");
+ row1.CreateCell(10).SetCellValue("鍒跺崟浜�");
+ row1.CreateCell(11).SetCellValue("鍒跺崟鏃ユ湡");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ IRow row = sheet1.CreateRow(i + 1);
+ row.CreateCell(0).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鐢熶骇璁㈠崟鍙�"].ToString());
+ row.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
+ row.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
+ row.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
+ row.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
+ row.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
+ row.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
+ row.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
+ row.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
+ row.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
+ row.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
+ row.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
+ }
+
+ MemoryStream file = new MemoryStream();
+ hssfworkbook.Write(file);
+ file.Seek(0, SeekOrigin.Begin);
+ return file;
+ }
[Route("Sc_PackUnionBill/Sc_StationInBillSetExcel")]
[HttpGet]
- public object Sc_StationInBillSetExcel()
+ public HttpResponseMessage Sc_StationInBillSetExcel()
{
- try
- {
- ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
- IWorkbook book = new HSSFWorkbook();
- ISheet sheet = book.CreateSheet("sheet1");
- IRow row1 = sheet.CreateRow(0);
- row1.CreateCell(0).SetCellValue("杩涚珯鐢熶骇璁㈠崟鍙�");
- row1.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
- row1.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
- row1.CreateCell(3).SetCellValue("宸ユ椂");
- row1.CreateCell(4).SetCellValue("涓嶈壇鏁伴噺");
- row1.CreateCell(5).SetCellValue("鎶ュ簾鏁伴噺");
- row1.CreateCell(6).SetCellValue("杩涚珯鏁伴噺");
- row1.CreateCell(7).SetCellValue("鍑虹珯鏁伴噺");
- row1.CreateCell(8).SetCellValue("鍑虹珯鏃堕棿");
- row1.CreateCell(9).SetCellValue("杩涚珯鏃堕棿");
- row1.CreateCell(10).SetCellValue("鍒跺崟浜�");
- row1.CreateCell(11).SetCellValue("鍒跺崟鏃ユ湡");
- for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
- {
- IRow row = sheet.CreateRow(i + 1);
- row.CreateCell(0).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鐢熶骇璁㈠崟鍙�"].ToString());
- row.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
- row.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
- row.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
- row.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
- row.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
- row.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
- row.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
- row.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
- row.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
- row.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
- row.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
- }
- string filename = "C:/Users/Administrator/Desktop/鏍囧噯宸ユ椂琛�" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss-ffff") + ".xls";
- MemoryStream BookStream = new MemoryStream();
- book.Write(BookStream);
- BookStream.Seek(0,SeekOrigin.Begin);
- byte[] buffer = BookStream.ToArray();
- using (FileStream fs = new FileStream(filename, FileMode.CreateNew, FileAccess.Write))
- {
- try
- {
- fs.Write(buffer, 0, buffer.Length);
- fs.Flush();
- }
- catch
- {
-
- }
- finally
- {
- fs.Dispose();
- BookStream.Dispose();
- }
- }
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛瀵煎嚭琛ㄦ牸鑷虫闈�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception ex)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀵煎嚭澶辫触" + ex.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
+ var file = ExcelStream();
+ HttpResponseMessage result = new HttpResponseMessage(HttpStatusCode.OK);
+ result.Content = new StreamContent(file);
+ result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/vnd.ms-excel");
+ result.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment");
+ result.Content.Headers.ContentDisposition.FileName = "鏍囧噯宸ユ椂琛�.xls";
+ return result;
}
#endregion
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 1795532..df55140 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -411,7 +411,7 @@
public object DeltetEqpRepairWorkBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -691,7 +691,7 @@
public object DeltetEqpRepairCheckBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -971,7 +971,7 @@
public object DeltetEqpConkBookBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -1061,7 +1061,7 @@
return objJsonResult;
}
//寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select top 1 * from Gy_EquipMent where HNumber= '" + HBarCode + "'", "Gy_EquipMent");
+ ds = oCN.RunProcReturn("select top 1 * from Gy_EquipFileBillMain where HEquipFileNumber= '" + HBarCode + "'", "Gy_EquipFileBillMain");
//鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index 003c5e2..bf4c1dc 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -1425,7 +1425,7 @@
//public object DeltetMouldRepairWorkBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -1512,7 +1512,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -1844,7 +1844,7 @@
//public object DeltetMouldRepairCheckBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -2125,7 +2125,7 @@
//public object DeltetMouldConkBookBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -2396,7 +2396,7 @@
//public object DeltetMouldMaintainPlanBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -2997,7 +2997,7 @@
//public object DeltetSc_MouldDotCheckBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -3270,7 +3270,7 @@
//public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -3997,7 +3997,7 @@
//public object DeltetMouldScrapOutHouseBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -4084,7 +4084,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -4219,7 +4219,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4341,7 +4341,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4531,7 +4531,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4638,7 +4638,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4741,7 +4741,7 @@
public object DeltetMouldRepairInBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4835,7 +4835,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairIn_SingleBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairIn_SingleBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5169,7 +5169,7 @@
//public object DeltetMouldProdOutBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -5499,7 +5499,7 @@
//public object DeltetMouldLifeChangeBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index beff831..1890b62 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -88,7 +88,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -119,11 +119,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldOtherInBillList");
}
else
{
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere+ "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
}
@@ -163,7 +163,7 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
- 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
+ 鍗曚环 HPrice, 閲戦 HMoney,鏀舵枡浠撳簱ID HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱 HWHName,HSPID,
浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldOtherInBillList"), "h_v_Sc_MouldOtherInBillList");
}
@@ -172,7 +172,7 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
- 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
+ 鍗曚环 HPrice, 閲戦 HMoney,鏀舵枡浠撳簱ID HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱 HWHName,HSPID,
浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldOtherInBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
@@ -180,8 +180,8 @@
}
//鏌ユ眹鎬�
ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,
- HWHSonID,max(鍙戞枡浠撳簱浠ｇ爜)鍙戞枡浠撳簱浠ｇ爜,max(鍙戞枡浠撳簱)鍙戞枡浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldOtherInBillList
- where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,HWHSonID,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldOtherInBillList");
+ 鏀舵枡浠撳簱ID,max(鏀舵枡浠撳簱浠ｇ爜)鏀舵枡浠撳簱浠ｇ爜,max(鏀舵枡浠撳簱)鏀舵枡浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldOtherInBillList
+ where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鏀舵枡浠撳簱ID,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldOtherInBillList");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
@@ -223,7 +223,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -358,7 +358,7 @@
public object DeltetMouldOtherInBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index c452787..9c96100 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1423,7 +1423,7 @@
public object DeltetMouldRepairWorkBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -1510,7 +1510,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1842,7 +1842,7 @@
public object DeltetMouldRepairCheckBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -2123,7 +2123,7 @@
public object DeltetMouldConkBookBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -2394,7 +2394,7 @@
public object DeltetMouldMaintainPlanBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -2995,7 +2995,7 @@
public object DeltetSc_MouldDotCheckBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -3268,7 +3268,7 @@
public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -3442,7 +3442,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3764,7 +3764,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3795,11 +3795,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
}
else
{
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
}
}
@@ -3899,7 +3899,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4034,7 +4034,7 @@
public object DeltetMouldScrapOutHouseBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4121,7 +4121,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -4250,7 +4250,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4339,7 +4339,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4370,11 +4370,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdBackBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdBackBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldProdBackBillList");
}
else
{
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
}
@@ -4414,7 +4414,7 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
- 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
+ 鍗曚环 HPrice, 閲戦 HMoney,鏀舵枡浠撳簱ID HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱 HWHName,HSPID,
浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
}
@@ -4424,7 +4424,7 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
- 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
+ 鍗曚环 HPrice, 閲戦 HMoney,鏀舵枡浠撳簱ID HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱 HWHName,HSPID,
浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
@@ -4432,8 +4432,8 @@
}
//鏌ユ眹鎬�
ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,
- HWHSonID,max(鍙戞枡浠撳簱浠ｇ爜)鍙戞枡浠撳簱浠ｇ爜,max(鍙戞枡浠撳簱)鍙戞枡浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldProdBackBillList
- where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,HWHSonID,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldProdBackBillList");
+ 鏀舵枡浠撳簱ID,max(鏀舵枡浠撳簱浠ｇ爜)鏀舵枡浠撳簱浠ｇ爜,max(鏀舵枡浠撳簱)鏀舵枡浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldProdBackBillList
+ where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鏀舵枡浠撳簱ID,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldProdBackBillList");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
@@ -4474,7 +4474,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4612,7 +4612,7 @@
public object DeltetMouldProdBackBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4689,7 +4689,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdBackBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdBackBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4777,7 +4777,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4808,11 +4808,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
}
else
{
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
}
@@ -4912,7 +4912,8 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, true, msg4))
+ //妯″潡鍚嶏紝鍐欏叆鏃ュ織锛屾姤閿欐锛岀敤鎴峰悕
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5036,6 +5037,44 @@
}
#endregion
+ //鍒ゆ柇鐢ㄦ埛鏉冮檺
+ #region
+ [Route("Sc_MouldProdOutBill/QueryUserRight")]
+ [HttpPost]
+ public object QueryUserRight(string UserName)
+ {
+ try
+ {
+ //妯″潡鍚嶏紝鍐欏叆鏃ュ織锛屾姤閿欐锛岀敤鎴峰悕
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, false, UserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏈夋潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch(Exception e1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺锛�" + e1.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region [妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
@@ -5046,7 +5085,7 @@
public object DeltetMouldProdOutBill(string HInterID, string user)
{
//鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5120,10 +5159,9 @@
[Route("Sc_MouldProdOutBill/AuditMouldProdOutBill")]
[HttpGet]
public object AuditMouldProdOutBill(string HInterID, string user, int flag)
- {
- //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ {
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5459,7 +5497,7 @@
public object DeltetMouldLifeChangeBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/Sc_MouldRepairOutBillController.cs
index 6aca692..317fd77 100644
--- a/WebAPI/Controllers/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairOutBillController.cs
@@ -329,7 +329,7 @@
public object DeltetMouldRepairOutBill(string HInterID)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 99cf3b4..d7ff4ba 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -230,7 +230,7 @@
try
{
//鍒ゆ柇鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -294,7 +294,7 @@
try
{
//鍒ゆ柇鏄惁鏈夊鏍告潈闄�
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 8a045aa..658fac7 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1307,7 +1307,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1410,7 +1410,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 3594e18..e4d5592 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1476,7 +1476,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
index c628f55..6877909 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
@@ -76,7 +76,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -170,7 +170,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -277,7 +277,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -459,7 +459,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -638,7 +638,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index 23443e6..1a41434 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -57,7 +57,7 @@
public object set_DeleteBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -151,7 +151,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -258,7 +258,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -442,7 +442,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -621,7 +621,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
index 11b7e70..8791f60 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
@@ -29,7 +29,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_DotCheck", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_DotCheck", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -74,7 +74,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_DotCheck", 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log("Gy_DotCheck", 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -167,7 +167,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_DotCheck", 1, true, msg4))
+ if (!ClsPub.Security_Log("Gy_DotCheck", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -257,7 +257,7 @@
bool HEndFlag = list[0].HEndFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_DotCheck", 1, true, msg3))
+ if (!ClsPub.Security_Log("Gy_DotCheck", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainBillController.cs"
index 8caf2b0..ad93445 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainBillController.cs"
@@ -28,7 +28,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Maintain", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_Maintain", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -73,7 +73,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Maintain_Delete", 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log("Gy_Maintain_Delete", 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -166,7 +166,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_Maintain_Edit", 1, true, msg4))
+ if (!ClsPub.Security_Log("Gy_Maintain_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -257,7 +257,7 @@
int HParentID = list[0].HParentID;
//鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log("Gy_Maintain_Edit", 1, true, msg3))
+ //if (!ClsPub.Security_Log("Gy_Maintain_Edit", 1, false, msg3))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
index 6bbfbd7..3679e58 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
@@ -28,7 +28,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Repair", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_Repair", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -73,7 +73,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Repair_Delete", 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log("Gy_Repair_Delete", 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -166,7 +166,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_Repair_Edit", 1, true, msg4))
+ if (!ClsPub.Security_Log("Gy_Repair_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -256,7 +256,7 @@
bool HEndFlag = list[0].HEndFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_Repair_Edit", 1, true, msg3))
+ if (!ClsPub.Security_Log("Gy_Repair_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckBillController.cs"
index dd261ca..60bffa4 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckBillController.cs"
@@ -28,7 +28,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_RepairCheck", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_RepairCheck", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -73,7 +73,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_RepairCheck_Delete", 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log("Gy_RepairCheck_Delete", 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -166,7 +166,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_RepairCheck_Edit", 1, true, msg4))
+ if (!ClsPub.Security_Log("Gy_RepairCheck_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -256,7 +256,7 @@
bool HEndFlag = list[0].HEndFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_RepairCheck_Edit", 1, true, msg3))
+ if (!ClsPub.Security_Log("Gy_RepairCheck_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index e7c4cb2..d1a3ca7 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -418,7 +418,7 @@
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -479,7 +479,7 @@
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -525,7 +525,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
+ " values('3832','3832'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
@@ -542,7 +542,7 @@
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -588,7 +588,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
+ " values('3802','3802'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
@@ -598,13 +598,13 @@
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",'1548785'," + dr["HNowSupID"].ToString() + ",0,0"
+ ",0,0,0," + userID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -650,9 +650,9 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
+ " values('3803','3803'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
@@ -660,14 +660,14 @@
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + ","+ dr["HNowSupID"].ToString() + ",0,0"
+ ",0,0,0," + userID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
index ac1f82d..36551eb 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
@@ -83,7 +83,7 @@
DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
try
{
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -251,7 +251,7 @@
long HGroupID = list[0].HGroupID;
//鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
index fc43e58..0e62675 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
@@ -138,7 +138,7 @@
try
{
////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, true, msg4))
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
index e2fd0b2..8cff81a 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
@@ -140,7 +140,7 @@
try
{
////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, true, msg4))
+ //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
index 4a7bfe7..5324816 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
@@ -140,7 +140,7 @@
try
{
////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, true, msg4))
+ //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
index 587d53e..42f6c0b 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
@@ -140,7 +140,7 @@
try
{
////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, true, msg4))
+ //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index a318f68..6aa7eb7 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -103,7 +103,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -190,7 +190,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -374,7 +374,7 @@
string refSav = sArray[2].ToString();
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -627,7 +627,7 @@
{
try
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ProcessReportSub with (nolock)" + sWhere, "Sc_ProcessReportSub");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadCount),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ProcessReportSub with (nolock)" + sWhere, "Sc_ProcessReportSub");
if (ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
@@ -845,7 +845,7 @@
{
string StrMessage = "";
//瀹℃牳鏉冮檺
- if (!WebClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName, ref StrMessage))
+ if (!WebClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName, ref StrMessage))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs"
index 51555cb..d40c8e1 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESEndStepWorkBillController.cs"
@@ -200,7 +200,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -287,7 +287,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -432,7 +432,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs"
index 17f5d92..f3465ea 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs"
@@ -101,7 +101,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -188,7 +188,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -330,7 +330,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
index 8c37d68..ce63243 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
@@ -192,7 +192,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -280,7 +280,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -423,7 +423,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs"
index ef6f03f..59f5c29 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs"
@@ -146,7 +146,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -419,7 +419,7 @@
string refSav = sArray[2].ToString();
//淇濆瓨鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -645,7 +645,7 @@
try
{
//瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs"
index 5748e4a..fd749ec 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_QualityReportStepBillController.cs"
@@ -262,7 +262,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -385,7 +385,7 @@
{
oCN1.BeginTran();
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Check", 1, true, HChecker))
+ if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Check", 1, false, HChecker))
{
oCN1.RollBack();
objJsonResult.code = "0";
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 933decb..b756254 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -262,7 +262,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -385,7 +385,7 @@
{
oCN1.BeginTran();
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Check", 1, true, HChecker))
+ if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Check", 1, false, HChecker))
{
oCN1.RollBack();
objJsonResult.code = "0";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0082ea0..19ea836 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/16/2022 19:15:16</publishTime>
+ <publishTime>01/16/2022 20:47:46</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/16/2022 19:15:16</publishTime>
+ <publishTime>01/16/2022 20:47:46</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/16/2022 19:15:15</publishTime>
+ <publishTime>01/16/2022 20:47:45</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/16/2022 19:15:15</publishTime>
+ <publishTime>01/16/2022 20:47:45</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/16/2022 19:15:13</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/16/2022 19:15:13</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
<publishTime>05/09/2021 01:08:30</publishTime>
@@ -51,7 +51,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>12/24/2021 14:39:37</publishTime>
+ <publishTime>01/16/2022 20:46:27</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -69,13 +69,13 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/16/2022 19:15:14</publishTime>
+ <publishTime>01/16/2022 20:47:44</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/16/2022 19:15:14</publishTime>
+ <publishTime>01/16/2022 20:47:44</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -105,22 +105,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/16/2022 19:15:12</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/16/2022 19:15:12</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/16/2022 19:15:13</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/16/2022 19:15:13</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/16/2022 19:15:13</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/16/2022 19:15:13</publishTime>
+ <publishTime>01/16/2022 20:47:43</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,7 +189,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -222,181 +222,181 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/16/2022 19:15:18</publishTime>
+ <publishTime>01/16/2022 23:04:03</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/16/2022 19:15:18</publishTime>
+ <publishTime>01/16/2022 23:04:03</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
+ <publishTime>11/29/2018 21:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
+ <publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Index.html">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/12/2022 20:38:18</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>12/24/2021 14:39:38</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>01/13/2022 20:06:45</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/16/2022 19:15:24</publishTime>
+ <publishTime>01/16/2022 23:04:14</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs
index 92648ff..4f8006d 100644
--- a/WebAPI/Properties/Settings.Designer.cs
+++ b/WebAPI/Properties/Settings.Designer.cs
@@ -26,7 +26,7 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
- [global::System.Configuration.DefaultSettingValueAttribute("http://localhost:8021/webservice/WebService1.asmx")]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS-WMS/WebService1.asmx")]
public string WebAPI_WebS_WebService1 {
get {
return ((string)(this["WebAPI_WebS_WebService1"]));
diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings
index 7f5adba..e0334fe 100644
--- a/WebAPI/Properties/Settings.settings
+++ b/WebAPI/Properties/Settings.settings
@@ -3,7 +3,7 @@
<Profiles />
<Settings>
<Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
- <Value Profile="(Default)">http://localhost:8021/webservice/WebService1.asmx</Value>
+ <Value Profile="(Default)">http://localhost/WEBS-WMS/WebService1.asmx</Value>
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map
index b44e0fd..d3cb9d0 100644
--- a/WebAPI/Web References/WebS/Reference.map
+++ b/WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Results>
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:8021/webservice/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:8021/webservice/WebService1.asmx?disco" filename="WebService1.disco" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
</Results>
</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco
index c0333e8..22b350a 100644
--- a/WebAPI/Web References/WebS/WebService1.disco
+++ b/WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
- <contractRef ref="http://localhost:8021/webservice/WebService1.asmx?wsdl" docRef="http://localhost:8021/webservice/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
- <soap address="http://localhost:8021/webservice/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
- <soap address="http://localhost:8021/webservice/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <contractRef ref="http://localhost/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://localhost/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+ <soap address="http://localhost/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <soap address="http://localhost/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index 63602b1..adcf90c 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -24418,10 +24418,10 @@
</wsdl:binding>
<wsdl:service name="WebService1">
<wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
- <soap:address location="http://localhost:8021/webservice/WebService1.asmx" />
+ <soap:address location="http://localhost/WEBS-WMS/WebService1.asmx" />
</wsdl:port>
<wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
- <soap12:address location="http://localhost:8021/webservice/WebService1.asmx" />
+ <soap12:address location="http://localhost/WEBS-WMS/WebService1.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index d2f47b3..254f457 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -86,7 +86,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost:8021/webservice/WebService1.asmx</value>
+ <value>http://localhost/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 68e02bb..8b72bc5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -197,6 +197,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
+ <Content Include="bin\WebAPI.dll" />
+ <Content Include="bin\WebAPI.pdb" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\Site.css" />
@@ -679,6 +681,7 @@
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
+ <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -754,6 +757,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="obj\x86\Debug\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_RoutingGroup\" />
--
Gitblit v1.9.1