....
This commit is contained in:
@@ -175,7 +175,7 @@ namespace FPJ0000
|
||||
|
||||
|
||||
var 전체건수 = 0;
|
||||
var 구매요청건T = 0;
|
||||
// var 구매요청건T = 0;
|
||||
var 구매요청건C = 0;
|
||||
var 비구매건수 = 0;
|
||||
var PR대상수량 = 0;
|
||||
@@ -385,7 +385,7 @@ namespace FPJ0000
|
||||
{
|
||||
SaveFileDialog sd = new SaveFileDialog();
|
||||
sd.Filter = "excel|*.xls";
|
||||
var fn = "partliststatus.xls";
|
||||
// var fn = "partliststatus.xls";
|
||||
if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
|
||||
{
|
||||
fpSpread1.SaveExcel(sd.FileName,
|
||||
@@ -812,7 +812,7 @@ namespace FPJ0000
|
||||
|
||||
// var serverpath = Properties.Settings.Default.SharePath + @"\Project"; //
|
||||
|
||||
if (dr.path.isEmpty() == false)
|
||||
if (String.IsNullOrEmpty(dr.path) == false)
|
||||
{
|
||||
if (dr.path.StartsWith("\\")) serverpath += dr.path;
|
||||
else serverpath += "\\" + dr.path;
|
||||
@@ -921,7 +921,7 @@ namespace FPJ0000
|
||||
//tbPDate.Text = dr.pdate;
|
||||
//tbStatus.Text = dr.status;
|
||||
|
||||
if (dr.crdue.isEmpty() == false)
|
||||
if (String.IsNullOrEmpty(dr.crdue) == false)
|
||||
{
|
||||
DateTime dt;
|
||||
if (DateTime.TryParse(dr.crdue, out dt))
|
||||
|
||||
@@ -866,12 +866,6 @@
|
||||
private System.Windows.Forms.BindingSource bsPMP;
|
||||
private dsPRJTableAdapters.SPMasterTableAdapter taPMP;
|
||||
private dsPRJTableAdapters.TableAdapterManager tam;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn idxDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn stimeDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn mainDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn projectDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.Panel panel2;
|
||||
private System.Windows.Forms.Button btFind;
|
||||
private System.Windows.Forms.TextBox tbFind;
|
||||
|
||||
@@ -382,7 +382,7 @@ namespace FPJ0000
|
||||
private void 편집ToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var currentime = this.ctlLayout1.items[this.no - 1];
|
||||
if (currentime.project == -1 && currentime.reserve.isEmpty() == false)
|
||||
if (currentime.project == -1 && String.IsNullOrEmpty(currentime.reserve) == false)
|
||||
{
|
||||
//프로젝트가 할당된 상태가 아니다.
|
||||
if (currentime.reserve != FCOMMON.info.Login.nameK)
|
||||
|
||||
@@ -352,7 +352,7 @@ namespace FPJ0000
|
||||
fProg.Show();
|
||||
fProg.Refresh();
|
||||
|
||||
int iCnt = 0;
|
||||
// int iCnt = 0;
|
||||
|
||||
//데이터를 넣는다
|
||||
var db = new EEEntities();
|
||||
|
||||
@@ -13,9 +13,8 @@ namespace FPJ0000
|
||||
{
|
||||
string fn_fpcolsize1 = "";
|
||||
string fn_fpcolsize2 = "";
|
||||
int projectindex = 0;
|
||||
int projectindex = 0;
|
||||
EEEntities db;
|
||||
List<EETGW_ProjectsSchedule> list;
|
||||
Boolean bInit = false;
|
||||
|
||||
public fProjectSchedule(int project_)
|
||||
@@ -75,6 +74,12 @@ namespace FPJ0000
|
||||
private void fProjectSchedule_Load(object sender, EventArgs e)
|
||||
{
|
||||
//프로젝트 정보 채우기
|
||||
|
||||
//var da2 = new System.Data.SqlClient.SqlDataAdapter();
|
||||
//da2.SelectCommand = new System.Data.SqlClient.SqlCommand("", ta.Connection);
|
||||
//da2.SelectCommand.CommandText = $"select * from Projects where gcode='{FCOMMON.info.Login.gcode}' and idx = {projectindex}";
|
||||
//da2.Fill(this.dsPRJ.Projects);
|
||||
//da2.Dispose();
|
||||
this.taProjectInfo.FillByIDX(this.dsPRJ.Projects, this.projectindex);
|
||||
|
||||
//스케쥴 그룹(no)
|
||||
@@ -378,10 +383,10 @@ namespace FPJ0000
|
||||
var vswa_s = list.Max(t => t.swa);
|
||||
var vewa_s = list.Max(t => t.ewa);
|
||||
|
||||
var vsw = int.Parse(vsw_s.Split('-')[1]);
|
||||
var vew = int.Parse(vew_s.Split('-')[1]);
|
||||
var vswa = int.Parse(vswa_s.Split('-')[1]);
|
||||
var vewa = int.Parse(vewa_s.Split('-')[1]);
|
||||
var vsw = int.Parse(vsw_s.Replace("-", ""));//.Split('-')[1]);
|
||||
var vew = int.Parse(vew_s.Replace("-", ""));//.Split('-')[1]);
|
||||
var vswa = int.Parse(vswa_s.Replace("-", ""));//.Split('-')[1]);
|
||||
var vewa = int.Parse(vewa_s.Replace("-", ""));//.Split('-')[1]);
|
||||
|
||||
var maxw = Math.Max(vsw, vew);
|
||||
maxw = Math.Max(maxw, vswa);
|
||||
@@ -423,26 +428,29 @@ namespace FPJ0000
|
||||
|
||||
|
||||
|
||||
var mvsw = int.Parse(mvsw_s.Split('-')[1]);
|
||||
var mvew = int.Parse(mvew_s.Split('-')[1]);
|
||||
var mvsw = int.Parse(mvsw_s.Replace("-", ""));//.Split('-')[1]);
|
||||
var mvew = int.Parse(mvew_s.Replace("-", ""));//.Split('-')[1]);
|
||||
|
||||
|
||||
var mvswa = int.Parse(mvswa_s.Split('-')[1]);
|
||||
var mvewa = int.Parse(mvewa_s.Split('-')[1]);
|
||||
var mvswa = int.Parse(mvswa_s.Replace("-", ""));//.Split('-')[1]);
|
||||
var mvewa = int.Parse(mvewa_s.Replace("-", ""));//.Split('-')[1]);
|
||||
|
||||
|
||||
var minw = 999;
|
||||
var minw = 9999;
|
||||
if (mvsw > 0) minw = Math.Min(minw, mvsw);
|
||||
if (mvew > 0) minw = Math.Min(minw, mvew);
|
||||
if (mvswa > 0) minw = Math.Min(minw, mvswa);
|
||||
if (mvewa > 0) minw = Math.Min(minw, mvewa);
|
||||
if (minw == 999) return; //값이 없다.
|
||||
if (minw == 9999) return; //값이 없다.
|
||||
|
||||
|
||||
var wwcnt = maxw - minw + 1;
|
||||
for (int i = 1; i <= wwcnt; i++)
|
||||
{
|
||||
cols.Add("ww" + (minw + i - 1).ToString());//
|
||||
var yy = (int)((minw + (i-1)) / 100);
|
||||
var ww = (minw + (i-1) - yy * 100);
|
||||
if (ww > 52 || ww < 1) continue;
|
||||
cols.Add($"{yy}y{ww}w");// "ww" + (minw + i - 1).ToString());//
|
||||
}
|
||||
|
||||
|
||||
@@ -487,24 +495,24 @@ namespace FPJ0000
|
||||
|
||||
try
|
||||
{
|
||||
sw = int.Parse(dr.sw.Split('-')[1]);
|
||||
sw = int.Parse(dr.sw.Replace("-", ""));//.Split('-')[1]); ;// ;// ; ;
|
||||
}
|
||||
catch { sw = 0; }
|
||||
|
||||
try
|
||||
{
|
||||
ew = int.Parse(dr.ew.Split('-')[1]);
|
||||
ew = int.Parse(dr.ew.Replace("-", ""));//.Split('-')[1]);//.Split('-')[1]);
|
||||
}
|
||||
catch { ew = 0; }
|
||||
try
|
||||
{
|
||||
swa = int.Parse(dr.swa.Split('-')[1]);
|
||||
swa = int.Parse(dr.swa.Replace("-", ""));//.Split('-')[1]);//.Split('-')[1]);
|
||||
}
|
||||
catch { }
|
||||
|
||||
try
|
||||
{
|
||||
ewa = int.Parse(dr.ewa.Split('-')[1]);
|
||||
ewa = int.Parse(dr.ewa.Replace("-", ""));//.Split('-')[1]);
|
||||
}
|
||||
catch { }
|
||||
|
||||
|
||||
@@ -135,8 +135,8 @@ namespace FPJ0000
|
||||
if (nudSupply.Value > 0) 공급사 = sheet.readStr(r, (int)nudSupply.Value - 1).Trim();
|
||||
if (nudName.Value > 0) 품명 = sheet.readStr(r, (int)nudName.Value - 1).Trim();
|
||||
|
||||
var qty = 0;
|
||||
var price = 0;
|
||||
// var qty = 0;
|
||||
// var price = 0;
|
||||
|
||||
//sid 공백과 - _ 제거 200506
|
||||
SID = SID.Replace(" ", "").Replace("-", "").Replace("_", "").Trim();
|
||||
|
||||
Reference in New Issue
Block a user