재고 등록화면 프로젝트 입력칸 비활성화 => 완료
재고 관리 화면 - 보관소 필터링 기능 추가 재고 관리 등록 화면 규격의 값이 없어도 등록 가능 => 완료 보관소 직접입력이 아닌 선택 하게 => 재고등록화면 수정, 품목정보에 공급처 선택 기능 => 공급처 칸(제일 우측) 추가 주문도 보관소 별로 처리 => 완료 안전용 주문등록화면 추가 => 보관소 기능 추가 구매 신청 목록에 "보관소" 열 추가
This commit is contained in:
19
SubProject/FCM0000/DSReport.Designer.cs
generated
19
SubProject/FCM0000/DSReport.Designer.cs
generated
@@ -2647,11 +2647,12 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply";
|
||||
this._commandCollection[0].CommandText = @"SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply
|
||||
FROM Inventory LEFT OUTER JOIN
|
||||
Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx
|
||||
WHERE (Inventory.gcode = @gcode) AND (Inventory.pdate <= @baseDate)
|
||||
WHERE (Inventory.gcode = @gcode) AND (Inventory.pdate <= @baseDate) AND (ISNULL(Inventory.place, N'') LIKE @place)
|
||||
GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place";
|
||||
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@baseDate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[1].Connection = this.Connection;
|
||||
this._commandCollection[1].CommandText = @"SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply
|
||||
@@ -2669,7 +2670,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place";
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
|
||||
public virtual int Fill(DSReport.jagosummaryPlaceDataTable dataTable, string gcode, string baseDate) {
|
||||
public virtual int Fill(DSReport.jagosummaryPlaceDataTable dataTable, string gcode, string baseDate, string place) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[0];
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
@@ -2683,6 +2684,12 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place";
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(baseDate));
|
||||
}
|
||||
if ((place == null)) {
|
||||
throw new global::System.ArgumentNullException("place");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(place));
|
||||
}
|
||||
if ((this.ClearBeforeFill == true)) {
|
||||
dataTable.Clear();
|
||||
}
|
||||
@@ -2694,7 +2701,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place";
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
|
||||
public virtual DSReport.jagosummaryPlaceDataTable GetData(string gcode, string baseDate) {
|
||||
public virtual DSReport.jagosummaryPlaceDataTable GetData(string gcode, string baseDate, string place) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[0];
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
@@ -2708,6 +2715,12 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place";
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(baseDate));
|
||||
}
|
||||
if ((place == null)) {
|
||||
throw new global::System.ArgumentNullException("place");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(place));
|
||||
}
|
||||
DSReport.jagosummaryPlaceDataTable dataTable = new DSReport.jagosummaryPlaceDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
|
||||
Reference in New Issue
Block a user