재고 등록화면 프로젝트 입력칸 비활성화 => 완료

재고 관리 화면 - 보관소 필터링 기능 추가
재고 관리 등록 화면 규격의 값이 없어도 등록 가능 => 완료
보관소 직접입력이 아닌 선택 하게 => 재고등록화면 수정,
품목정보에 공급처 선택 기능 => 공급처 칸(제일 우측) 추가
주문도 보관소 별로 처리 => 완료
안전용 주문등록화면 추가 => 보관소 기능 추가
구매 신청 목록에 "보관소" 열 추가
This commit is contained in:
chikyun.kim
2019-10-01 15:51:12 +09:00
parent 3acf9659e7
commit 80d00fd4b6
78 changed files with 13867 additions and 5520 deletions

View File

@@ -3912,21 +3912,22 @@ WHERE (idx = @Original_idx)";
B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid
FROM Inventory AS A LEFT OUTER JOIN
Items AS B ON A.item = B.idx
WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid) AND (A.invtype LIKE @invtype)
WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (A.invtype LIKE @invtype) AND (ISNULL(A.uid, N'') LIKE @uid) AND (ISNULL(A.place, N'') LIKE @place)
ORDER BY A.pdate DESC";
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("@sd", 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("@ed", 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("@uid", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@invtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "invtype", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[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(DSInventory.vInventoryDataTable dataTable, string gcode, string sd, string ed, string uid, string invtype) {
public virtual int Fill(DSInventory.vInventoryDataTable dataTable, string gcode, string sd, string ed, string invtype, string uid, string place) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
@@ -3946,17 +3947,23 @@ ORDER BY A.pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((invtype == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(invtype));
}
if ((uid == null)) {
throw new global::System.ArgumentNullException("uid");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid));
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(uid));
}
if ((invtype == null)) {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
if ((place == null)) {
throw new global::System.ArgumentNullException("place");
}
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(invtype));
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(place));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
@@ -3969,7 +3976,7 @@ ORDER BY A.pdate DESC";
[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 DSInventory.vInventoryDataTable GetData(string gcode, string sd, string ed, string uid, string invtype) {
public virtual DSInventory.vInventoryDataTable GetData(string gcode, string sd, string ed, string invtype, string uid, string place) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
@@ -3989,17 +3996,23 @@ ORDER BY A.pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((invtype == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(invtype));
}
if ((uid == null)) {
throw new global::System.ArgumentNullException("uid");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid));
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(uid));
}
if ((invtype == null)) {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
if ((place == null)) {
throw new global::System.ArgumentNullException("place");
}
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(invtype));
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(place));
}
DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable();
this.Adapter.Fill(dataTable);