주문내역 엑셀 업로드기능에서 공백제거 추가, 주문내역에서 품목정보 생성하는 기능 추가(관리자)
This commit is contained in:
		| @@ -191,8 +191,11 @@ namespace FPJ0000 | ||||
|             var col_supply = this.fpSpread1.ActiveSheet.Columns["ItemSupply"].Index; | ||||
|  | ||||
|             //구매요청컬럼값 | ||||
|             var col_buyqty = this.fpSpread1.ActiveSheet.Columns["구매요청"].Index; | ||||
|             var col_inqty = this.fpSpread1.ActiveSheet.Columns["구매입고"].Index; | ||||
|             var col_buyrq = this.fpSpread1.ActiveSheet.Columns["구매요청"].Index; | ||||
|             var col_buypr = this.fpSpread1.ActiveSheet.Columns["구매승인"].Index; | ||||
|             var col_buypo = this.fpSpread1.ActiveSheet.Columns["구매진행"].Index; | ||||
|             var col_byuin = this.fpSpread1.ActiveSheet.Columns["구매완료"].Index; | ||||
|  | ||||
|             //var col_inuser = this.fpSpread1.ActiveSheet.Columns["구매수령인"].Index; | ||||
|             //var col_indate = this.fpSpread1.ActiveSheet.Columns["구매수령일"].Index; | ||||
|             //var col_inbigo = this.fpSpread1.ActiveSheet.Columns["구매비고"].Index; | ||||
| @@ -228,6 +231,11 @@ namespace FPJ0000 | ||||
|                 FCOMMON.DBM.buyinfo sidinfo; | ||||
|                 if (v_sid.isEmpty() == false && v_sid.Length == 9 && v_sid.StartsWith("10")) | ||||
|                 { | ||||
|                     if (v_sid == "108963609") | ||||
|                     { | ||||
|  | ||||
|                     } | ||||
|  | ||||
|                     if (sidlist.Contains(v_sid)) | ||||
|                     { | ||||
|                         //한번 계산했던 SID이다 | ||||
| @@ -235,15 +243,25 @@ namespace FPJ0000 | ||||
|                         row.ForeColor = Color.Gray; | ||||
|                         row.BackColor = Color.WhiteSmoke; | ||||
|  | ||||
|                          | ||||
|                         | ||||
|                         sidinfo = FCOMMON.DBM.GetPartBuyInfo(project, v_sid); | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buyqty].Value = sidinfo.Total_Request; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_inqty].Value = sidinfo.Total_Buy; | ||||
|  | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buyrq].Value = sidinfo.Request; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buypr].Value = sidinfo.PR; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buypo].Value = sidinfo.PO; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_byuin].Value = sidinfo.Received; | ||||
|  | ||||
|                         continue; | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         sidinfo = FCOMMON.DBM.GetPartBuyInfo(project, v_sid); | ||||
|                         sidlist.Add(v_sid); | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buyrq].Value = sidinfo.Request; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buypr].Value = sidinfo.PR; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_buypo].Value = sidinfo.PO; | ||||
|                         fpSpread1.ActiveSheet.Cells[i, col_byuin].Value = sidinfo.Received; | ||||
|                     } | ||||
|  | ||||
|                 } | ||||
| @@ -262,8 +280,8 @@ namespace FPJ0000 | ||||
|                     continue; | ||||
|                 } | ||||
|  | ||||
|                 fpSpread1.ActiveSheet.Cells[i, col_buyqty].Value = sidinfo.Total_Request; | ||||
|                 fpSpread1.ActiveSheet.Cells[i, col_inqty].Value = sidinfo.Total_Buy; | ||||
|                 //fpSpread1.ActiveSheet.Cells[i, col_buyrq].Value = sidinfo.Total_Request; | ||||
|                 //fpSpread1.ActiveSheet.Cells[i, col_byuin].Value = sidinfo.Total_Ipko; | ||||
|  | ||||
|  | ||||
|                 TotInfo.PO += sidinfo.PO; | ||||
| @@ -273,7 +291,7 @@ namespace FPJ0000 | ||||
|  | ||||
|                 전체건수 += 1; | ||||
|  | ||||
|                 int qty_in = sidinfo.Total_Buy;// 0; | ||||
|                 int qty_in = sidinfo.Total_Ipko;// 0; | ||||
|                 int qty_buy = sidinfo.Total_Request;// ; | ||||
|  | ||||
|                 if (sidinfo.Total_Request < 1) //비구매건 | ||||
| @@ -284,37 +302,44 @@ namespace FPJ0000 | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     //if(v_sid == "108963609") | ||||
|                     //{ | ||||
|  | ||||
|                     //} | ||||
|                     //여기서부터는 무조건 구매대상이다 | ||||
|                     //입고수량이 구매수량을 넘어가면 완료이다 | ||||
|                     if (sidinfo.Total_Buy >= sidinfo.Total_Request) | ||||
|                     if (sidinfo.Received >= sidinfo.Total_Request) | ||||
|                     { | ||||
|                         구매완료 += 1; | ||||
|                         row.ForeColor = Color.Black; | ||||
|                         row.BackColor = Color.LimeGreen; | ||||
|                     } | ||||
|                     else if (sidinfo.Total_Buy > 0)  //구매진행중이다 | ||||
|                     else if (sidinfo.PO > 0)  //구매진행중이다 | ||||
|                     { | ||||
|                         구매진행 += 1; | ||||
|                         row.ForeColor = Color.White; | ||||
|                         row.BackColor = Color.DarkMagenta; | ||||
|                     } | ||||
|                     else if (sidinfo.PR > 0) | ||||
|                     else if (sidinfo.PR > 0) //승인요청 | ||||
|                     { | ||||
|                         PO대기 += 1; | ||||
|                         row.ForeColor = Color.Black; | ||||
|                         row.BackColor = Color.Gold; | ||||
|                     } | ||||
|                     else if (sidinfo.PO > 0) | ||||
|                     { | ||||
|                         구매진행 += 1; | ||||
|                         row.ForeColor = Color.White; | ||||
|                         row.BackColor = Color.DarkMagenta; | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         구매요청 += 1; | ||||
|                         row.ForeColor = Color.Black; | ||||
|                         row.BackColor = Color.LightSkyBlue; | ||||
|                         if(sidinfo.Request > 0) | ||||
|                         { | ||||
|                             구매요청 += 1; | ||||
|                             row.ForeColor = Color.Black; | ||||
|                             row.BackColor = Color.LightSkyBlue; | ||||
|                         } | ||||
|                         else | ||||
|                         { | ||||
|                             비구매 += 1; | ||||
|                             row.ForeColor = Color.Black; | ||||
|                             row.BackColor = Color.White; | ||||
|                         } | ||||
|                     } | ||||
|                     //if (bPR == false) | ||||
|                     //{ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 chi
					chi