업무일지 입력창을 rtf 로 변경
This commit is contained in:
		| @@ -44,7 +44,7 @@ namespace FCM0000 | ||||
|             var cy = colSupply.CellType as FarPoint.Win.Spread.CellType.ComboBoxCellType; | ||||
|             List<string> items = new List<string>(); | ||||
|             List<string> itemData = new List<string>(); | ||||
|             foreach(var item in customData) | ||||
|             foreach (var item in customData) | ||||
|             { | ||||
|                 items.Add(item.name); | ||||
|                 itemData.Add(item.idx.ToString()); | ||||
| @@ -55,7 +55,7 @@ namespace FCM0000 | ||||
|  | ||||
|  | ||||
|             this.cmbSort.SelectedIndex = 0; | ||||
|             refreshData(); | ||||
|             tbSearch.Focus(); | ||||
|         } | ||||
|  | ||||
|         void cy_EditorValueChanged(object sender, EventArgs e) | ||||
| @@ -73,9 +73,19 @@ namespace FCM0000 | ||||
|             string cateSearch = "%"; | ||||
|             if (cmbCate.SelectedIndex > 0) cateSearch = cmbCate.Text; | ||||
|             if (cmbMode.SelectedIndex == 0) | ||||
|                 this.ta.FillNoImage(this.dsMSSQL.Items, FCOMMON.info.Login.gcode,cateSearch); | ||||
|             { | ||||
|                 var skey = tbSearch.Text.Trim(); | ||||
|                 if (skey == "") skey = "%"; | ||||
|                 else | ||||
|                 { | ||||
|                     if (skey.StartsWith("%") == false) skey = "%" + skey; | ||||
|                     if (skey.EndsWith("%") == false) skey += "%";  | ||||
|                 } | ||||
|  | ||||
|                 this.ta.FillNoImage(this.dsMSSQL.Items, FCOMMON.info.Login.gcode, cateSearch,skey); | ||||
|             } | ||||
|             else | ||||
|                 this.ta.FillDupCheck(this.dsMSSQL.Items, FCOMMON.info.Login.gcode,cateSearch); | ||||
|                 this.ta.FillDupCheck(this.dsMSSQL.Items, FCOMMON.info.Login.gcode, cateSearch); | ||||
|  | ||||
|             FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); | ||||
|         } | ||||
| @@ -85,7 +95,7 @@ namespace FCM0000 | ||||
|             e.Row["wuid"] = FCOMMON.info.Login.no; | ||||
|             e.Row["wdate"] = DateTime.Now; | ||||
|             e.Row["gcode"] = FCOMMON.info.Login.gcode; | ||||
|             if(this.cmbCate.SelectedIndex > 0) e.Row["cate"] = this.cmbCate.Text.Trim(); | ||||
|             if (this.cmbCate.SelectedIndex > 0) e.Row["cate"] = this.cmbCate.Text.Trim(); | ||||
|         } | ||||
|         private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) | ||||
|         { | ||||
| @@ -111,6 +121,12 @@ namespace FCM0000 | ||||
|  | ||||
|         private void toolStripButton2_Click(object sender, EventArgs e) | ||||
|         { | ||||
|             if (tbSearch.Text.Trim() == "") | ||||
|             { | ||||
|                 util.MsgE("검색어를 입력하세요\n\n자료가 많은 관계로 검색어를 입력하세요.\n\n전체 검색을 하려면 %를 입력하세요"); | ||||
|                 tbSearch.Focus(); | ||||
|                 return; | ||||
|             } | ||||
|             refreshData(); | ||||
|         } | ||||
|  | ||||
| @@ -160,7 +176,7 @@ namespace FCM0000 | ||||
|                     bs.Filter = filter; | ||||
|                     tbFind.BackColor = Color.Lime; | ||||
|                 } | ||||
|                 catch  | ||||
|                 catch | ||||
|                 { | ||||
|                     tbFind.BackColor = Color.Pink; | ||||
|                 } | ||||
| @@ -207,8 +223,8 @@ namespace FCM0000 | ||||
|         { | ||||
|             var drv = this.bs.Current as DataRowView; | ||||
|             var img = this.pictureBox1.Image; | ||||
|             if(drv == null) | ||||
|             {    | ||||
|             if (drv == null) | ||||
|             { | ||||
|                 this.pictureBox1.Image = null; | ||||
|             } | ||||
|             else | ||||
| @@ -216,23 +232,25 @@ namespace FCM0000 | ||||
|                 var dr = drv.Row as dsMSSQL.ItemsRow; | ||||
|  | ||||
|                 //이미지 확인 | ||||
|                 try { | ||||
|                 try | ||||
|                 { | ||||
|                     var img1 = FCOMMON.DBM.GetImageData("Items", "image", dr.idx); | ||||
|                     if (img1 != null) this.pictureBox1.Image = img1; | ||||
|                     else this.pictureBox1.Image = null; | ||||
|                 } catch  | ||||
|                 } | ||||
|                 catch | ||||
|                 { | ||||
|                     this.pictureBox1.Image = null; | ||||
|                 } | ||||
|  | ||||
|                 //공급처 담당자 정보 | ||||
|                 if (dr.supply != "") label4.Text =  "[" + dr.supply +"] 담당자"; | ||||
|                 if (dr.supply != "") label4.Text = "[" + dr.supply + "] 담당자"; | ||||
|                 else label4.Text = "공급처 담당자"; | ||||
|                 lvSupplyDamdang.Items.Clear(); | ||||
|                 if (dr.supplyidx != -1) | ||||
|                 { | ||||
|                     taStaff.FillByCID(this.dsMSSQL.Staff, FCOMMON.info.Login.gcode, dr.supplyidx); | ||||
|                     foreach( dsMSSQL.StaffRow item in this.dsMSSQL.Staff) | ||||
|                     foreach (dsMSSQL.StaffRow item in this.dsMSSQL.Staff) | ||||
|                     { | ||||
|                         var name = item.name; | ||||
|                         if (item.grade != "") name += "(" + item.grade + ")"; | ||||
| @@ -245,9 +263,9 @@ namespace FCM0000 | ||||
|                 //최근 입고 데이터 확인 (일자,담당,수량,금액,상태) | ||||
|                 var inData = taPurchase.GetInDate(dr.idx); | ||||
|                 lvInDate.Items.Clear(); | ||||
|                 if(inData != null && inData.Rows.Count > 0) | ||||
|                 if (inData != null && inData.Rows.Count > 0) | ||||
|                 { | ||||
|                     foreach( dsMSSQL.PurchaseRow drP  in inData.Rows) | ||||
|                     foreach (dsMSSQL.PurchaseRow drP in inData.Rows) | ||||
|                     { | ||||
|                         string date = drP.indate; | ||||
|                         if (date.Length > 9) date = date.Substring(2); | ||||
| @@ -280,22 +298,22 @@ namespace FCM0000 | ||||
|  | ||||
|         private void button1_Click(object sender, EventArgs e) | ||||
|         { | ||||
|              | ||||
|  | ||||
|         } | ||||
|  | ||||
|         private void 파일섡택ToolStripMenuItem_Click(object sender, EventArgs e) | ||||
|         { | ||||
|              | ||||
|  | ||||
|         } | ||||
|  | ||||
|         private void 이미지붙여넣기ToolStripMenuItem_Click(object sender, EventArgs e) | ||||
|         { | ||||
|              | ||||
|  | ||||
|         } | ||||
|  | ||||
|         private void 촬영ToolStripMenuItem_Click(object sender, EventArgs e) | ||||
|         { | ||||
|              | ||||
|  | ||||
|         } | ||||
|  | ||||
|         private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) | ||||
| @@ -305,7 +323,7 @@ namespace FCM0000 | ||||
|  | ||||
|         private void cmbSort_Click(object sender, EventArgs e) | ||||
|         { | ||||
|            | ||||
|  | ||||
|         } | ||||
|  | ||||
|         private void toolStripButton1_Click(object sender, EventArgs e) | ||||
| @@ -396,5 +414,10 @@ namespace FCM0000 | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void tbSearch_KeyDown(object sender, KeyEventArgs e) | ||||
|         { | ||||
|             if (e.KeyCode == Keys.Enter) toolStripButton2.PerformClick(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 chi
					chi