From fd56fa51fe25f26ce5b518c6f3afb81fbc19553a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 25 七月 2022 17:04:53 +0800
Subject: [PATCH] 盘点
---
NETERPNoWin/公用/MESMain.Designer.cs | 134
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
Kanban/Kanban.csproj | 30
Kanban/Sc_CJKB.cs | 511 +++++
WarM/报表分析/Sc_CJKB.cs | 159 +
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 1
WarM/条码打印/Gy_BarCodeBill.cs | 28
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
WorkM/报表分析/Mes_OrderProcFlowAllReport.cs | 36
BLL/系统管理/Xt_SystemParameter.cs | 9
NETERPNoWin/公用/ClsShowMod.cs | 18
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
Kanban/Sc_CJKB.designer.cs | 286 +++
Kanban/Sc_QLKB.resx | 156 +
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 82
WorkM/报表分析/Mes_OrderProcFlowAllReport.designer.cs | 8
WebAPI/Controllers/SCGL/日计划管理/DataHelper.cs | 171 +
Kanban/Sc_QLKB.designer.cs | 286 +++
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache | 0
WebAPI/Controllers/WebAPIController.cs | 3
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
BLL/Xt_SystemParameterForOrg.resx | 123 +
Kanban/Sc_CGKB.resx | 156 +
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/公用/MESMain.cs | 26
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 854 +++++++++
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 31
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
WebAPI/WebAPI.csproj | 1
Kanban/Sc_CGKB.cs | 509 +++++
.gitignore | 7
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
BLL/Xt_SystemParameterForOrg.cs | 160 +
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
BLL/Xt_SystemParameterForOrg.Designer.cs | 292 +++
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache | 2
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 55
BLL/BLL.csproj | 9
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
Kanban/Sc_QLKB.cs | 530 ++++++
NETERPNoWin/Frm_MESSetIni.cs | 5
WarM/WarM.csproj | 30
NETERPNoWin/Frm_MESSetIni.Designer.cs | 71
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
NETERPNoWin/bin/x86/Debug.zip | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8
NETERPNoWin/bin/x86/Debug/stdole.dll | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
Kanban/Sc_CJKB.resx | 156 +
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0
Kanban/Sc_CGKB.designer.cs | 286 +++
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs | 2
NETERPNoWin/bin/x86/Debug/HXERP.ini | 4
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
74 files changed, 4,935 insertions(+), 302 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4ced4f7..ce42008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@
/WorkM/obj/Release
/WorkM/obj/x86/Debug
/WorkM/obj/x86/Release
-/WebAPI/Sc_MouldProdInBill/Log
-/WebAPI/Sc_MouldProdOutBill/Log
-/WebAPI/Vlog
+/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
+/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+/NETERPNoWin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+/NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj
index 1be3219..570128b 100644
--- a/BLL/BLL.csproj
+++ b/BLL/BLL.csproj
@@ -106,6 +106,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="Xt_SystemParameterForOrg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Xt_SystemParameterForOrg.Designer.cs">
+ <DependentUpon>Xt_SystemParameterForOrg.cs</DependentUpon>
+ </Compile>
<Compile Include="绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByOrgRelation.cs">
<SubType>Form</SubType>
</Compile>
@@ -431,6 +437,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <EmbeddedResource Include="Xt_SystemParameterForOrg.resx">
+ <DependentUpon>Xt_SystemParameterForOrg.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="鍏敤妯″潡\AboutBox1.resx">
<SubType>Designer</SubType>
<DependentUpon>AboutBox1.cs</DependentUpon>
diff --git a/BLL/Xt_SystemParameterForOrg.Designer.cs b/BLL/Xt_SystemParameterForOrg.Designer.cs
new file mode 100644
index 0000000..b0e3f7e
--- /dev/null
+++ b/BLL/Xt_SystemParameterForOrg.Designer.cs
@@ -0,0 +1,292 @@
+锘�
+namespace BLL
+{
+ partial class Xt_SystemParameterForOrg
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.txtHFarmat = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txtHExplanation = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtHValue = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHCaption = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtHKey = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.cmdCancel = new System.Windows.Forms.Button();
+ this.cmdOK = new System.Windows.Forms.Button();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.groupBox4.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(734, 63);
+ this.groupBox1.TabIndex = 0;
+ this.groupBox1.TabStop = false;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.Location = new System.Drawing.Point(241, 21);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(235, 24);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "鎸夌粍缁囪缃郴缁熷弬鏁�";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.txtHFarmat);
+ this.groupBox2.Controls.Add(this.label6);
+ this.groupBox2.Controls.Add(this.txtHExplanation);
+ this.groupBox2.Controls.Add(this.label5);
+ this.groupBox2.Controls.Add(this.txtHValue);
+ this.groupBox2.Controls.Add(this.label4);
+ this.groupBox2.Controls.Add(this.txtHCaption);
+ this.groupBox2.Controls.Add(this.label3);
+ this.groupBox2.Controls.Add(this.txtHKey);
+ this.groupBox2.Controls.Add(this.label2);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox2.Location = new System.Drawing.Point(0, 63);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(734, 155);
+ this.groupBox2.TabIndex = 1;
+ this.groupBox2.TabStop = false;
+ //
+ // txtHFarmat
+ //
+ this.txtHFarmat.Location = new System.Drawing.Point(93, 113);
+ this.txtHFarmat.Name = "txtHFarmat";
+ this.txtHFarmat.ReadOnly = true;
+ this.txtHFarmat.Size = new System.Drawing.Size(629, 25);
+ this.txtHFarmat.TabIndex = 9;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(21, 118);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.TabIndex = 8;
+ this.label6.Text = "鏍煎紡鑼冧緥";
+ //
+ // txtHExplanation
+ //
+ this.txtHExplanation.Location = new System.Drawing.Point(93, 82);
+ this.txtHExplanation.Name = "txtHExplanation";
+ this.txtHExplanation.ReadOnly = true;
+ this.txtHExplanation.Size = new System.Drawing.Size(629, 25);
+ this.txtHExplanation.TabIndex = 7;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(21, 87);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(53, 15);
+ this.label5.TabIndex = 6;
+ this.label5.Text = "鎻� 杩�";
+ //
+ // txtHValue
+ //
+ this.txtHValue.Location = new System.Drawing.Point(444, 51);
+ this.txtHValue.Name = "txtHValue";
+ this.txtHValue.ReadOnly = true;
+ this.txtHValue.Size = new System.Drawing.Size(278, 25);
+ this.txtHValue.TabIndex = 5;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(390, 56);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(30, 15);
+ this.label4.TabIndex = 4;
+ this.label4.Text = "鍊� ";
+ //
+ // txtHCaption
+ //
+ this.txtHCaption.Location = new System.Drawing.Point(93, 51);
+ this.txtHCaption.Name = "txtHCaption";
+ this.txtHCaption.ReadOnly = true;
+ this.txtHCaption.Size = new System.Drawing.Size(278, 25);
+ this.txtHCaption.TabIndex = 3;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(21, 56);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(53, 15);
+ this.label3.TabIndex = 2;
+ this.label3.Text = "鍚� 绉�";
+ //
+ // txtHKey
+ //
+ this.txtHKey.Location = new System.Drawing.Point(93, 20);
+ this.txtHKey.Name = "txtHKey";
+ this.txtHKey.ReadOnly = true;
+ this.txtHKey.Size = new System.Drawing.Size(278, 25);
+ this.txtHKey.TabIndex = 1;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(21, 25);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(52, 15);
+ this.label2.TabIndex = 0;
+ this.label2.Text = "鍏抽敭鍊�";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.grdMain);
+ this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox3.Location = new System.Drawing.Point(0, 218);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(734, 326);
+ this.groupBox3.TabIndex = 2;
+ this.groupBox3.TabStop = false;
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.Location = new System.Drawing.Point(3, 21);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(728, 302);
+ this.grdMain.TabIndex = 20;
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Interval = 500;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.cmdCancel);
+ this.groupBox4.Controls.Add(this.cmdOK);
+ this.groupBox4.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.groupBox4.Location = new System.Drawing.Point(0, 544);
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.Size = new System.Drawing.Size(734, 79);
+ this.groupBox4.TabIndex = 3;
+ this.groupBox4.TabStop = false;
+ //
+ // cmdCancel
+ //
+ this.cmdCancel.Location = new System.Drawing.Point(575, 24);
+ this.cmdCancel.Name = "cmdCancel";
+ this.cmdCancel.Size = new System.Drawing.Size(115, 42);
+ this.cmdCancel.TabIndex = 1;
+ this.cmdCancel.Text = "鍙� 娑�";
+ this.cmdCancel.UseVisualStyleBackColor = true;
+ this.cmdCancel.Click += new System.EventHandler(this.cmdCancel_Click);
+ //
+ // cmdOK
+ //
+ this.cmdOK.Location = new System.Drawing.Point(421, 24);
+ this.cmdOK.Name = "cmdOK";
+ this.cmdOK.Size = new System.Drawing.Size(115, 42);
+ this.cmdOK.TabIndex = 0;
+ this.cmdOK.Text = "淇� 瀛�";
+ this.cmdOK.UseVisualStyleBackColor = true;
+ this.cmdOK.Click += new System.EventHandler(this.cmdOK_Click);
+ //
+ // Xt_SystemParameterForOrg
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(734, 623);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Name = "Xt_SystemParameterForOrg";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "鎸夌粍缁囪缃郴缁熷弬鏁�";
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.groupBox4.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TextBox txtHCaption;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox txtHKey;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.GroupBox groupBox3;
+ private System.Windows.Forms.TextBox txtHExplanation;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox txtHValue;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox txtHFarmat;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.GroupBox groupBox4;
+ private System.Windows.Forms.Button cmdCancel;
+ private System.Windows.Forms.Button cmdOK;
+ }
+}
\ No newline at end of file
diff --git a/BLL/Xt_SystemParameterForOrg.cs b/BLL/Xt_SystemParameterForOrg.cs
new file mode 100644
index 0000000..b010678
--- /dev/null
+++ b/BLL/Xt_SystemParameterForOrg.cs
@@ -0,0 +1,160 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BLL
+{
+ public partial class Xt_SystemParameterForOrg : Form
+ {
+ public Xt_SystemParameterForOrg()
+ {
+ InitializeComponent();
+ }
+
+ public const int HInterIDCol = 0;
+ public const int HKeyCol = 1;
+ public const int HOrgIDCol = 2;
+ public const int HOrgNumberCol = 3;
+ public const int HOrgNameCol = 4;
+ public const int HValueCol = 5;
+ public string sHKey;
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ initGrid();
+ Display();
+ }
+
+ private void initGrid()
+ {
+ //
+ grdMain.ColumnCount = 6; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ //=
+ grdMain.Columns[HOrgNumberCol].HeaderText = "缁勭粐浠ｇ爜";
+ grdMain.Columns[HOrgNameCol].HeaderText = "缁勭粐鍚嶇О";
+ grdMain.Columns[HValueCol].HeaderText = "鍙傛暟鍊�";
+ ////鍥哄畾璧嬪��=====================================================
+ //=============================================================================
+ //鏍煎紡鍖�
+
+ //璁剧疆 鎵嬪伐闅愯棌
+ DBUtility.ClsPub.HideGridView(grdMain, Name, DBUtility.ClsPub.AppPath);//璁剧疆闅愯棌鍒�
+ ////闅愯棌鍒�
+ grdMain.Columns[HInterIDCol].Visible = false;
+ grdMain.Columns[HKeyCol].Visible = false;
+ grdMain.Columns[HOrgIDCol].Visible = false;
+ //闅愯棌婧愬崟淇℃伅
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HValueCol.ToString() ;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = "";
+ //鏍煎紡鍖栫綉鏍�
+ //DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+ }
+
+ private void Display()
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ try
+ {
+ //鏍规嵁 HKEY 鏉ヨ幏鍙� 鐜版湁淇℃伅
+ DataSet ds = oCn.RunProcReturn("exec h_p_Xt_SystemParameter_GetValue '" + sHKey + "'", "h_p_Xt_SystemParameter_GetValue");
+ if(ds==null)
+ {
+ MessageBox.Show("璇诲彇澶辫触1锛佹病鏈夎繑鍥炰换浣曟暟鎹紒");
+ return;
+ }
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ //鏄剧ず鍒� 琛ㄥご
+ txtHKey.Text = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HKey"]);
+ txtHCaption.Text = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCaption"]);
+ txtHValue.Text = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMainValue"]);
+ txtHExplanation.Text = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HExplanation"]);
+ txtHFarmat.Text = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HFarmat"]);
+ }
+ else
+ {
+ MessageBox.Show("璇诲彇澶辫触2锛佹病鏈夎繑鍥炰换浣曟暟鎹紒");
+ return;
+ }
+ //鏄剧ず鍒� 琛ㄤ綋
+ grdMain.RowCount = ds.Tables[0].Rows.Count;
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (i >= grdMain.RowCount - 1)
+ grdMain.Rows.Add();
+ //鍗曟嵁鍥哄畾璧嬪��
+ grdMain.Rows[i].Cells[HInterIDCol].Value = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HInterID"]);
+ grdMain.Rows[i].Cells[HKeyCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HKey"]);
+ grdMain.Rows[i].Cells[HOrgIDCol].Value = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HOrgID"]);
+ grdMain.Rows[i].Cells[HOrgNumberCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HOrgNumber"]);
+ grdMain.Rows[i].Cells[HOrgNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HOrgName"]);
+ grdMain.Rows[i].Cells[HValueCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HValue"]);
+ }
+ }
+ catch(Exception e1)
+ {
+ MessageBox.Show("璇诲彇澶辫触锛�" + e1.Message);
+
+ }
+
+ }
+
+ private void cmdCancel_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ this.Close();
+ }
+
+ private void cmdOK_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍓嶅垽鏂�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ try
+ {
+ //娓呴櫎 瀛愯〃淇℃伅
+ oCn.RunProc(" delete from Xt_SystemParameterSub Where HKey= '" + sHKey + "'");
+ //寰幆鍐欏叆瀛愯〃
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HValueCol].Value).ToString() !="" &&
+ DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HKeyCol].Value).ToString() !="")
+ {
+ oCn.RunProc(" insert into Xt_SystemParameterSub (HInterID,HValue,HKey,HOrgID) " +
+ " values( " +
+ " " + DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HInterIDCol].Value).ToString() + " " +
+ ", '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HValueCol].Value).ToString() + "' " +
+ ", '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HKeyCol].Value).ToString() + "' " +
+ ", " + DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HOrgIDCol].Value).ToString() + " " +
+ ") ");
+ }
+ }
+ MessageBox.Show("淇濆瓨瀹屾瘯锛�");
+ }
+ catch(Exception e1)
+ {
+ MessageBox.Show("淇濆瓨澶辫触锛�"+ e1.Message);
+
+ }
+ }
+
+ private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ int i = grdMain.CurrentCell.ColumnIndex;
+ if (i == HKeyCol || i == HOrgNumberCol || i == HOrgNameCol)
+ {
+ e.Cancel = true;
+ }
+ }
+ }
+}
diff --git a/BLL/Xt_SystemParameterForOrg.resx b/BLL/Xt_SystemParameterForOrg.resx
new file mode 100644
index 0000000..1f666f2
--- /dev/null
+++ b/BLL/Xt_SystemParameterForOrg.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <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=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>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.cs"
index 9c422ab..49b04f5 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.cs"
@@ -566,12 +566,13 @@
private void org_Click(object sender, EventArgs e)
{
+ Xt_SystemParameterForOrg oXt_SystemParameterForOrg = new Xt_SystemParameterForOrg();
if (DBUtility.Gy_BaseFun.AllowRow(grdMain))
{
- //鏍规嵁閫変腑琛屾樉绀� 鎸夌粍缁囩殑 绯荤粺鍙傛暟娓呭崟
-
-
-
+ //鑾峰彇閫変腑琛岀殑 HKEY
+ string sKey = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("鍏抽敭鐮�")].Value);
+ oXt_SystemParameterForOrg.sHKey = sKey;
+ oXt_SystemParameterForOrg.ShowDialog();
}
}
}
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index 3cdaf15..0a2655c 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -98,11 +98,29 @@
<Compile Include="LED\Sc_LEDInfoNote.designer.cs">
<DependentUpon>Sc_LEDInfoNote.cs</DependentUpon>
</Compile>
+ <Compile Include="Sc_CGKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_CGKB.designer.cs">
+ <DependentUpon>Sc_CGKB.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Sc_CJKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_CJKB.designer.cs">
+ <DependentUpon>Sc_CJKB.cs</DependentUpon>
+ </Compile>
<Compile Include="Sc_ProductionLineKB.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Sc_ProductionLineKB.designer.cs">
<DependentUpon>Sc_ProductionLineKB.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Sc_QLKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_QLKB.designer.cs">
+ <DependentUpon>Sc_QLKB.cs</DependentUpon>
</Compile>
<Compile Include="Sc_WorkshopKB.cs">
<SubType>Form</SubType>
@@ -324,10 +342,22 @@
<DependentUpon>Sc_LEDInfoNote.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Sc_CGKB.resx">
+ <DependentUpon>Sc_CGKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Sc_CJKB.resx">
+ <DependentUpon>Sc_CJKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Sc_ProductionLineKB.resx">
<DependentUpon>Sc_ProductionLineKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Sc_QLKB.resx">
+ <DependentUpon>Sc_QLKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Sc_WorkshopKB.resx">
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git a/Kanban/Sc_CGKB.cs b/Kanban/Sc_CGKB.cs
new file mode 100644
index 0000000..577a23a
--- /dev/null
+++ b/Kanban/Sc_CGKB.cs
@@ -0,0 +1,509 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using SQLHelper;
+using DBUtility;
+using Pub_Class;
+
+namespace Kanban
+{
+ public partial class Sc_CGKB : Form
+ {
+ public Sc_CGKB()
+ {
+ InitializeComponent();
+ }
+ public DBUtility.frmBillQueryCondition_New frmCondition;
+ public string ViewName = "h_v_Sc_CGKB";
+ public string ModCaption = "閲囪喘鐪嬫澘";
+ public const string ModName = "3702";
+ public const string ModRightName = "Sc_CGKB";
+ public const string ModRightNameEdit = ModRightName + "_Edit";
+ public const string ModRightNameCheck = ModRightName + "_Check";
+ public const string ModRightNameClose = ModRightName + "_Close";
+ public const string ModRightNameDelete = ModRightName + "_Delete";
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ public string sDeptID = "0";
+ DataSet DSet;
+
+ int FY = 29;
+ //
+ private void initGrid()
+ {
+ //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ //鍒楁爣棰�
+ //grdMain.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionBackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //grdMain.ColumnHeadersHeight = 40;
+ //grdMain.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ ////濂囨暟琛�
+ //grdMain.AlternatingRowsDefaultCellStyle.BackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionForeColor = Color.White;
+ ////缃戞牸鑳屾櫙鑹�
+ //grdMain.BackgroundColor = Color.FromArgb(104, 97, 118);
+ ////鍒楁爣棰樿竟妗嗘牱寮�
+ //grdMain.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; ;
+ ////鏍囬鏍峰紡鏄惁浣跨敤鐢ㄦ埛褰撳墠涓婚鐨勬牱寮�
+ //grdMain.EnableHeadersVisualStyles = false;
+ ////闅愯棌琛屾爣棰�
+ //grdMain.RowHeadersVisible = false;
+ ////鍗曞厓鏍�
+ //grdMain.RowsDefaultCellStyle.BackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //--------------------
+ DBUtility.Xt_BaseBillFun.initKanBan(this.Name, grdMain, Tool, toolStripLabel1, null, ref FY, timer2, timer3);
+ }
+ //
+
+ private void Display()
+ {
+ try
+ {
+ ClsCN SubCn = new ClsCN();
+ string sSql = "";
+ string sWhere = "";
+ //杩囨护鏉′欢
+ //if (frmCondition.SqlStr.Trim().Length == 0)
+ // return;
+ //sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
+ sSql = "exec h_p_CGKB ";
+ //
+ DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //閲婃斁鍐荤粨
+ DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
+ //
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //
+
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ //int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ //int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ //int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ // }
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = "";
+ sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ string[] sT;
+ sT = sTotalCol.Split(Convert.ToChar(","));
+ oSumGrid.BuildTotalCols(sT);
+ //
+ //鍐荤粨
+ int FrCol = 10;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ //鐢荤嚎
+ //GraphLine();
+
+ //Total();
+
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (i % 2 == 0)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ // }
+ // else
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ // }
+ //}
+ //
+ }
+ catch (Exception e)
+ {
+ return;
+ }
+ }
+ //
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled=false;
+ initGrid();
+ Display();
+ }
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ this.Close();
+ }
+
+ private void sx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ private void dj_Click(object sender, EventArgs e)
+ {
+ Sub_ShowBill();
+ }
+ //鏄剧ず鍗曟嵁
+ private void Sub_ShowBill()
+ {
+
+ }
+ //
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+ //
+ private void Sc_CGKB_Load(object sender, EventArgs e)
+ {
+ //
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ //lblCaption.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ initGrid();
+
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ if (sID == "娌℃湁鎵惧埌锛�")
+ {
+ sDeptID = "0";
+ }
+ else
+ {
+ sDeptID = sID;
+ }
+ }
+
+ private void grdMain_DblClick(object sender, EventArgs e)
+ {
+ //Sc_WorkBillProcReportKB o = new Sc_WorkBillProcReportKB();
+ //if(grdMain.CurrentRow==null)
+ // return;
+ //o.sICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
+ //o.sDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HDeptID")].Value);
+ //o.ShowDialog();
+ }
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
+
+ private void xz_Click(object sender, EventArgs e)
+ {
+ //
+ }
+
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Sub_DeleteBill();
+ }
+ //鍒犻櫎
+ private void Sub_DeleteBill()
+ {
+
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ //timer2.Enabled = false;
+ //frmCondition = new frmBillQueryCondition_New();
+ //SetCondition(frmCondition, ViewName, this.Name);
+ //frmCondition.ShowDialog();
+ //if (frmCondition.Tag.ToString() == "OK")
+ //{
+ //timer1.Enabled = true;
+ //}
+
+ if (DSet != null && DSet.Tables[0].Rows.Count > FY)
+ {
+ for (int y = 0; y < FY; y++)
+ {
+ DataRow newRow = DSet.Tables[0].NewRow();
+ //鐢ㄧ浉搴斿�煎～鍐欐暟鎹
+ for (int m = 0; m < DSet.Tables[0].Columns.Count; m++)
+ {
+ newRow[m] = DSet.Tables[0].Rows[0][m];
+ }
+ //濉啓瀹屾瘯锛屽皢鏁版嵁琛屾坊鍔犲埌鏁版嵁闆�
+ DSet.Tables[0].Rows.Add(newRow);
+
+ DSet.Tables[0].Rows.Remove(DSet.Tables[0].Rows[0]);
+ }
+
+ grdMain.DataSource = null;
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+
+
+ ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
+ //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
+ //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 0)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Red;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) < 7)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Orange;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) >= 7 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 14)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Yellow;
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.ForeColor = Color.Black;
+ // }
+ // //================= //------------鏈笅鍗� 澶т簬0 鏄剧ず绾㈣壊
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HSumUnDownQtyCol].Value) > 0)
+ // {
+ // grdMain.Rows[i].Cells[HSumUnDownQtyCol].Style.BackColor = Color.Red;
+ // }
+ //}
+
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, "", 0);
+ }
+ }
+
+
+
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+ //
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ //鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+ //瀹℃牳
+ private void sh_Click(object sender, EventArgs e)
+ {
+ this.Sub_CheckBill();
+ }
+
+ //瀹℃牳鍗曟嵁
+ private void Sub_CheckBill()
+ {
+
+ }
+ //鍙嶅鍗曟嵁
+ private void Sub_AbandonCheck()
+ {
+
+ }
+ //鍙嶅鏍�
+ private void qsh_Click(object sender, EventArgs e)
+ {
+ Sub_AbandonCheck();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(true);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("HMaterID"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!锛�" + e.Message);
+ }
+ }
+
+ #endregion
+ //
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount>0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+ //寮曞嚭EXCEL
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+ int HQty = 0;
+ private void timer3_Tick(object sender, EventArgs e)
+ {
+ if (HQty < 10)
+ {
+ HQty = HQty + 1;
+ }
+ else
+ {
+ HQty = 0;
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton1_Click(object sender, EventArgs e)
+ {
+ if (toolStripButton1.Text == "鏆傚仠")
+ {
+ toolStripButton1.Text = "杩愯";
+ timer2.Enabled = false;
+ }
+ else
+ {
+ toolStripButton1.Text = "鏆傚仠";
+ timer2.Enabled = true;
+ }
+ }
+
+ private void txtHMaterID_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ //Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ //oSZ.HName = this.Name;
+ //oSZ.ShowDialog();
+
+ //timer1.Enabled = true;
+
+
+ Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ oSZ.HName = this.Name;
+ oSZ.ShowDialog();
+ timer1.Enabled = true;
+ }
+
+ private void grdMain_Sorted(object sender, EventArgs e)
+ {
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ DateTime oNow = DateTime.Today.Date;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ }
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ }
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/Kanban/Sc_CGKB.designer.cs b/Kanban/Sc_CGKB.designer.cs
new file mode 100644
index 0000000..baedabc
--- /dev/null
+++ b/Kanban/Sc_CGKB.designer.cs
@@ -0,0 +1,286 @@
+锘縩amespace Kanban
+{
+ partial class Sc_CGKB
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_CGKB));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackColor = System.Drawing.Color.Black;
+ 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.tc,
+ this.toolStripButton1,
+ this.toolStripButton2,
+ this.toolStripSeparator3,
+ this.toolStripSeparator9,
+ this.toolStripSeparator7,
+ this.toolStripLabel1});
+ 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(906, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tc.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.tc.ForeColor = System.Drawing.Color.White;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(50, 47);
+ this.tc.Text = "<杩斿洖";
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.AutoSize = false;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton1.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(50, 47);
+ this.toolStripButton1.Text = "鏆傚仠";
+ this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // toolStripButton2
+ //
+ this.toolStripButton2.AutoSize = false;
+ this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton2.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(36, 47);
+ this.toolStripButton2.Text = "璁剧疆";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.toolStripLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripLabel1.Font = new System.Drawing.Font("Microsoft YaHei UI", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripLabel1.ForeColor = System.Drawing.Color.White;
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(92, 47);
+ this.toolStripLabel1.Text = "閲囪喘鐪嬫澘";
+ this.toolStripLabel1.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 20000;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 8;
+ this.grdPrint.Visible = false;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
+ 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(906, 19);
+ this.grdSum.TabIndex = 47;
+ this.grdSum.Visible = false;
+ //
+ // timer3
+ //
+ this.timer3.Enabled = true;
+ this.timer3.Interval = 1800000;
+ this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.grdMain.BackgroundColor = System.Drawing.Color.Black;
+ this.grdMain.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.grdMain.ColumnHeadersHeight = 40;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.EnableHeadersVisualStyles = false;
+ this.grdMain.Location = new System.Drawing.Point(0, 50);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.CornflowerBlue;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ this.grdMain.RowHeadersVisible = false;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.RowsDefaultCellStyle = dataGridViewCellStyle4;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.grdMain.Size = new System.Drawing.Size(906, 462);
+ this.grdMain.TabIndex = 48;
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Sorted += new System.EventHandler(this.grdMain_Sorted);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
+ //
+ // Sc_CGKB
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(906, 531);
+ this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Name = "Sc_CGKB";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "鍗曟嵁鍒楄〃";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Sc_CGKB_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.DataGridView grdMain;
+ }
+}
\ No newline at end of file
diff --git a/Kanban/Sc_CGKB.resx b/Kanban/Sc_CGKB.resx
new file mode 100644
index 0000000..de4031c
--- /dev/null
+++ b/Kanban/Sc_CGKB.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>191, 16</value>
+ </metadata>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>281, 16</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/Kanban/Sc_CJKB.cs b/Kanban/Sc_CJKB.cs
new file mode 100644
index 0000000..cbc910c
--- /dev/null
+++ b/Kanban/Sc_CJKB.cs
@@ -0,0 +1,511 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using SQLHelper;
+using DBUtility;
+using Pub_Class;
+
+namespace Kanban
+{
+ public partial class Sc_CJKB : Form
+ {
+ public Sc_CJKB()
+ {
+ InitializeComponent();
+ }
+ public DBUtility.frmBillQueryCondition_New frmCondition;
+ public string ViewName = "h_v_Sc_CJKB";
+ public string ModCaption = "杞﹂棿鐪嬫澘";
+ public const string ModName = "3702";
+ public const string ModRightName = "Sc_CJKB";
+ public const string ModRightNameEdit = ModRightName + "_Edit";
+ public const string ModRightNameCheck = ModRightName + "_Check";
+ public const string ModRightNameClose = ModRightName + "_Close";
+ public const string ModRightNameDelete = ModRightName + "_Delete";
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ public string sDeptID = "0";
+ DataSet DSet;
+
+ int FY = 29;
+ //
+ private void initGrid()
+ {
+ //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ //鍒楁爣棰�
+ //grdMain.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionBackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //grdMain.ColumnHeadersHeight = 40;
+ //grdMain.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ ////濂囨暟琛�
+ //grdMain.AlternatingRowsDefaultCellStyle.BackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionForeColor = Color.White;
+ ////缃戞牸鑳屾櫙鑹�
+ //grdMain.BackgroundColor = Color.FromArgb(104, 97, 118);
+ ////鍒楁爣棰樿竟妗嗘牱寮�
+ //grdMain.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; ;
+ ////鏍囬鏍峰紡鏄惁浣跨敤鐢ㄦ埛褰撳墠涓婚鐨勬牱寮�
+ //grdMain.EnableHeadersVisualStyles = false;
+ ////闅愯棌琛屾爣棰�
+ //grdMain.RowHeadersVisible = false;
+ ////鍗曞厓鏍�
+ //grdMain.RowsDefaultCellStyle.BackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //--------------------
+ DBUtility.Xt_BaseBillFun.initKanBan(this.Name, grdMain, Tool, toolStripLabel1, null, ref FY, timer2, timer3);
+ }
+ //
+
+ private void Display()
+ {
+ try
+ {
+ ClsCN SubCn = new ClsCN();
+ string sSql = "";
+ string sWhere = "";
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ sDeptID = sID;
+ //杩囨护鏉′欢
+ //if (frmCondition.SqlStr.Trim().Length == 0)
+ // return;
+ //sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
+ //sSql = "exec h_p_CJKB ";
+ sSql = "exec h_p_CJKB " + sDeptID;
+ //
+ DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //閲婃斁鍐荤粨
+ DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
+ //
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //
+
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ //int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ //int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ //int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ // }
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = "";
+ sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ string[] sT;
+ sT = sTotalCol.Split(Convert.ToChar(","));
+ oSumGrid.BuildTotalCols(sT);
+ //
+ //鍐荤粨
+ int FrCol = 10;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ //鐢荤嚎
+ //GraphLine();
+
+ //Total();
+
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (i % 2 == 0)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ // }
+ // else
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ // }
+ //}
+ //
+ }
+ catch (Exception e)
+ {
+ return;
+ }
+ }
+ //
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled=false;
+ initGrid();
+ Display();
+ }
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ this.Close();
+ }
+
+ private void sx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ private void dj_Click(object sender, EventArgs e)
+ {
+ Sub_ShowBill();
+ }
+ //鏄剧ず鍗曟嵁
+ private void Sub_ShowBill()
+ {
+
+ }
+ //
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+ //
+ private void Sc_CJKB_Load(object sender, EventArgs e)
+ {
+ //
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ //lblCaption.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ initGrid();
+
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ if (sID == "娌℃湁鎵惧埌锛�")
+ {
+ sDeptID = "0";
+ }
+ else
+ {
+ sDeptID = sID;
+ }
+ }
+
+ private void grdMain_DblClick(object sender, EventArgs e)
+ {
+ //Sc_WorkBillProcReportKB o = new Sc_WorkBillProcReportKB();
+ //if(grdMain.CurrentRow==null)
+ // return;
+ //o.sICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
+ //o.sDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HDeptID")].Value);
+ //o.ShowDialog();
+ }
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
+
+ private void xz_Click(object sender, EventArgs e)
+ {
+ //
+ }
+
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Sub_DeleteBill();
+ }
+ //鍒犻櫎
+ private void Sub_DeleteBill()
+ {
+
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ //timer2.Enabled = false;
+ //frmCondition = new frmBillQueryCondition_New();
+ //SetCondition(frmCondition, ViewName, this.Name);
+ //frmCondition.ShowDialog();
+ //if (frmCondition.Tag.ToString() == "OK")
+ //{
+ //timer1.Enabled = true;
+ //}
+
+ if (DSet != null && DSet.Tables[0].Rows.Count > FY)
+ {
+ for (int y = 0; y < FY; y++)
+ {
+ DataRow newRow = DSet.Tables[0].NewRow();
+ //鐢ㄧ浉搴斿�煎～鍐欐暟鎹
+ for (int m = 0; m < DSet.Tables[0].Columns.Count; m++)
+ {
+ newRow[m] = DSet.Tables[0].Rows[0][m];
+ }
+ //濉啓瀹屾瘯锛屽皢鏁版嵁琛屾坊鍔犲埌鏁版嵁闆�
+ DSet.Tables[0].Rows.Add(newRow);
+
+ DSet.Tables[0].Rows.Remove(DSet.Tables[0].Rows[0]);
+ }
+
+ grdMain.DataSource = null;
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+
+
+ ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
+ //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
+ //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 0)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Red;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) < 7)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Orange;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) >= 7 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 14)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Yellow;
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.ForeColor = Color.Black;
+ // }
+ // //================= //------------鏈笅鍗� 澶т簬0 鏄剧ず绾㈣壊
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HSumUnDownQtyCol].Value) > 0)
+ // {
+ // grdMain.Rows[i].Cells[HSumUnDownQtyCol].Style.BackColor = Color.Red;
+ // }
+ //}
+
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, "", 0);
+ }
+ }
+
+
+
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+ //
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ //鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+ //瀹℃牳
+ private void sh_Click(object sender, EventArgs e)
+ {
+ this.Sub_CheckBill();
+ }
+
+ //瀹℃牳鍗曟嵁
+ private void Sub_CheckBill()
+ {
+
+ }
+ //鍙嶅鍗曟嵁
+ private void Sub_AbandonCheck()
+ {
+
+ }
+ //鍙嶅鏍�
+ private void qsh_Click(object sender, EventArgs e)
+ {
+ Sub_AbandonCheck();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(true);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("HMaterID"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!锛�" + e.Message);
+ }
+ }
+
+ #endregion
+ //
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount>0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+ //寮曞嚭EXCEL
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+ int HQty = 0;
+ private void timer3_Tick(object sender, EventArgs e)
+ {
+ if (HQty < 10)
+ {
+ HQty = HQty + 1;
+ }
+ else
+ {
+ HQty = 0;
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton1_Click(object sender, EventArgs e)
+ {
+ if (toolStripButton1.Text == "鏆傚仠")
+ {
+ toolStripButton1.Text = "杩愯";
+ timer2.Enabled = false;
+ }
+ else
+ {
+ toolStripButton1.Text = "鏆傚仠";
+ timer2.Enabled = true;
+ }
+ }
+
+ private void txtHMaterID_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ //Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ //oSZ.HName = this.Name;
+ //oSZ.ShowDialog();
+ //timer1.Enabled = true;
+
+ Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ oSZ.HName = this.Name;
+ oSZ.ShowDialog();
+ timer1.Enabled = true;
+ }
+
+ private void grdMain_Sorted(object sender, EventArgs e)
+ {
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ DateTime oNow = DateTime.Today.Date;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ }
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ }
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/Kanban/Sc_CJKB.designer.cs b/Kanban/Sc_CJKB.designer.cs
new file mode 100644
index 0000000..4f52fe8
--- /dev/null
+++ b/Kanban/Sc_CJKB.designer.cs
@@ -0,0 +1,286 @@
+锘縩amespace Kanban
+{
+ partial class Sc_CJKB
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_CJKB));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackColor = System.Drawing.Color.Black;
+ 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.tc,
+ this.toolStripButton1,
+ this.toolStripButton2,
+ this.toolStripSeparator3,
+ this.toolStripSeparator9,
+ this.toolStripSeparator7,
+ this.toolStripLabel1});
+ 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(906, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tc.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.tc.ForeColor = System.Drawing.Color.White;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(50, 47);
+ this.tc.Text = "<杩斿洖";
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.AutoSize = false;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton1.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(50, 47);
+ this.toolStripButton1.Text = "鏆傚仠";
+ this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // toolStripButton2
+ //
+ this.toolStripButton2.AutoSize = false;
+ this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton2.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(36, 47);
+ this.toolStripButton2.Text = "璁剧疆";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.toolStripLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripLabel1.Font = new System.Drawing.Font("Microsoft YaHei UI", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripLabel1.ForeColor = System.Drawing.Color.White;
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(92, 47);
+ this.toolStripLabel1.Text = "杞﹂棿鐪嬫澘";
+ this.toolStripLabel1.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 20000;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 8;
+ this.grdPrint.Visible = false;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
+ 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(906, 19);
+ this.grdSum.TabIndex = 47;
+ this.grdSum.Visible = false;
+ //
+ // timer3
+ //
+ this.timer3.Enabled = true;
+ this.timer3.Interval = 1800000;
+ this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.grdMain.BackgroundColor = System.Drawing.Color.Black;
+ this.grdMain.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.grdMain.ColumnHeadersHeight = 40;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.EnableHeadersVisualStyles = false;
+ this.grdMain.Location = new System.Drawing.Point(0, 50);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.CornflowerBlue;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ this.grdMain.RowHeadersVisible = false;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.RowsDefaultCellStyle = dataGridViewCellStyle4;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.grdMain.Size = new System.Drawing.Size(906, 462);
+ this.grdMain.TabIndex = 48;
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Sorted += new System.EventHandler(this.grdMain_Sorted);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
+ //
+ // Sc_CJKB
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(906, 531);
+ this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Name = "Sc_CJKB";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "鍗曟嵁鍒楄〃";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Sc_CJKB_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.DataGridView grdMain;
+ }
+}
\ No newline at end of file
diff --git a/Kanban/Sc_CJKB.resx b/Kanban/Sc_CJKB.resx
new file mode 100644
index 0000000..de4031c
--- /dev/null
+++ b/Kanban/Sc_CJKB.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>191, 16</value>
+ </metadata>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>281, 16</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
new file mode 100644
index 0000000..e41c9fd
--- /dev/null
+++ b/Kanban/Sc_QLKB.cs
@@ -0,0 +1,530 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using SQLHelper;
+using DBUtility;
+using Pub_Class;
+
+namespace Kanban
+{
+ public partial class Sc_QLKB : Form
+ {
+ public Sc_QLKB()
+ {
+ InitializeComponent();
+ }
+ public DBUtility.frmBillQueryCondition_New frmCondition;
+ public string ViewName = "h_v_Sc_QLKB";
+ public string ModCaption = "缂烘枡鐪嬫澘";
+ public const string ModName = "3702";
+ public const string ModRightName = "Sc_QLKB";
+ public const string ModRightNameEdit = ModRightName + "_Edit";
+ public const string ModRightNameCheck = ModRightName + "_Check";
+ public const string ModRightNameClose = ModRightName + "_Close";
+ public const string ModRightNameDelete = ModRightName + "_Delete";
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ public string sDeptID = "0";
+ DataSet DSet;
+
+ int FY = 29;
+ //
+ private void initGrid()
+ {
+ //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ //鍒楁爣棰�
+ //grdMain.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionBackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //grdMain.ColumnHeadersHeight = 40;
+ //grdMain.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ ////濂囨暟琛�
+ //grdMain.AlternatingRowsDefaultCellStyle.BackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionForeColor = Color.White;
+ ////缃戞牸鑳屾櫙鑹�
+ //grdMain.BackgroundColor = Color.FromArgb(104, 97, 118);
+ ////鍒楁爣棰樿竟妗嗘牱寮�
+ //grdMain.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; ;
+ ////鏍囬鏍峰紡鏄惁浣跨敤鐢ㄦ埛褰撳墠涓婚鐨勬牱寮�
+ //grdMain.EnableHeadersVisualStyles = false;
+ ////闅愯棌琛屾爣棰�
+ //grdMain.RowHeadersVisible = false;
+ ////鍗曞厓鏍�
+ //grdMain.RowsDefaultCellStyle.BackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //--------------------
+ DBUtility.Xt_BaseBillFun.initKanBan(this.Name, grdMain, Tool, toolStripLabel1, null, ref FY, timer2, timer3);
+ }
+ //
+
+ private void Display()
+ {
+ try
+ {
+ //ClsCN SubCn = new ClsCN();
+ //string sSql = "";
+ //string sWhere = "";
+ ////杩囨护鏉′欢
+ ////if (frmCondition.SqlStr.Trim().Length == 0)
+ //// return;
+ ////sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
+ //sSql = "exec h_p_QLKB ";
+ ////
+ //DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ ////鐢熸垚棣栬鏍囬
+ //if (DSet == null)
+ //{
+ // //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ // return;
+ //}
+ ////閲婃斁鍐荤粨
+ //DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
+ ////
+ //grdMain.DataSource = DSet.Tables[0].DefaultView;
+ ////
+
+ ////-----------棰勮鐘舵��
+ ////寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ ////瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ ////int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ ////int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ ////int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ ////DateTime oNow = DateTime.Today.Date;
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ //// }
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ //// }
+ ////}
+
+ ////璁剧疆鍚堣鍒�
+ //string sTotalCol = "";
+ //sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ //string[] sT;
+ //sT = sTotalCol.Split(Convert.ToChar(","));
+ //oSumGrid.BuildTotalCols(sT);
+ ////
+ ////鍐荤粨
+ //int FrCol = 10;
+ //string s = "鏄�";
+ //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ ////鐢荤嚎
+ ////GraphLine();
+
+ ////Total();
+
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (i % 2 == 0)
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ ////}
+ ////
+ ///
+ ClsCN clsCN = new ClsCN();
+ ClsIni clsIni = new ClsIni();
+ string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp.ini");
+ this.sDeptID = text;
+ string procName = "exec h_p_QLKB " + this.sDeptID;
+ this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+ bool flag = this.DSet == null;
+ if (!flag)
+ {
+ Xt_BaseBillFun.CancelFrozenCol(this.grdMain);
+ this.grdMain.DataSource = this.DSet.Tables[0].DefaultView;
+ string totalCols = Gy_BaseFun.GetTotalCols(this.DSet);
+ string[] cols = totalCols.Split(new char[]
+ {
+ Convert.ToChar(",")
+ });
+ this.oSumGrid.BuildTotalCols(cols);
+ int frCol = 10;
+ string s = "鏄�";
+ Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
+ }
+ }
+ catch (Exception e)
+ {
+ return;
+ }
+ }
+ //
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled=false;
+ initGrid();
+ Display();
+ }
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ this.Close();
+ }
+
+ private void sx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ private void dj_Click(object sender, EventArgs e)
+ {
+ Sub_ShowBill();
+ }
+ //鏄剧ず鍗曟嵁
+ private void Sub_ShowBill()
+ {
+
+ }
+ //
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+ //
+ private void Sc_QLKB_Load(object sender, EventArgs e)
+ {
+ //
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ //lblCaption.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ initGrid();
+
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ if (sID == "娌℃湁鎵惧埌锛�")
+ {
+ sDeptID = "0";
+ }
+ else
+ {
+ sDeptID = sID;
+ }
+ }
+
+ private void grdMain_DblClick(object sender, EventArgs e)
+ {
+ //Sc_WorkBillProcReportKB o = new Sc_WorkBillProcReportKB();
+ //if(grdMain.CurrentRow==null)
+ // return;
+ //o.sICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
+ //o.sDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HDeptID")].Value);
+ //o.ShowDialog();
+ }
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
+
+ private void xz_Click(object sender, EventArgs e)
+ {
+ //
+ }
+
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Sub_DeleteBill();
+ }
+ //鍒犻櫎
+ private void Sub_DeleteBill()
+ {
+
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ //timer2.Enabled = false;
+ //frmCondition = new frmBillQueryCondition_New();
+ //SetCondition(frmCondition, ViewName, this.Name);
+ //frmCondition.ShowDialog();
+ //if (frmCondition.Tag.ToString() == "OK")
+ //{
+ //timer1.Enabled = true;
+ //}
+
+ if (DSet != null && DSet.Tables[0].Rows.Count > FY)
+ {
+ for (int y = 0; y < FY; y++)
+ {
+ DataRow newRow = DSet.Tables[0].NewRow();
+ //鐢ㄧ浉搴斿�煎～鍐欐暟鎹
+ for (int m = 0; m < DSet.Tables[0].Columns.Count; m++)
+ {
+ newRow[m] = DSet.Tables[0].Rows[0][m];
+ }
+ //濉啓瀹屾瘯锛屽皢鏁版嵁琛屾坊鍔犲埌鏁版嵁闆�
+ DSet.Tables[0].Rows.Add(newRow);
+
+ DSet.Tables[0].Rows.Remove(DSet.Tables[0].Rows[0]);
+ }
+
+ grdMain.DataSource = null;
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+
+
+ ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
+ //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
+ //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 0)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Red;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) < 7)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Orange;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) >= 7 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 14)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Yellow;
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.ForeColor = Color.Black;
+ // }
+ // //================= //------------鏈笅鍗� 澶т簬0 鏄剧ず绾㈣壊
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HSumUnDownQtyCol].Value) > 0)
+ // {
+ // grdMain.Rows[i].Cells[HSumUnDownQtyCol].Style.BackColor = Color.Red;
+ // }
+ //}
+
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, "", 0);
+ }
+ }
+
+
+
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+ //
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ //鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+ //瀹℃牳
+ private void sh_Click(object sender, EventArgs e)
+ {
+ this.Sub_CheckBill();
+ }
+
+ //瀹℃牳鍗曟嵁
+ private void Sub_CheckBill()
+ {
+
+ }
+ //鍙嶅鍗曟嵁
+ private void Sub_AbandonCheck()
+ {
+
+ }
+ //鍙嶅鏍�
+ private void qsh_Click(object sender, EventArgs e)
+ {
+ Sub_AbandonCheck();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(true);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("HMaterID"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!锛�" + e.Message);
+ }
+ }
+
+ #endregion
+ //
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount>0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+ //寮曞嚭EXCEL
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+ int HQty = 0;
+ private void timer3_Tick(object sender, EventArgs e)
+ {
+ if (HQty < 10)
+ {
+ HQty = HQty + 1;
+ }
+ else
+ {
+ HQty = 0;
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton1_Click(object sender, EventArgs e)
+ {
+ if (toolStripButton1.Text == "鏆傚仠")
+ {
+ toolStripButton1.Text = "杩愯";
+ timer2.Enabled = false;
+ }
+ else
+ {
+ toolStripButton1.Text = "鏆傚仠";
+ timer2.Enabled = true;
+ }
+ }
+
+ private void txtHMaterID_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ //Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ //oSZ.HName = this.Name;
+ //oSZ.ShowDialog();
+ timer1.Enabled = true;
+
+
+ Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ oSZ.HName = this.Name;
+ oSZ.ShowDialog();
+ timer1.Enabled = true;
+ }
+
+ private void grdMain_Sorted(object sender, EventArgs e)
+ {
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ DateTime oNow = DateTime.Today.Date;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ }
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ }
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/Kanban/Sc_QLKB.designer.cs b/Kanban/Sc_QLKB.designer.cs
new file mode 100644
index 0000000..c7a7d46
--- /dev/null
+++ b/Kanban/Sc_QLKB.designer.cs
@@ -0,0 +1,286 @@
+锘縩amespace Kanban
+{
+ partial class Sc_QLKB
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_QLKB));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackColor = System.Drawing.Color.Black;
+ 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.tc,
+ this.toolStripButton1,
+ this.toolStripButton2,
+ this.toolStripSeparator3,
+ this.toolStripSeparator9,
+ this.toolStripSeparator7,
+ this.toolStripLabel1});
+ 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(906, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tc.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.tc.ForeColor = System.Drawing.Color.White;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(50, 47);
+ this.tc.Text = "<杩斿洖";
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.AutoSize = false;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton1.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(50, 47);
+ this.toolStripButton1.Text = "鏆傚仠";
+ this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // toolStripButton2
+ //
+ this.toolStripButton2.AutoSize = false;
+ this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton2.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(36, 47);
+ this.toolStripButton2.Text = "璁剧疆";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.toolStripLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripLabel1.Font = new System.Drawing.Font("Microsoft YaHei UI", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripLabel1.ForeColor = System.Drawing.Color.White;
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(92, 47);
+ this.toolStripLabel1.Text = "缂烘枡鐪嬫澘";
+ this.toolStripLabel1.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 20000;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 8;
+ this.grdPrint.Visible = false;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
+ 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(906, 19);
+ this.grdSum.TabIndex = 47;
+ this.grdSum.Visible = false;
+ //
+ // timer3
+ //
+ this.timer3.Enabled = true;
+ this.timer3.Interval = 1800000;
+ this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.grdMain.BackgroundColor = System.Drawing.Color.Black;
+ this.grdMain.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.grdMain.ColumnHeadersHeight = 40;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.EnableHeadersVisualStyles = false;
+ this.grdMain.Location = new System.Drawing.Point(0, 50);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.CornflowerBlue;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ this.grdMain.RowHeadersVisible = false;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.RowsDefaultCellStyle = dataGridViewCellStyle4;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.grdMain.Size = new System.Drawing.Size(906, 462);
+ this.grdMain.TabIndex = 48;
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Sorted += new System.EventHandler(this.grdMain_Sorted);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
+ //
+ // Sc_QLKB
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(906, 531);
+ this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Name = "Sc_QLKB";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "鍗曟嵁鍒楄〃";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Sc_QLKB_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.DataGridView grdMain;
+ }
+}
\ No newline at end of file
diff --git a/Kanban/Sc_QLKB.resx b/Kanban/Sc_QLKB.resx
new file mode 100644
index 0000000..de4031c
--- /dev/null
+++ b/Kanban/Sc_QLKB.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>191, 16</value>
+ </metadata>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>281, 16</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/NETERPNoWin/Frm_MESSetIni.Designer.cs b/NETERPNoWin/Frm_MESSetIni.Designer.cs
index f61f4c1..5789de7 100644
--- a/NETERPNoWin/Frm_MESSetIni.Designer.cs
+++ b/NETERPNoWin/Frm_MESSetIni.Designer.cs
@@ -46,18 +46,16 @@
//
// txtHDeptID
//
- this.txtHDeptID.Location = new System.Drawing.Point(131, 107);
- this.txtHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHDeptID.Location = new System.Drawing.Point(98, 86);
this.txtHDeptID.Name = "txtHDeptID";
- this.txtHDeptID.Size = new System.Drawing.Size(212, 25);
+ this.txtHDeptID.Size = new System.Drawing.Size(160, 21);
this.txtHDeptID.TabIndex = 0;
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(157, 271);
- this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdOK.Location = new System.Drawing.Point(118, 217);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(100, 38);
+ this.cmdOK.Size = new System.Drawing.Size(75, 30);
this.cmdOK.TabIndex = 1;
this.cmdOK.Text = "纭畾";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -65,10 +63,9 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(265, 271);
- this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdCancel.Location = new System.Drawing.Point(199, 217);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(100, 38);
+ this.cmdCancel.Size = new System.Drawing.Size(75, 30);
this.cmdCancel.TabIndex = 2;
this.cmdCancel.Text = "鍙栨秷";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -77,29 +74,26 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(13, 111);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(10, 89);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 3;
this.label1.Text = "榛樿宸ユ";
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(13, 144);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(10, 115);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(97, 15);
+ this.label2.Size = new System.Drawing.Size(77, 12);
this.label2.TabIndex = 5;
this.label2.Text = "榛樿鍚姩鐪嬫澘";
//
// txtHOPWin
//
- this.txtHOPWin.Location = new System.Drawing.Point(131, 140);
- this.txtHOPWin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHOPWin.Location = new System.Drawing.Point(98, 112);
this.txtHOPWin.Name = "txtHOPWin";
- this.txtHOPWin.Size = new System.Drawing.Size(233, 25);
+ this.txtHOPWin.Size = new System.Drawing.Size(176, 21);
this.txtHOPWin.TabIndex = 4;
//
// cmdHDeptID
@@ -107,10 +101,9 @@
this.cmdHDeptID.BackColor = System.Drawing.Color.Transparent;
this.cmdHDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDeptID.Image")));
this.cmdHDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHDeptID.Location = new System.Drawing.Point(336, 107);
- this.cmdHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHDeptID.Location = new System.Drawing.Point(252, 86);
this.cmdHDeptID.Name = "cmdHDeptID";
- this.cmdHDeptID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHDeptID.Size = new System.Drawing.Size(22, 22);
this.cmdHDeptID.TabIndex = 78;
this.cmdHDeptID.UseVisualStyleBackColor = false;
this.cmdHDeptID.Click += new System.EventHandler(this.cmdHDeptID_Click);
@@ -120,29 +113,27 @@
this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image")));
this.button1.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.button1.Location = new System.Drawing.Point(336, 31);
- this.button1.Margin = new System.Windows.Forms.Padding(4);
+ this.button1.Location = new System.Drawing.Point(252, 25);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(29, 28);
+ this.button1.Size = new System.Drawing.Size(22, 22);
this.button1.TabIndex = 81;
this.button1.UseVisualStyleBackColor = false;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(13, 35);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(10, 28);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 80;
this.label3.Text = "榛樿杞﹂棿";
//
// textBox1
//
- this.textBox1.Location = new System.Drawing.Point(131, 31);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Location = new System.Drawing.Point(98, 25);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(212, 25);
+ this.textBox1.Size = new System.Drawing.Size(160, 21);
this.textBox1.TabIndex = 79;
//
// button2
@@ -150,36 +141,33 @@
this.button2.BackColor = System.Drawing.Color.Transparent;
this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image")));
this.button2.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.button2.Location = new System.Drawing.Point(336, 67);
- this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Location = new System.Drawing.Point(252, 54);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(29, 28);
+ this.button2.Size = new System.Drawing.Size(22, 22);
this.button2.TabIndex = 84;
this.button2.UseVisualStyleBackColor = false;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(13, 71);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(10, 57);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 83;
this.label4.Text = "榛樿浠撳簱";
//
// textBox2
//
- this.textBox2.Location = new System.Drawing.Point(131, 67);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Location = new System.Drawing.Point(98, 54);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(212, 25);
+ this.textBox2.Size = new System.Drawing.Size(160, 21);
this.textBox2.TabIndex = 82;
//
// Frm_MESSetIni
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(396, 334);
+ this.ClientSize = new System.Drawing.Size(297, 267);
this.Controls.Add(this.button2);
this.Controls.Add(this.label4);
this.Controls.Add(this.textBox2);
@@ -194,7 +182,6 @@
this.Controls.Add(this.cmdOK);
this.Controls.Add(this.txtHDeptID);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MESSetIni";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "绯荤粺璁剧疆";
diff --git a/NETERPNoWin/Frm_MESSetIni.cs b/NETERPNoWin/Frm_MESSetIni.cs
index b0c9ca2..ca04342 100644
--- a/NETERPNoWin/Frm_MESSetIni.cs
+++ b/NETERPNoWin/Frm_MESSetIni.cs
@@ -55,8 +55,9 @@
txtHOPWin.Text = sWinName;
}
+ private void button1_Click(object sender, EventArgs e)
+ {
-
-
+ }
}
}
\ No newline at end of file
diff --git a/NETERPNoWin/bin/x86/Debug.zip b/NETERPNoWin/bin/x86/Debug.zip
new file mode 100644
index 0000000..a62cd05
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug.zip
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index 38438fe..b25ca69 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index 5e8989b..879bab6 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index 6bad93d..22730aa 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index 0eeed7e..c5e00c3 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index 04b5a1f..0ae4232 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index 957bf5e..c346229 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index 8ba6de3..ac1831b 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index e1753d4..5da9c86 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP.ini b/NETERPNoWin/bin/x86/Debug/HXERP.ini
index 9aee8fc..1a758d9 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP.ini
@@ -22,3 +22,7 @@
UserName=admin
UserPsd=jinghuanzh
Remember=1
+[OPenWin]
+gnbm=Sc9910
+gnsy=Sc_WorkBillPlanSumReportKB
+gnmc=Sc_CJKB
\ No newline at end of file
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
index cd2a58a..a808b02 100644
--- a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index 55ae7a6..13d9411 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index 18d0aec..1d65221 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index a83ad4f..c8f11da 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 6b29522..f5ad290 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index 996d816..e5d15b2 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index ab50acb..aba85d8 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index f9278f2..8cfa718 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index b9fe8e9..8708670 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index a1b7ff8..d22a6c9 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index fbfa3c9..e6dcea8 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
index 381f901..6120acb 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
index 12c95e5..393affd 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
index a5abbfc..6a0d265 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
index 3ed3fee..5b092e7 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
index bc3997f..c589b10 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
index 4455a83..15b0a6b 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index 59eb8bb..e98588d 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index 25e9a98..b34eff7 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index 285135d..6d066f9 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index e14e582..ecc1f6b 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/stdole.dll b/NETERPNoWin/bin/x86/Debug/stdole.dll
index d0f5217..9673c81 100644
--- a/NETERPNoWin/bin/x86/Debug/stdole.dll
+++ b/NETERPNoWin/bin/x86/Debug/stdole.dll
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
index d6c25a6..521c01d 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0fd75010422ae4dfac5c4dbd0f767f162f9427ce
+92ce8f1a8e70e960fb251b303d4b66bf2cc9cf64
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index ba9cf39..61582b9 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -53,3 +53,58 @@
F:\GIT浠撳簱\ZYLMES\NETERPNoWin\bin\x86\Debug\WarM.dll.config
F:\GIT浠撳簱\ZYLMES\NETERPNoWin\bin\x86\Debug\WorkM.pdb
F:\GIT浠撳簱\ZYLMES\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.gregn6Lib.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.grdes6Lib.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll.config
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csprojAssemblyReference.cache
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\Interop.gregn6Lib.dll
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.ResolveComReference.cache
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Form1.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_MESSetIni.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.OA_MessageBox.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_Show.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MDIMain.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Properties.Resources.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Xt_Wait.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MESMain.resources
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.GenerateResource.cache
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CoreCompileInputs.cache
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
+D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
index 3bc0c69..6b543d9 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
index 4bb0080..88471c7 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index 996d816..e5d15b2 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
index ab50acb..aba85d8 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/ClsShowMod.cs" "b/NETERPNoWin/\345\205\254\347\224\250/ClsShowMod.cs"
index 9054871..66d8323 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/ClsShowMod.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/ClsShowMod.cs"
@@ -1616,6 +1616,24 @@
oKf_InitStockBill_WW.MdiParent = oMain;
oKf_InitStockBill_WW.Show();
break;
+ case "sc_cgkb":
+ //权限
+ Sc_CGKB oSc_CGKB = new Sc_CGKB();
+ oSc_CGKB.MdiParent = oMain;
+ oSc_CGKB.Show();
+ break;
+ case "sc_cjkb":
+ //权限
+ Sc_CJKB oSc_CJKB = new Sc_CJKB();
+ oSc_CJKB.MdiParent = oMain;
+ oSc_CJKB.Show();
+ break;
+ case "sc_qlkb":
+ //权限
+ Sc_QLKB oSc_QLKB = new Sc_QLKB();
+ oSc_QLKB.MdiParent = oMain;
+ oSc_QLKB.Show();
+ break;
default:
break;
}
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
index 201fcbf..920db49 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
@@ -61,10 +61,9 @@
//
this.Sc_ICMOBillList_K3.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_ICMOBillList_K3.Image = ((System.Drawing.Image)(resources.GetObject("Sc_ICMOBillList_K3.Image")));
- this.Sc_ICMOBillList_K3.Location = new System.Drawing.Point(161, 54);
- this.Sc_ICMOBillList_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_ICMOBillList_K3.Location = new System.Drawing.Point(121, 43);
this.Sc_ICMOBillList_K3.Name = "Sc_ICMOBillList_K3";
- this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(111, 104);
+ this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(83, 83);
this.Sc_ICMOBillList_K3.TabIndex = 1;
this.Sc_ICMOBillList_K3.Tag = "褰撳墠宸ュ崟";
this.Sc_ICMOBillList_K3.UseVisualStyleBackColor = true;
@@ -74,10 +73,9 @@
//
this.Sc_MESBeginWorkBill_Fast.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_MESBeginWorkBill_Fast.Image = ((System.Drawing.Image)(resources.GetObject("Sc_MESBeginWorkBill_Fast.Image")));
- this.Sc_MESBeginWorkBill_Fast.Location = new System.Drawing.Point(621, 249);
- this.Sc_MESBeginWorkBill_Fast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_MESBeginWorkBill_Fast.Location = new System.Drawing.Point(466, 199);
this.Sc_MESBeginWorkBill_Fast.Name = "Sc_MESBeginWorkBill_Fast";
- this.Sc_MESBeginWorkBill_Fast.Size = new System.Drawing.Size(111, 104);
+ this.Sc_MESBeginWorkBill_Fast.Size = new System.Drawing.Size(83, 83);
this.Sc_MESBeginWorkBill_Fast.TabIndex = 7;
this.Sc_MESBeginWorkBill_Fast.Tag = "寮�宸ュ崟";
this.Sc_MESBeginWorkBill_Fast.UseVisualStyleBackColor = true;
@@ -87,10 +85,9 @@
//
this.Sc_ProcExchReport_Fast.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_ProcExchReport_Fast.Image = ((System.Drawing.Image)(resources.GetObject("Sc_ProcExchReport_Fast.Image")));
- this.Sc_ProcExchReport_Fast.Location = new System.Drawing.Point(847, 249);
- this.Sc_ProcExchReport_Fast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_ProcExchReport_Fast.Location = new System.Drawing.Point(635, 199);
this.Sc_ProcExchReport_Fast.Name = "Sc_ProcExchReport_Fast";
- this.Sc_ProcExchReport_Fast.Size = new System.Drawing.Size(111, 104);
+ this.Sc_ProcExchReport_Fast.Size = new System.Drawing.Size(83, 83);
this.Sc_ProcExchReport_Fast.TabIndex = 8;
this.Sc_ProcExchReport_Fast.Tag = "浜ч噺姹囨姤鍗�";
this.Sc_ProcExchReport_Fast.UseVisualStyleBackColor = true;
@@ -100,10 +97,9 @@
//
this.Sc_WorkBillPlanReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillPlanReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillPlanReportKB.Image")));
- this.Sc_WorkBillPlanReportKB.Location = new System.Drawing.Point(393, 54);
- this.Sc_WorkBillPlanReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillPlanReportKB.Location = new System.Drawing.Point(295, 43);
this.Sc_WorkBillPlanReportKB.Name = "Sc_WorkBillPlanReportKB";
- this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(83, 83);
this.Sc_WorkBillPlanReportKB.TabIndex = 2;
this.Sc_WorkBillPlanReportKB.Tag = "璁″垝鐪嬫澘";
this.Sc_WorkBillPlanReportKB.UseVisualStyleBackColor = true;
@@ -113,10 +109,9 @@
//
this.Sc_WorkBillPlanSumReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillPlanSumReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillPlanSumReportKB.Image")));
- this.Sc_WorkBillPlanSumReportKB.Location = new System.Drawing.Point(621, 54);
- this.Sc_WorkBillPlanSumReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillPlanSumReportKB.Location = new System.Drawing.Point(466, 43);
this.Sc_WorkBillPlanSumReportKB.Name = "Sc_WorkBillPlanSumReportKB";
- this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(83, 83);
this.Sc_WorkBillPlanSumReportKB.TabIndex = 3;
this.Sc_WorkBillPlanSumReportKB.Tag = "姹囨�荤湅鏉�1";
this.Sc_WorkBillPlanSumReportKB.UseVisualStyleBackColor = true;
@@ -134,12 +129,12 @@
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(156, 180);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(117, 144);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(110, 24);
+ this.label1.Size = new System.Drawing.Size(93, 19);
this.label1.TabIndex = 65;
- this.label1.Text = "褰撳墠宸ュ崟";
+ this.label1.Text = "閲囪喘鐪嬫澘";
+ this.label1.Click += new System.EventHandler(this.label1_Click);
//
// label2
//
@@ -147,10 +142,9 @@
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(629, 374);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(472, 299);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(85, 24);
+ this.label2.Size = new System.Drawing.Size(72, 19);
this.label2.TabIndex = 66;
this.label2.Text = "寮�宸ュ崟";
//
@@ -160,10 +154,9 @@
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(831, 374);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(623, 299);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(135, 24);
+ this.label3.Size = new System.Drawing.Size(114, 19);
this.label3.TabIndex = 67;
this.label3.Text = "浜ч噺姹囨姤鍗�";
//
@@ -173,12 +166,12 @@
this.label6.BackColor = System.Drawing.Color.Transparent;
this.label6.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(388, 180);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(291, 144);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(110, 24);
+ this.label6.Size = new System.Drawing.Size(93, 19);
this.label6.TabIndex = 70;
- this.label6.Text = "璁″垝鐪嬫澘";
+ this.label6.Text = "杞﹂棿鐪嬫澘";
+ this.label6.Click += new System.EventHandler(this.label6_Click);
//
// label7
//
@@ -186,12 +179,12 @@
this.label7.BackColor = System.Drawing.Color.Transparent;
this.label7.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(617, 180);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(463, 144);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(110, 24);
+ this.label7.Size = new System.Drawing.Size(93, 19);
this.label7.TabIndex = 71;
- this.label7.Text = "姹囨�荤湅鏉�";
+ this.label7.Text = "缂烘枡鐪嬫澘";
+ this.label7.Click += new System.EventHandler(this.label7_Click);
//
// label8
//
@@ -199,10 +192,9 @@
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(615, 566);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(461, 453);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(110, 24);
+ this.label8.Size = new System.Drawing.Size(93, 19);
this.label8.TabIndex = 73;
this.label8.Text = "绯荤粺璁剧疆";
//
@@ -210,10 +202,9 @@
//
this.cmdSetKanbanIni.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdSetKanbanIni.Image = ((System.Drawing.Image)(resources.GetObject("cmdSetKanbanIni.Image")));
- this.cmdSetKanbanIni.Location = new System.Drawing.Point(621, 440);
- this.cmdSetKanbanIni.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdSetKanbanIni.Location = new System.Drawing.Point(466, 352);
this.cmdSetKanbanIni.Name = "cmdSetKanbanIni";
- this.cmdSetKanbanIni.Size = new System.Drawing.Size(111, 104);
+ this.cmdSetKanbanIni.Size = new System.Drawing.Size(83, 83);
this.cmdSetKanbanIni.TabIndex = 11;
this.cmdSetKanbanIni.Tag = "绯荤粺璁剧疆";
this.cmdSetKanbanIni.UseVisualStyleBackColor = true;
@@ -225,10 +216,9 @@
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(131, 374);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(98, 299);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(160, 24);
+ this.label9.Size = new System.Drawing.Size(135, 19);
this.label9.TabIndex = 75;
this.label9.Text = "鏈満缂烘枡鐪嬫澘";
//
@@ -236,10 +226,9 @@
//
this.Sc_BJQLFXB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_BJQLFXB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_BJQLFXB.Image")));
- this.Sc_BJQLFXB.Location = new System.Drawing.Point(161, 249);
- this.Sc_BJQLFXB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_BJQLFXB.Location = new System.Drawing.Point(121, 199);
this.Sc_BJQLFXB.Name = "Sc_BJQLFXB";
- this.Sc_BJQLFXB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_BJQLFXB.Size = new System.Drawing.Size(83, 83);
this.Sc_BJQLFXB.TabIndex = 5;
this.Sc_BJQLFXB.Tag = "鏈満缂烘枡鐪嬫澘";
this.Sc_BJQLFXB.UseVisualStyleBackColor = true;
@@ -251,10 +240,9 @@
this.label10.BackColor = System.Drawing.Color.Transparent;
this.label10.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(365, 374);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(274, 299);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(160, 24);
+ this.label10.Size = new System.Drawing.Size(135, 19);
this.label10.TabIndex = 77;
this.label10.Text = "缂烘枡姹囨�荤湅鏉�";
//
@@ -262,10 +250,9 @@
//
this.Sc_HZQLCGKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_HZQLCGKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_HZQLCGKB.Image")));
- this.Sc_HZQLCGKB.Location = new System.Drawing.Point(393, 249);
- this.Sc_HZQLCGKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_HZQLCGKB.Location = new System.Drawing.Point(295, 199);
this.Sc_HZQLCGKB.Name = "Sc_HZQLCGKB";
- this.Sc_HZQLCGKB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_HZQLCGKB.Size = new System.Drawing.Size(83, 83);
this.Sc_HZQLCGKB.TabIndex = 6;
this.Sc_HZQLCGKB.Tag = "缂烘枡姹囨�荤湅鏉�";
this.Sc_HZQLCGKB.UseVisualStyleBackColor = true;
@@ -277,10 +264,9 @@
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(841, 180);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(631, 144);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(110, 24);
+ this.label11.Size = new System.Drawing.Size(93, 19);
this.label11.TabIndex = 79;
this.label11.Text = "鍙戣揣鐪嬫澘";
//
@@ -288,10 +274,9 @@
//
this.Sc_BRFHKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_BRFHKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_BRFHKB.Image")));
- this.Sc_BRFHKB.Location = new System.Drawing.Point(847, 54);
- this.Sc_BRFHKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_BRFHKB.Location = new System.Drawing.Point(635, 43);
this.Sc_BRFHKB.Name = "Sc_BRFHKB";
- this.Sc_BRFHKB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_BRFHKB.Size = new System.Drawing.Size(83, 83);
this.Sc_BRFHKB.TabIndex = 4;
this.Sc_BRFHKB.Tag = "鍙戣揣鐪嬫澘";
this.Sc_BRFHKB.UseVisualStyleBackColor = true;
@@ -303,10 +288,9 @@
this.label12.BackColor = System.Drawing.Color.Transparent;
this.label12.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(841, 566);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(631, 453);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(110, 24);
+ this.label12.Size = new System.Drawing.Size(93, 19);
this.label12.TabIndex = 81;
this.label12.Text = "閫�鍑虹郴缁�";
//
@@ -314,10 +298,9 @@
//
this.cmdClose.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdClose.Image = ((System.Drawing.Image)(resources.GetObject("cmdClose.Image")));
- this.cmdClose.Location = new System.Drawing.Point(847, 440);
- this.cmdClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdClose.Location = new System.Drawing.Point(635, 352);
this.cmdClose.Name = "cmdClose";
- this.cmdClose.Size = new System.Drawing.Size(111, 104);
+ this.cmdClose.Size = new System.Drawing.Size(83, 83);
this.cmdClose.TabIndex = 12;
this.cmdClose.Tag = "閫�鍑虹郴缁�";
this.cmdClose.UseVisualStyleBackColor = true;
@@ -329,10 +312,9 @@
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(388, 566);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(291, 453);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(110, 24);
+ this.label13.Size = new System.Drawing.Size(93, 19);
this.label13.TabIndex = 85;
this.label13.Text = "閰嶆枡鐪嬫澘";
//
@@ -342,10 +324,9 @@
this.label14.BackColor = System.Drawing.Color.Transparent;
this.label14.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(135, 566);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(101, 453);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(160, 24);
+ this.label14.Size = new System.Drawing.Size(135, 19);
this.label14.TabIndex = 84;
this.label14.Text = "妫�娴嬭繘搴︾湅鏉�";
//
@@ -353,10 +334,9 @@
//
this.Sc_WorkBillProcMaterReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillProcMaterReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillProcMaterReportKB.Image")));
- this.Sc_WorkBillProcMaterReportKB.Location = new System.Drawing.Point(393, 440);
- this.Sc_WorkBillProcMaterReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillProcMaterReportKB.Location = new System.Drawing.Point(295, 352);
this.Sc_WorkBillProcMaterReportKB.Name = "Sc_WorkBillProcMaterReportKB";
- this.Sc_WorkBillProcMaterReportKB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_WorkBillProcMaterReportKB.Size = new System.Drawing.Size(83, 83);
this.Sc_WorkBillProcMaterReportKB.TabIndex = 83;
this.Sc_WorkBillProcMaterReportKB.Tag = "閰嶆枡鐪嬫澘";
this.Sc_WorkBillProcMaterReportKB.UseVisualStyleBackColor = true;
@@ -366,10 +346,9 @@
//
this.Sc_WorkBillProcTestReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillProcTestReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillProcTestReportKB.Image")));
- this.Sc_WorkBillProcTestReportKB.Location = new System.Drawing.Point(161, 440);
- this.Sc_WorkBillProcTestReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillProcTestReportKB.Location = new System.Drawing.Point(121, 352);
this.Sc_WorkBillProcTestReportKB.Name = "Sc_WorkBillProcTestReportKB";
- this.Sc_WorkBillProcTestReportKB.Size = new System.Drawing.Size(111, 104);
+ this.Sc_WorkBillProcTestReportKB.Size = new System.Drawing.Size(83, 83);
this.Sc_WorkBillProcTestReportKB.TabIndex = 82;
this.Sc_WorkBillProcTestReportKB.Tag = "妫�娴嬭繘搴︾湅鏉�";
this.Sc_WorkBillProcTestReportKB.UseVisualStyleBackColor = true;
@@ -377,11 +356,11 @@
//
// MESMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
- this.ClientSize = new System.Drawing.Size(1117, 788);
+ this.ClientSize = new System.Drawing.Size(838, 630);
this.Controls.Add(this.label13);
this.Controls.Add(this.label14);
this.Controls.Add(this.Sc_WorkBillProcMaterReportKB);
@@ -407,7 +386,6 @@
this.Controls.Add(this.Sc_MESBeginWorkBill_Fast);
this.Controls.Add(this.Sc_ICMOBillList_K3);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MESMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "娆цMES绯荤粺";
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
index 55b75bb..2fe99f9 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
@@ -83,6 +83,8 @@
{
//WorkM.Sc_ICMOBillList_K3 oSc_ICMOBillList_K3 = new WorkM.Sc_ICMOBillList_K3();
//oSc_ICMOBillList_K3.Show();
+ Kanban.Sc_CGKB oSc_CGKB = new Kanban.Sc_CGKB();
+ oSc_CGKB.ShowDialog();
}
private void Sc_MESBeginWorkBill_Fast_Click(object sender, EventArgs e)
@@ -111,14 +113,14 @@
private void Sc_WorkBillPlanReportKB_Click(object sender, EventArgs e)
{
- Kanban.Sc_WorkBillPlanReportKB oSc_WorkBillPlanReportKB = new Kanban.Sc_WorkBillPlanReportKB();
- oSc_WorkBillPlanReportKB.ShowDialog();
+ Kanban.Sc_CJKB oSc_CJKB = new Kanban.Sc_CJKB();
+ oSc_CJKB.ShowDialog();
}
private void Sc_WorkBillPlanSumReportKB_Click(object sender, EventArgs e)
{
- Kanban.Sc_WorkBillPlanSumReportKB oSc_WorkBillPlanSumReportKB = new Kanban.Sc_WorkBillPlanSumReportKB();
- oSc_WorkBillPlanSumReportKB.ShowDialog();
+ Kanban.Sc_QLKB oSc_QLKB = new Kanban.Sc_QLKB();
+ oSc_QLKB.ShowDialog();
}
private void cmdClose_Click(object sender, EventArgs e)
@@ -186,6 +188,22 @@
oSc_WorkBillProcTimeReportKB2.ShowDialog();
}
+ private void label1_Click(object sender, EventArgs e)
+ {
+ Kanban.Sc_CGKB oSc_CGKB = new Kanban.Sc_CGKB();
+ oSc_CGKB.ShowDialog();
+ }
+ private void label6_Click(object sender, EventArgs e)
+ {
+ Kanban.Sc_CJKB oSc_CJKB = new Kanban.Sc_CJKB();
+ oSc_CJKB.ShowDialog();
+ }
+
+ private void label7_Click(object sender, EventArgs e)
+ {
+ Kanban.Sc_QLKB oSc_QLKB = new Kanban.Sc_QLKB();
+ oSc_QLKB.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index d313bbe..e9ab141 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -172,6 +172,10 @@
{
omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl") //校验-是否校对仓库仓位
+ {
+ omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
@@ -480,6 +484,10 @@
{
omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl") //校验-是否校对仓库仓位
+ {
+ omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index bc770e9..16be230 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -30,6 +30,7 @@
public string Kf_MateOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
//生产退料
public string Kf_MateOutBackBill_AutoCheck;
public string Kf_MateOutBackBill_ERPMode;
@@ -120,6 +121,7 @@
public string Kf_MoveStockBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位
//补料单
public string Kf_MateReplenishOutBill_AutoCheck;
public string Kf_MateReplenishOutBill_ERPMode;
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 360a756..5685cea 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -561,24 +561,6 @@
<Compile Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterOut_M.designer.cs">
<DependentUpon>Kf_BarCodeBackInfoReport_MaterOut_M.cs</DependentUpon>
</Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_QLKB.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_QLKB.designer.cs">
- <DependentUpon>Sc_QLKB.cs</DependentUpon>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CJKB.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CJKB.designer.cs">
- <DependentUpon>Sc_CJKB.cs</DependentUpon>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CGKB.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CGKB.designer.cs">
- <DependentUpon>Sc_CGKB.cs</DependentUpon>
- </Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.cs">
<SubType>Form</SubType>
</Compile>
@@ -1052,18 +1034,6 @@
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterOut_M.resx">
<DependentUpon>Kf_BarCodeBackInfoReport_MaterOut_M.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_QLKB.resx">
- <DependentUpon>Sc_QLKB.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_CJKB.resx">
- <DependentUpon>Sc_CJKB.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_CGKB.resx">
- <DependentUpon>Sc_CGKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.resx">
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_CJKB.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_CJKB.cs"
index cd31e21..0f2dc9b 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_CJKB.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_CJKB.cs"
@@ -72,77 +72,100 @@
{
try
{
- ClsCN SubCn = new ClsCN();
- string sSql = "";
- string sWhere = "";
- //杩囨护鏉′欢
- //if (frmCondition.SqlStr.Trim().Length == 0)
+ //ClsCN SubCn = new ClsCN();
+ //string sSql = "";
+ //string sWhere = "";
+ ////杩囨护鏉′欢
+ ////if (frmCondition.SqlStr.Trim().Length == 0)
+ //// return;
+ ////sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
+ //sSql = "exec h_p_CJKB ";
+ ////
+ //DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ ////鐢熸垚棣栬鏍囬
+ //if (DSet == null)
+ //{
+ // //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
// return;
- //sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
- sSql = "exec h_p_CJKB ";
- //
- DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚棣栬鏍囬
- if (DSet == null)
+ //}
+ ////閲婃斁鍐荤粨
+ //DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
+ ////
+ //grdMain.DataSource = DSet.Tables[0].DefaultView;
+ ////
+
+ ////-----------棰勮鐘舵��
+ ////寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ ////瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ ////int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ ////int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ ////int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ ////DateTime oNow = DateTime.Today.Date;
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ //// }
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ //// }
+ ////}
+
+ ////璁剧疆鍚堣鍒�
+ //string sTotalCol = "";
+ //sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ //string[] sT;
+ //sT = sTotalCol.Split(Convert.ToChar(","));
+ //oSumGrid.BuildTotalCols(sT);
+ ////
+ ////鍐荤粨
+ //int FrCol = 10;
+ //string s = "鏄�";
+ //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ ////鐢荤嚎
+ ////GraphLine();
+
+ ////Total();
+
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (i % 2 == 0)
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ ////}
+ ////
+ ///
+
+ ClsCN clsCN = new ClsCN();
+ ClsIni clsIni = new ClsIni();
+ string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp.ini");
+ this.sDeptID = text;
+ string procName = "exec h_p_CJKB " + this.sDeptID;
+ this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+ bool flag = this.DSet == null;
+ if (!flag)
{
- //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
- return;
+ Xt_BaseBillFun.CancelFrozenCol(this.grdMain);
+ this.grdMain.DataSource = this.DSet.Tables[0].DefaultView;
+ string totalCols = Gy_BaseFun.GetTotalCols(this.DSet);
+ string[] cols = totalCols.Split(new char[]
+ {
+ Convert.ToChar(",")
+ });
+ this.oSumGrid.BuildTotalCols(cols);
+ int frCol = 10;
+ string s = "鏄�";
+ Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
}
- //閲婃斁鍐荤粨
- DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
- //
- grdMain.DataSource = DSet.Tables[0].DefaultView;
- //
-
- //-----------棰勮鐘舵��
- //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
- //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
- //int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
- //int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
- //int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
- //DateTime oNow = DateTime.Today.Date;
- //for (int i = 0; i < grdMain.Rows.Count; i++)
- //{
- // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
- // {
- // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
- // }
- // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
- // {
- // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- // }
- //}
-
- //璁剧疆鍚堣鍒�
- string sTotalCol = "";
- sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
- string[] sT;
- sT = sTotalCol.Split(Convert.ToChar(","));
- oSumGrid.BuildTotalCols(sT);
- //
- //鍐荤粨
- int FrCol = 10;
- string s = "鏄�";
- DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
- //鐢荤嚎
- //GraphLine();
-
- //Total();
-
- //for (int i = 0; i < grdMain.Rows.Count; i++)
- //{
- // if (i % 2 == 0)
- // {
- // grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
- // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
- // }
- // else
- // {
- // grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
- // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
- // }
- //}
- //
}
catch (Exception e)
{
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 6a2c94e..d249490 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -685,7 +685,7 @@
string HMaterNumber = ""; //鐗╂枡浠ｇ爜
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
- int HBQty = 0; //绠辨暟
+ Int64 HBQty = 0; //绠辨暟
double HQty = 0; //鏁伴噺
string WeiShu = ""; //灏炬暟
Int64 LSH = 0; //娴佹按鍙�
@@ -701,7 +701,7 @@
string HBarCodeBatchNo = ""; //鏉＄爜鎵规鍙�
string HBarCodeDate = ""; //鏉＄爜鏃ユ湡
int k = 0;
- int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ Int64 n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
DataSet Ds;
//Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
@@ -748,7 +748,7 @@
sTMNumber = HNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else if (CampanyName == "椋為緳")
{
@@ -763,7 +763,7 @@
sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else //閫氱敤鏂规硶
{
@@ -771,7 +771,7 @@
sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
}
else if (cmbHBarCodeType.Text == "鍝佺鏉＄爜")
@@ -795,7 +795,7 @@
sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 4;
}
else if (cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉＄爜瑙勫垯") //鍙﹀澶勭悊浜�
@@ -804,7 +804,7 @@
//sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
//Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
// //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ //LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
{
@@ -812,7 +812,7 @@
sTMNumber = HMaterNumber + HBatchNo ;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 6;
}
else if (cmbHBarCodeType.Text == "鍐呴攢鏈烘潯鐮�")
@@ -822,7 +822,7 @@
sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00" ;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 5;
if (sTMNumber.Length != 16)
{
@@ -837,7 +837,7 @@
sTMNumber = HMaterNumber.Replace( "." , "" ) + HBarCodeDate + HBarCodeBatchNo;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 5;
if (sTMNumber.Length != 18)
{
@@ -851,7 +851,7 @@
sTMNumber = HICMOBillNo;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 5;
}
//else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
@@ -864,7 +864,7 @@
return;
}
- HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
n = 0;
@@ -1165,7 +1165,7 @@
string HMaterNumber = ""; //鐗╂枡浠ｇ爜
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
- int HBQty = 0; //绠辨暟
+ Int64 HBQty = 0; //绠辨暟
double HQty = 0; //鏁伴噺
string WeiShu = ""; //灏炬暟
//int LSH = 0; //娴佹按鍙�
@@ -1216,7 +1216,7 @@
// return;
//}
- HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
n = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 151259c..501f383 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -382,7 +382,6 @@
string HEmpRate = list[0].HEmpRate ?? "";
string HExamRate = list[0].HExamRate ?? "";
DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1");
-
////鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index d04ecdf..5c468b7 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -8,6 +8,8 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using Newtonsoft.Json;
+
namespace WebAPI.Controllers
{
public class Gy_WorkCenterController : ApiController
@@ -18,15 +20,15 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
- /// 杩斿洖宸ヤ綔涓績鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
+ /// 宸ヤ綔涓績鍔ㄦ�佸垪
/// </summary>
- [Route("Gy_WorkCenter/list")]
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Gy_WorkCenter/Gy_WorkCenterDyCollist")]
[HttpGet]
- public object list(string sWhere,string user)
+ public object Gy_WorkCenterDyCollist(string sWhere,string user)
{
try
{
@@ -40,33 +42,21 @@
return objJsonResult;
}
- if (sWhere == null || sWhere.Equals(""))
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList where 1 = 1 " + sWhere + " order by 宸ヤ綔涓績浠ｇ爜 ", "h_v_WorkCenterList");
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- ds = oCN.RunProcReturn("select * from h_v_WorkCenterList order by 宸ヤ綔涓績浠ｇ爜 ", "h_v_WorkCenterList");
- }
- else
- {
- string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by 宸ヤ綔涓績浠ｇ爜 ";
- ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -79,6 +69,48 @@
}
/// <summary>
+ /// 杩斿洖宸ヤ綔涓績鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkCenter/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList where 1 = 1 " + sWhere + " order by 宸ヤ綔涓績浠ｇ爜 ", "h_v_WorkCenterList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
+ /// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs"
new file mode 100644
index 0000000..b9adbec
--- /dev/null
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs"
@@ -0,0 +1,171 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using WebAPI.Utility;
+
+namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
+{
+ public static class DataHelper
+ {
+ public static List<T> ToModelList<T>(this DataSet ds) where T : new()
+ {
+ try
+ {
+ List<T> list = new List<T>();
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ list.Add(row.Put(new T()));
+ }
+ }
+ return list;
+ }
+ catch (Exception ex)
+ {
+ throw;
+ }
+ }
+
+ public static List<T> ToModelList<T>(this DataTable dt) where T : new()
+ {
+ try
+ {
+ List<T> list = new List<T>();
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow row in dt.Rows)
+ {
+ list.Add(row.Put(new T()));
+ }
+ }
+ return list;
+ }
+ catch (Exception ex)
+ {
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖涓�鏉℃暟鎹殑Model
+ /// </summary>
+ /// <typeparam name="T">Model绫诲瀷</typeparam>
+ /// <param name="entity">Model绫诲瀷</param>
+ /// <param name="ds"></param>
+ /// <returns></returns>
+ public static T ToModel<T>(DataSet ds) where T : new()
+ {
+ try
+ {
+ T m = new T();
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ m = ds.Tables[0].Rows[0].Put(new T());
+ }
+ return m;
+ }
+ catch (Exception)
+ {
+ return default(T);
+ //throw;
+ }
+ }
+
+ public static T Put<T>(this DataRow row, T entity) where T : new()
+ {
+ if (entity == null)
+ {
+ entity = new T();
+ }
+ Type type = typeof(T);
+ PropertyInfo[] pi = type.GetProperties();
+ foreach (PropertyInfo item in pi)
+ {
+ int index = row.Table.Columns.IndexOf(item.Name);
+ if (index != -1)
+ {
+ if (row[item.Name] != null && row[item.Name] != DBNull.Value)
+ {
+ if (item.PropertyType == typeof(DateTime))
+ {
+ //濡傛灉瀵规棩鏈熸牸寮忔湁鐗规畩瑕佹眰 鍙互鍦ㄨ繖閲岃浆鎹�
+ item.SetValue(entity, Convert.ToDateTime(row[item.Name].ToString()), null);
+ }
+ else
+ {
+ item.SetValue(entity, ChangeType(row[item.Name], item.PropertyType), null);
+ }
+ }
+ }
+ }
+ return entity;
+ }
+
+ public static object ChangeType(object obj, Type conversionType)
+ {
+ return ChangeType(obj, conversionType, Thread.CurrentThread.CurrentCulture);
+ }
+
+ public static object ChangeType(object obj, Type conversionType, IFormatProvider provider)
+ {
+
+ #region Nullable
+ Type nullableType = Nullable.GetUnderlyingType(conversionType);
+ if (nullableType != null)
+ {
+ if (obj == null)
+ {
+ return null;
+ }
+ return Convert.ChangeType(obj, nullableType, provider);
+ }
+ #endregion
+ if (typeof(System.Enum).IsAssignableFrom(conversionType))
+ {
+ return Enum.Parse(conversionType, obj.ToString());
+ }
+ return Convert.ChangeType(obj, conversionType, provider);
+ }
+
+
+
+ public static string ToListParam<T>(this List<T> list)
+ {
+ string str = string.Empty;
+ foreach (var item in list)
+ {
+ str += $"'{item}',";
+ }
+ str = str.TrimEnd(',');
+ str = $"({str})";
+ return str;
+ }
+
+
+ public static string GetUpdateStr(string table, Dictionary<string, object> dic, string condition)
+ {
+ var strSet = string.Empty;
+ foreach (var item in dic)
+ {
+ var type = Util.GetObjectType(item.Value);
+ switch (type)
+ {
+ case "string":
+ case "date":
+ strSet += $" {item.Key}='{item.Value}' ";
+ break;
+ default:
+ strSet += $" {item.Key}={item.Value} ";
+ break;
+ }
+ }
+ return $"update {table} set {strSet} where 1=1 {condition}";
+ }
+ }
+}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 08618dc..b38c925 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -7,11 +7,13 @@
using WebAPI.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Diagnostics;
namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
{
public class JIT_DayPlanPlatFormBillController : ApiController
{
+ List<PRD_Inventory> ListInventory;//搴撳瓨鏄庣粏
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
@@ -22,7 +24,7 @@
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏌ヨ
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList")]
[HttpGet]
- public object JIT_DayPlanPlatFormBillList(string sWhere,string user)
+ public object JIT_DayPlanPlatFormBillList(string sWhere, string user)
{
try
{
@@ -38,8 +40,45 @@
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
- ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID==null?0: omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
+ ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
$",'{omdelMian.HPlanEndDate.AddDays(1).AddSeconds(-1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID鏌ヨ 榻愬鐘舵�� 鍜� 閿佸畾鐘舵��
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHinterIDList(string sWhere,int num)
+ {
+ try
+ {
+ if (num == 1)
+ {
+ ds = oCN.RunProcReturn($"select isnull(DATEDIFF(DAY,GETDATE(),CONVERT(varchar(10),max(HMasterDate),20)),0) DayNum from Sc_WorkBillSortBillSub where HInterID in ({sWhere}) and HMasterDate>=CONVERT(varchar(10),GETDATE(),20) and HLockedSub=1", "Sc_WorkBillSortBillSub");
+ }
+ else if (num == 2)
+ {
+ ds = oCN.RunProcReturn($"select CONVERT(varchar(10),HMasterDate,20) HMasterDate,HComplete,HInterID from Sc_WorkBillSortBillSub where HInterID in ({sWhere}) and HMasterDate>=CONVERT(varchar(10),GETDATE(),20) and (HComplete='榻愬' or HComplete='鏈綈濂�') ", "Sc_WorkBillSortBillSub");
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -149,11 +188,11 @@
var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
- if (HSourceID=="")
+ if (HSourceID == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊i+1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -278,5 +317,812 @@
return objJsonResult;
}
#endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 榻愬鍒嗘瀽
+
+ #region 娓呭崟閰嶆枡鏂瑰紡
+ public class PRD_PPBOM
+ {
+
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗旻ID
+ /// </summary>
+ public long HInterID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁咶EntryID
+ /// </summary>
+ public long HEntryID { get; set; }
+ /// <summary>
+ /// 鐢熶骇鐢ㄦ枡娓呭崟鍗曞彿
+ /// </summary>
+ public string HBillNo { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍗曞彿
+ /// </summary>
+ public string HICMOBillNo { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍐呯爜
+ /// </summary>
+ public string HICMOInterID { get; set; }
+ /// <summary>
+ /// 鐖剁骇鐗╂枡ID
+ /// </summary>
+ public string FMaterialID { get; set; }
+ /// <summary>
+ /// 鐖剁骇鐗╂枡鏁伴噺
+ /// </summary>
+ public decimal FQty { get; set; }
+ /// <summary>
+ /// 瀛愰」鐗╂枡ID
+ /// </summary>
+ public string FMATERIALID2 { get; set; }
+ /// <summary>
+ /// 瀛愰」鐗╂枡鍚嶇О
+ /// </summary>
+ public string FNumber { get; set; }
+ /// <summary>
+ /// 闇�姹傛暟閲�
+ /// </summary>
+ public decimal FNeedQty { get; set; }
+ /// <summary>
+ /// 鍗虫椂搴撳瓨
+ /// </summary>
+ public decimal FBASEQTY { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇璁㈠崟涓荤爜
+ /// </summary>
+ public string HICMOInterID_Sec { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟瀛愮爜
+ /// </summary>
+ public string HICMOEntryID_Sec { get; set; }
+
+ /// <summary>
+ /// 鏃ヨ鍒掓暟閲�
+ /// </summary>
+ public string HQty { get; set; }
+
+ /// <summary>
+ /// 鏃ヨ鍒掓棩鏈�
+ /// </summary>
+ public DateTime HMasterDate { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟绛夌骇
+ /// </summary>
+ public string HOrderLev { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public string FStockOrgId { get; set; }
+ /// <summary>
+ /// 缁勭粐鍚嶇О
+ /// </summary>
+ public string OrgFnumber { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅鐢ㄩ噺
+ /// </summary>
+ public decimal dwyl { get; set; }
+
+ /// <summary>
+ /// 棰勮娑堣�楃敤閲�
+ /// </summary>
+ public decimal PlanCount { get; set; }
+ /// <summary>
+ /// 鐗╂枡灞炴��
+ /// </summary>
+ public int FErpClsID { get; set; }
+
+ /// <summary>
+ /// 杞﹂棿
+ /// </summary>
+ public string HWorkShopID { get; set; }
+
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ public string FHWorkShopNumber { get; set; }
+
+
+ }
+ #endregion
+
+ #region 鍗虫椂搴撳瓨
+ public class PRD_Inventory
+ {
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ public string FMATERIALID { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string FNumber { get; set; }
+ /// <summary>
+ /// 鍗虫椂搴撳瓨
+ /// </summary>
+ public decimal FBASEQTY { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public string FStockOrgId { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨璐т富绫诲瀷
+ /// </summary>
+ public string FOwnerTypeId { get; set; }
+ /// <summary>
+ /// 搴撳瓨璐т富
+ /// </summary>
+ public string FOwnerId { get; set; }
+
+ /// <summary>
+ /// 璐т富缂栫爜
+ /// </summary>
+ public string FOwnerNumber { get; set; }
+
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ public string FSTOCKID { get; set; }
+
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ public string FStockNumber { get; set; }
+ }
+ #endregion
+
+ #region 杞﹂棿浠撳簱瀵圭収鍒楄〃
+ public class PRD_WorkHouseCompar
+ {
+ /// <summary>
+ /// 缁勭粐
+ /// </summary>
+ public string FORGID { get; set; }
+ /// <summary>
+ /// 杞﹂棿
+ /// </summary>
+ public string FWORKSHOPID { get; set; }
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ public string FSTOCKID { get; set; }
+ }
+ #endregion
+
+ #region 鏃ヨ鍒�+鐢熶骇璁㈠崟
+ public class DayPlanPickedModel
+ {
+ /// <summary>
+ /// 璁㈠崟鍏ュ簱鏁伴噺 鎸夌収鐢熶骇璁㈠崟鏄庣粏琛�
+ /// </summary>
+ public decimal FCXStockInQty { get; set; }
+ /// <summary>
+ /// 涓荤敓浜ц鍗曞瓙鍐呯爜
+ /// </summary>
+ public string FPRDMOENTYID { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍗曚綅鐢ㄩ噺
+ /// </summary>
+ public decimal dwyl { get; set; }
+ /// <summary>
+ /// 宸查鏁伴噺
+ /// </summary>
+ public decimal FPickedQty { get; set; }
+ /// <summary>
+ /// 鍓╀綑鍙敤鏁伴噺
+ /// </summary>
+ public decimal FRemainPickedQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡
+ /// </summary>
+ public string FMATERIALID { get; set; }
+
+ }
+ #endregion
+
+ #region 瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
+ public class CompleteAnalysisTempModel
+ {
+ /// <summary>
+ /// 涓荤敓浜ц鍗曚富鍐呯爜锛欶HMainICMOInterIDr
+ /// </summary>
+ public string FHMainICMOInterIDr { get; set; }
+ /// <summary>
+ /// 涓荤敓浜ц鍗曞瓙鍐呯爜锛欶HMainICMOEntryID
+ /// </summary>
+ public string FHMainICMOEntryID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掕鍗曚富鍐呯爜锛欶HICMOInterID
+ /// </summary>
+ public string FHICMOInterID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掕鍗曞瓙鍐呯爜锛欶HICMOEntryID
+ /// </summary>
+ public string FHICMOEntryID { get; set; }
+ /// <summary>
+ /// 瀛愪欢鐗╂枡锛欶HMaterID
+ /// </summary>
+ public string FHMaterID { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐锛欶HStockOrgID
+ /// </summary>
+ public string FHStockOrgID { get; set; }
+
+ /// <summary>
+ ///鐢熶骇缁勭粐锛欶HPRDORGID
+ /// </summary>
+ public string FHPRDORGID { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙凤細FPRDBillNo
+ /// </summary>
+ public string FPRDBillNo { get; set; }
+ /// <summary>
+ /// 鏍囪瘑
+ /// </summary>
+ public string FIdentificat { get; set; }
+ /// <summary>
+ /// 璐т富鍚嶇О锛欶OwnerName
+ /// </summary>
+ public string FOwnerName { get; set; }
+ /// <summary>
+ /// 璐т富缂栫爜锛欶OwnerId
+ /// </summary>
+ public string FOwnerId { get; set; }
+ /// <summary>
+ /// 璐т富绫诲瀷锛欶OwnerTypeId
+ /// </summary>
+ public string FOwnerTypeId { get; set; }
+ /// <summary>
+ /// 榻愬鐘舵��
+ /// </summary>
+ public string FComPlete { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string FHUseQty { get; set; }
+ /// <summary>
+ /// 鍙婃椂搴撳瓨鏁伴噺锛欶HStockQty
+ /// </summary>
+ public decimal FHStockQty { get; set; }
+ /// <summary>
+ ///鍙敤鏁伴噺锛欶HLeftQty
+ /// </summary>
+ public decimal FHLeftQty { get; set; }
+
+ /// <summary>
+ /// 缂烘枡鏁伴噺
+ /// </summary>
+ public decimal FLackCount { get; set; }
+ /// <summary>
+ /// 鍗犵敤鏁伴噺
+ /// </summary>
+ public decimal FOccupyCount { get; set; }
+ /// <summary>
+ /// 鍗犵敤棰嗘枡鏁伴噺
+ /// </summary>
+ public decimal FOccupyPickedCount { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅鐢ㄩ噺锛欶UnitDosage
+ /// </summary>
+ public decimal FUnitDosage { get; set; }
+ /// <summary>
+ /// 璁″垝鎬绘暟閲忥細FSumPlanCount
+ /// </summary>
+ public decimal FSumPlanCount { get; set; }
+ /// <summary>
+ /// 榻愬鏁伴噺锛欶CompleteCount q
+ /// </summary>
+ public decimal FCompleteCount { get; set; }
+ public decimal FCompleteCount1 { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓棩鏈�
+ /// </summary>
+ public DateTime FPlanDate { get; set; }
+ //鐗╂枡绫诲瀷
+ public int FErpClsID { get; set; }
+ //浠撳簱
+ public string FStock { get; set; }
+ //杞﹂棿
+ public string FWorkShop { get; set; }
+
+ }
+ #endregion
+
+ [Route("JIT_DayPlanPlatFormBill/JIT_CompleteSetAnalysis")]
+ [HttpGet]
+ public object JIT_CompleteSetAnalysis(string sWhere, string user)
+ {
+ try
+ {
+ oCN.BeginTran();
+ Stopwatch sw = new Stopwatch();
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+ string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
+ ds = oCN.RunProcReturn(sql, "JIT_qtfx");
+ LogService.Write("榻愬鍒嗘瀽sql:" + sql);
+ List<PRD_PPBOM> BomList = new List<PRD_PPBOM>();
+ DataTable resulTable = ds.Tables[0];
+ if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
+ {
+ return resulTable.Rows[0][0].ToString();
+ }
+ else
+ {
+ BomList = ds.ToModelList<PRD_PPBOM>();
+ }
+
+ string fDayPlanFids = string.Empty;
+ string fDayPlanFEntryids = string.Empty;
+ if (BomList.Count == 0)
+ {
+ return "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ }
+ else
+ {
+ List<string> fidList = BomList.Select(x => x.HInterID.ToString()).Distinct().ToList();
+ List<string> fentryidList = BomList.Select(x => x.HEntryID.ToString()).Distinct().ToList();
+ fDayPlanFids = string.Join(",", fidList);
+ fDayPlanFEntryids = string.Join(",", fentryidList);
+ }
+ LogService.Write("鏃ヨ鍒掑伐鍗昳ds" + fDayPlanFids);
+
+ sw.Start();//寮�濮嬭鏃�
+
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨 搴撳瓨鏁伴噺+搴撳瓨缁勭粐+鐗╂枡+璐т富+浠撳簱
+ ds = oCN.RunProcReturn(@"
+select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber from
+(
+select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.HInterID = b.HInterID
+join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
+LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
+join AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
+) T1
+JOIN AIS20210811135644..T_BD_MATERIAL b on t1.FNUMBER = b.FNUMBER
+LEFT JOIN AIS20210811135644..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
+LEFT join (select distinct fitemid,fformid,FNUMBER from AIS20210811135644..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
+join AIS20210811135644..t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where a.FBASEQTY>0
+", "SC_WORKBILLSORTBILLMAIN");
+ ListInventory = ds.ToModelList<PRD_Inventory>();
+ //杞﹂棿 浠撳簱瀵圭収鍒楄〃
+ ds = oCN.RunProcReturn(@"
+SELECT DISTINCT T1.HOrgId FORGID,HWorkShopID FWORKSHOPID,HWHID FSTOCKID FROM Gy_WorkWarehouseBillMain T1
+JOIN Gy_WorkWarehouseBillMainSub T2 ON T1.HInterID=T2.HInterID
+", "Gy_WorkWarehouseBillMain");
+ List<PRD_WorkHouseCompar> pRD_WorkHouseCompar = ds.ToModelList<PRD_WorkHouseCompar>();
+ int i = 1;//鐢ㄤ簬杩涘害鏉＄殑鍔犺浇
+ //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
+ var DatePlanList = BomList.GroupBy(p => new { p.HMasterDate, p.HICMOEntryID_Sec }).Select(x => new PRD_PPBOM { HMasterDate = x.Key.HMasterDate, HICMOEntryID_Sec = x.Key.HICMOEntryID_Sec }).ToList();
+ //鍙栧簲鍙戞暟閲� FMustQty 涓嶈鍙栧�奸渶姹傛暟閲廎NeedQty 棰嗘枡鏁版嵁
+ string LLsql = string.Format(@"
+select max(t1.FCXStockInQty)FCXStockInQty,FPRDMOENTYID,max(dwyl)dwyl,sum(FPickedQty)FPickedQty,sum(FRemainPickedQty)FRemainPickedQty,FMATERIALID from
+(
+select a.FCXStockInQty, FPRDMOENTYID,convert( decimal(18,2),FMustQty/FQty ) as dwyl,FPickedQty,T2.FMATERIALID,
+case when convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty))< 0 then 0
+else convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty)) end as FRemainPickedQty
+ from
+(
+select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
+--where a.HInterID IN ({0})
+group by HICMOEntryID_Sec
+) a
+join AIS20210811135644..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID
+LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID
+LEFT JOIN AIS20210811135644..T_BD_MATERIAL T4 ON T2.FMATERIALID = T4.FMATERIALID
+) t1
+group by FPRDMOENTYID,FMATERIALID
+", fDayPlanFids);
+ List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
+ ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
+ DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
+ //CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
+ List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
+ //鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
+ Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
+ LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬昏鏁帮細" + BomList.Count);
+ LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬婚渶瑕佸惊鐜殑bom鏁伴噺锛�" + DatePlanList.Count);
+
+ //绗竴涓惊鐜� 鏃ヨ鍒掑伐鍗曟槑缁� 涓�澶�+涓�涓伐鍗� 涓�涓惊鐜�
+ foreach (var item in DatePlanList)
+ {
+ //鏃ヨ鍒掔敤鏂欐竻鍗曟槑缁� 姣忎竴澶╃殑瀹為檯鐢ㄦ枡鎯呭喌
+ var _BomList = BomList.Where(x => x.HMasterDate == item.HMasterDate && x.HICMOEntryID_Sec == item.HICMOEntryID_Sec).ToList();
+ //姣忎竴涓墿鏂欒繘琛屽簱瀛樿绠�
+ foreach (var _item in _BomList)
+ {
+ //杞﹂棿浠撳簱 瀵圭収琛� 姣忎釜鏃ヨ鍒掑悓灞炰竴涓溅闂� A,B
+ var _pRD_WorkHouseCompar = pRD_WorkHouseCompar.Where(c => c.FWORKSHOPID == _item.HWorkShopID).ToList();
+ decimal jskcQty = 0;//鐢ㄤ簬璁＄畻
+ decimal jskcQty2 = 0;//鐢ㄤ簬璁＄畻褰撴椂閭ｄ釜璁＄畻鑺傜偣鐨勫嵆鏃跺簱瀛�
+ //璁＄畻褰撳墠杩欏嚑涓粨搴撴�荤殑搴撳瓨閲�
+ if (_pRD_WorkHouseCompar.Count > 0)
+ {
+ foreach (var _WorkHouse in _pRD_WorkHouseCompar)
+ {
+ //搴撳瓨鏁版嵁鍖归厤
+ List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FNumber == _item.FNumber && c.FBASEQTY > 0 && c.FSTOCKID == _WorkHouse.FSTOCKID).ToList();
+ if (_ListInventory.Count > 0)
+ {
+ foreach (var Inventory in _ListInventory)
+ {
+ jskcQty += Inventory.FBASEQTY;
+ }
+ }
+ }
+ }
+ //鎵惧嚭鐗╂枡琚叾瀹冭鍗曞崰鐢ㄦ暟閲�
+ decimal occupyMaterial = 0;
+ if (occupyDic.ContainsKey(_item.HWorkShopID + _item.FMATERIALID2))
+ {
+ occupyMaterial = occupyDic[_item.HWorkShopID + _item.FMATERIALID2];
+ }
+ //铏氭嫙鏃ヨ鍒掔敤鏂欐竻鍗� 闇�姹傛暟閲�
+ decimal planNeed = _item.PlanCount; //涓嶅弬涓庤绠� 鐢ㄤ簬璁板綍
+ decimal need = _item.PlanCount;//鍙備笌璁＄畻
+ decimal FOccupyPickedCount = 0;//鍗犵敤棰嗘枡鍗曟暟閲�
+ //鎵惧埌棰嗙敤鏁伴噺
+ var _DayPlanPickedModel = DayPlanPickedModel.Where(c => c.FPRDMOENTYID == _item.HICMOEntryID_Sec && c.FMATERIALID == _item.FMATERIALID2).FirstOrDefault();
+ if (_DayPlanPickedModel.FRemainPickedQty >= need)
+ {
+ //棰嗘枡鏁伴噺婊¤冻浜嗗綋鍓嶈繖涓渶姹傞噺 鐩存帴榻愬 涓嶉渶瑕佸幓鍗犵敤浠撳簱
+ completeAnalysisTempModel.Add(new CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.HICMOInterID_Sec,
+ FHMainICMOEntryID = _item.HICMOEntryID_Sec,
+ FHICMOInterID = _item.HInterID.ToString(),
+ FHICMOEntryID = _item.HEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FErpClsID = _item.FErpClsID,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FPRDBillNo = _item.HICMOBillNo,
+ FOwnerTypeId = "",
+ FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
+ FCompleteCount1 = planNeed, //榻愬鏁伴噺
+ FLackCount = 0,//缂烘枡鏁伴噺
+ FHStockQty = jskcQty2,//鍗虫椂搴撳瓨
+ FHLeftQty = jskcQty,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FOccupyPickedCount = planNeed,//鍗犵敤棰嗘枡鏁伴噺
+ FComPlete = "榻愬",
+ FPlanDate = item.HMasterDate, // 鏃ヨ鍒掓棩鏈�
+ FWorkShop = _item.HWorkShopID //杞﹂棿
+ });
+ //鎵ｉ櫎鍓╀綑鍙敤棰嗘枡鏁伴噺
+ _DayPlanPickedModel.FRemainPickedQty -= need;
+ //寰幆涓嬩竴涓墿鏂�
+ continue;
+ }
+ else
+ {
+ need -= _DayPlanPickedModel.FRemainPickedQty; //鍓╀綑闇�姹傛暟閲�
+ FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
+ _DayPlanPickedModel.FRemainPickedQty = 0;
+ }
+ if (_pRD_WorkHouseCompar.Count > 0)
+ {
+ //缂烘枡鏁伴噺 闇�姹傛暟閲� - 瀹為檯搴撳瓨 >0 ? 涓�涓墿鏂欎笉绠″崰鐢ㄥ灏戞潯 搴撳瓨+璐т富 鏁版嵁 缂烘枡鏁伴噺鏄悓涓�涓暟閲�
+ decimal _fLackCount = need > jskcQty ? (need - jskcQty) : 0;
+ //LogHelper.Info("缁勭粐锛�" + _item.FStockOrgId + " ,鍙婃椂搴撳瓨" + jskcQty);
+ //鎬诲簱瀛樹负0浜� 鐩存帴缁欏嚭 缂烘枡鏁伴噺
+ if (jskcQty == 0)
+ {
+ completeAnalysisTempModel.Add(new CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.HICMOInterID_Sec,
+ FHMainICMOEntryID = _item.HICMOEntryID_Sec,
+ FHICMOInterID = _item.HInterID.ToString(),
+ FHICMOEntryID = _item.HEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FErpClsID = _item.FErpClsID,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FPRDBillNo = _item.HICMOBillNo,
+ FOwnerTypeId = "",
+ FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
+ FCompleteCount1 = FOccupyPickedCount, //榻愬鏁伴噺
+ FLackCount = need,//缂烘枡鏁伴噺
+ FHStockQty = jskcQty2,//鍗虫椂搴撳瓨
+ FHLeftQty = jskcQty,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FOccupyPickedCount = FOccupyPickedCount,//鍗犵敤棰嗘枡鏁伴噺
+ FComPlete = "鏈綈濂�",
+ FPlanDate = item.HMasterDate, // 鏃ヨ鍒掓棩鏈�
+ FWorkShop = _item.HWorkShopID //杞﹂棿
+ });
+ //缁堟璇ョ墿鏂欒绠� 杩涘叆涓嬩竴涓�
+ continue;
+ }
+ foreach (var WorkHouse in _pRD_WorkHouseCompar)
+ {
+ //搴撳瓨鏁版嵁鍖归厤
+ List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FNumber == _item.FNumber && c.FBASEQTY > 0 && c.FSTOCKID == WorkHouse.FSTOCKID).ToList();
+ //闇�姹傛暟閲� 鍗犵敤瀹屽悗鍙互璺冲嚭杞﹂棿浠撳簱寰幆
+ if (need == 0)
+ break;
+ if (_ListInventory.Count > 0)
+ {
+ foreach (var Inventory in _ListInventory)
+ {
+ if (need == 0)
+ break;
+ //榻愬鏁伴噺
+ decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;
+ if (!occupyDic.ContainsKey(_item.HWorkShopID + _item.FMATERIALID2))
+ {
+ occupyDic.Add(_item.HWorkShopID + _item.FMATERIALID2, fCompleteCount);
+ }
+ else
+ {
+ occupyMaterial = occupyDic[_item.HWorkShopID + _item.FMATERIALID2];
+ occupyDic[_item.HWorkShopID + _item.FMATERIALID2] = occupyMaterial + fCompleteCount;
+ }
+ completeAnalysisTempModel.Add(new CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.HICMOInterID_Sec,
+ FHMainICMOEntryID = _item.HICMOEntryID_Sec,
+ FHICMOInterID = _item.HInterID.ToString(),
+ FHICMOEntryID = _item.HEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FErpClsID = _item.FErpClsID,
+ FPRDBillNo = _item.HICMOBillNo,
+ FOwnerTypeId = Inventory.FOwnerTypeId,
+ FOwnerId = Inventory.FOwnerId,
+ FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
+ FCompleteCount1 = fCompleteCount + FOccupyPickedCount, //榻愬鏁伴噺
+ FLackCount = _fLackCount,//缂烘枡鏁伴噺
+ FHStockQty = jskcQty2,//鍗虫椂搴撳瓨
+ FHLeftQty = jskcQty,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FOccupyPickedCount = FOccupyPickedCount,//棰嗘枡鍗犵敤鏁伴噺
+ FComPlete = jskcQty >= need ? "榻愬" : "鏈綈濂�",
+ FPlanDate = item.HMasterDate, // 鏃ヨ鍒掓棩鏈�
+ FStock = Inventory.FSTOCKID,//浠撳簱
+ FWorkShop = _item.HWorkShopID //杞﹂棿
+ });
+ //鎵ｅ噺鎬诲簱瀛樻暟閲�
+ jskcQty = jskcQty >= fCompleteCount ? jskcQty - fCompleteCount : 0;
+ //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+ need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+ //鎵ｅ噺娑堣�楀簱瀛�
+ Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+ }
+ }
+ }
+ }
+ //娌℃湁杞﹂棿浠撳簱鏁版嵁 鏃㈡病鏈夊彲鐢ㄥ簱瀛� 涓烘湭榻愬
+ else
+ {
+ if (occupyDic.ContainsKey(_item.HWorkShopID + _item.FMATERIALID2))
+ {
+ occupyMaterial = occupyDic[_item.HWorkShopID + _item.FMATERIALID2];
+ }
+ completeAnalysisTempModel.Add(new CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.HICMOInterID_Sec,
+ FHMainICMOEntryID = _item.HICMOEntryID_Sec,
+ FHICMOInterID = _item.HInterID.ToString(),
+ FHICMOEntryID = _item.HEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FErpClsID = _item.FErpClsID,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FPRDBillNo = _item.HICMOBillNo,
+ FOwnerTypeId = "",
+ FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
+ FCompleteCount1 = planNeed - need, //榻愬鏁伴噺
+ FLackCount = need,//缂烘枡鏁伴噺
+ FHStockQty = jskcQty2,//鍗虫椂搴撳瓨
+ FHLeftQty = jskcQty,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FOccupyPickedCount = FOccupyPickedCount,//鍗犵敤棰嗘枡鏁伴噺
+ FComPlete = "鏈綈濂�",
+ FPlanDate = item.HMasterDate, // 鏃ヨ鍒掓棩鏈�
+ FWorkShop = _item.HWorkShopID //杞﹂棿
+ });
+ }
+ }
+ //Thread.Sleep(6000);
+ i++;
+ }
+ LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ List<string> sqlList = new List<string>();
+ DataTable insertDT = new DataTable();
+ insertDT.TableName = "JIT_MOMaterReadysBill";
+ insertDT.Columns.Add("FID", typeof(long));
+ insertDT.Columns.Add("FDOCUMENTSTATUS", typeof(string));
+ insertDT.Columns.Add("FHMAINICMOINTERIDR", typeof(long));
+ insertDT.Columns.Add("FHMAINICMOENTRYID", typeof(long));
+ insertDT.Columns.Add("FHICMOINTERID", typeof(long));
+ insertDT.Columns.Add("FHICMOENTRYID", typeof(long));
+ insertDT.Columns.Add("FHMATERID", typeof(long));
+ insertDT.Columns.Add("FHSTOCKORGID", typeof(long));
+ insertDT.Columns.Add("FHSTOCKQTY", typeof(decimal));
+ insertDT.Columns.Add("FHLEFTQTY", typeof(decimal));
+ insertDT.Columns.Add("FHPRDORGID", typeof(long));
+ insertDT.Columns.Add("FUNITDOSAGE", typeof(decimal));
+ insertDT.Columns.Add("FSUMPLANCOUNT", typeof(decimal));
+ insertDT.Columns.Add("FPRDBILLNO", typeof(string));
+ insertDT.Columns.Add("FOWNERID", typeof(long));
+ insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
+ insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
+ insertDT.Columns.Add("FCOMPLETE", typeof(string));
+ insertDT.Columns.Add("FLACKCOUNT", typeof(decimal));
+ insertDT.Columns.Add("FOCCUPYCOUNT", typeof(decimal));
+ insertDT.Columns.Add("FCOMPLETECOUNT1", typeof(decimal));
+ insertDT.Columns.Add("FERPCLSID", typeof(string));
+ insertDT.Columns.Add("FWORKSHOPID", typeof(long));
+ insertDT.Columns.Add("FSTOCKID", typeof(long));
+ insertDT.Columns.Add("FOCCUPYPICKEDCOUNT", typeof(decimal));
+ int jdtmmm = 1;
+ ds = oCN.RunProcReturn("select max(HInterID)FID FROM JIT_MOMaterReadysBill", "JIT_MOMaterReadysBill");
+ int maxFid = int.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString());
+ foreach (var item in completeAnalysisTempModel)
+ {
+ DataRow dr = insertDT.NewRow();
+ dr["FID"] = maxFid + jdtmmm;
+ dr["FDOCUMENTSTATUS"] = "A";
+ dr["FHMAINICMOINTERIDR"] = item.FHMainICMOInterIDr;
+ dr["FHMAINICMOENTRYID"] = item.FHMainICMOEntryID;
+ dr["FHICMOINTERID"] = item.FHICMOInterID;
+ dr["FHICMOENTRYID"] = item.FHICMOEntryID;
+ dr["FHMATERID"] = item.FHMaterID;
+ dr["FHSTOCKORGID"] = item.FHStockOrgID;
+ dr["FHSTOCKQTY"] = item.FHStockQty;
+ dr["FHLEFTQTY"] = item.FHLeftQty;
+ dr["FHPRDORGID"] = item.FHPRDORGID;
+ dr["FUNITDOSAGE"] = item.FUnitDosage;
+ dr["FSUMPLANCOUNT"] = item.FSumPlanCount;
+ dr["FPRDBILLNO"] = item.FPRDBillNo;
+ dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
+ dr["FOWNERTYPEID"] = item.FOwnerTypeId;
+ dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
+ dr["FCOMPLETE"] = item.FComPlete;
+ dr["FLACKCOUNT"] = item.FLackCount;
+ dr["FOCCUPYCOUNT"] = item.FOccupyCount;
+ dr["FCOMPLETECOUNT1"] = item.FCompleteCount1;
+ dr["FERPCLSID"] = item.FErpClsID;
+ dr["FWORKSHOPID"] = item.FWorkShop == null ? "0" : item.FWorkShop;
+ dr["FSTOCKID"] = item.FStock == null ? "0" : item.FStock;
+ dr["FOCCUPYPICKEDCOUNT"] = item.FOccupyPickedCount;
+ insertDT.Rows.Add(dr);
+ jdtmmm++;
+ }
+
+ insertDT.EndLoadData(); // 鐏屽叆鏁版嵁缁撴潫
+ //鎻掑叆涔嬪墠鎵ц涓嬫竻绌鸿鍙�(娴嬭瘯鏄惁鑳藉闃叉閲嶅鐢熸垚)
+ string deletesql = $"delete from JIT_MOMaterReadysBill where HICMOInterID in ({fDayPlanFids}) ";
+ oCN.RunProc(deletesql);
+ // 鎵归噺鎻掑叆鍒版暟鎹簱
+ foreach (DataRow item in insertDT.Rows)
+ {
+ oCN.RunProc("insert into JIT_MOMaterReadysBill(HInterID,HDocumentStatus,HMainICMOInterID,HMainICMOEntryID,HICMOInterID" +
+ ", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
+ ", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
+ ", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
+ ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY)values" +
+ $"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
+ $", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
+ $" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
+ $", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
+ $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()})");
+ }
+ LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
+ //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
+ string updatesql = string.Format(@"
+update Sc_WorkBillSortBillSub set HComplete = '鏈綈濂�' where HEntryID IN
+(select distinct HICMOEntryID from JIT_MOMaterReadysBill
+ where isnull(HComplete,'鏈綈濂�') ='鏈綈濂�'
+ and HICMOEntryID in ({0})
+ )", fDayPlanFEntryids);
+ //LogService.Write(Context, updatesql);
+ oCN.RunProc(updatesql);
+ updatesql = string.Format(@"
+update Sc_WorkBillSortBillSub set HComplete = '榻愬'
+where HEntryID IN ({0}) and HComplete <>'鏈綈濂�'
+", fDayPlanFEntryids);
+ //LogService.Write(updatesql);
+ oCN.RunProc(updatesql);
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+ sw.Stop();//缁撴潫璁℃椂
+ LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHLockedDay(string sWhere, int HLockedDay)
+ {
+ try
+ {
+ if (sWhere != null && sWhere != "")
+ {
+ oCN.RunProc("update Sc_WorkBillSortBillSub set HLockedSub=1" +
+ $" where HInterID in ({sWhere}) and HMasterDate between DATEADD(day, -1, getdate()) and DATEADD(day,{(HLockedDay - 1)},getdate()) ");
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 瑙ｉ攣
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockDay")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHUnlockDay(string sWhere, int HLockedDay)
+ {
+ try
+ {
+ if (sWhere != null && sWhere != "")
+ {
+ oCN.RunProc("update Sc_WorkBillSortBillSub set HLockedSub=0" +
+ $" where HInterID in ({sWhere}) and HMasterDate between DATEADD(day, -1, getdate()) and DATEADD(day,{(HLockedDay - 1)},getdate()) ");
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
index c8f9d5b..62e6f5b 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
@@ -35,7 +35,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1" + sWhere + "order by 鍗曟嵁鍙� desc ", "h_v_JIT_Sc_WorkBillSortBillList");
+ ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1" + sWhere + " order by 鍗曟嵁鍙� desc ", "h_v_JIT_Sc_WorkBillSortBillList");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index cef38b2..241d16b 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1023,7 +1023,8 @@
}
try
{
- ds = webserver.GetEmployeeList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_Emp");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "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 6d10537..a1f74c1 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"
@@ -328,8 +328,6 @@
return objJsonResult;
}
}
- //
-
/// <summary>
/// 閫氳繃鐝粍鏌ヨ鑱屽憳淇℃伅
///鍙傛暟锛歴tring sql銆�
@@ -343,7 +341,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+ objJsonResult.Message = "鐝粍鏈�夋嫨";
objJsonResult.data = null;
return objJsonResult;
}
@@ -372,6 +370,31 @@
return objJsonResult;
}
}
-
+
+ [Route("Pay_WorkTimesBill/calcAvgMoney")]
+ [HttpPost]
+ public object GetEmployeeByHGroup([FromBody] JObject msg) {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds;
+ string sql = string.Format($"exec h_p_CalcAvgMoney '{msg["msg"]}'");
+ ds = oCN.RunProcReturn(sql, "h_p_CalcAvgMoney");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 40f23cb..b125d7f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -378,6 +378,7 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
index 98e06f8..9ef9d4a 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
@@ -255,24 +255,24 @@
}
}
- for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
- {
- if (checkBox1.Checked == false)
- {
- if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("涓嶅悎鏍�") == true)
- {
- grdMain.Columns[j].Visible = false;
- }
- else
- {
- grdMain.Columns[j].Visible = true;
- }
- }
- else
- {
- grdMain.Columns[j].Visible = true;
- }
- }
+ //for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
+ //{
+ // if (checkBox1.Checked == false)
+ // {
+ // if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("涓嶅悎鏍�") == true)
+ // {
+ // grdMain.Columns[j].Visible = false;
+ // }
+ // else
+ // {
+ // grdMain.Columns[j].Visible = true;
+ // }
+ // }
+ // else
+ // {
+ // grdMain.Columns[j].Visible = true;
+ // }
+ //}
//
}
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
index bc136d3..d4691dc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
@@ -132,14 +132,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -398,6 +398,7 @@
this.chkHShowUnFinish.TabIndex = 86;
this.chkHShowUnFinish.Text = "鍙樉绀烘湭瀹屽伐";
this.chkHShowUnFinish.UseVisualStyleBackColor = true;
+ this.chkHShowUnFinish.Visible = false;
//
// checkBox1
//
@@ -408,6 +409,7 @@
this.checkBox1.TabIndex = 85;
this.checkBox1.Text = "鏄剧ず涓嶅悎鏍�";
this.checkBox1.UseVisualStyleBackColor = true;
+ this.checkBox1.Visible = false;
//
// txtHOrderProcNo
//
@@ -501,6 +503,7 @@
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(1432, 24);
@@ -517,6 +520,7 @@
this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1432, 414);
this.grdMain.TabIndex = 54;
--
Gitblit v1.9.1