Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
재고 관리 화면 - 보관소 필터링 기능 추가
재고 관리 등록 화면 규격의 값이 없어도 등록 가능 => 완료
보관소 직접입력이 아닌 선택 하게 => 재고등록화면 수정,
품목정보에 공급처 선택 기능 => 공급처 칸(제일 우측) 추가
주문도 보관소 별로 처리 => 완료
안전용 주문등록화면 추가 => 보관소 기능 추가
구매 신청 목록에 "보관소" 열 추가
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
Download Patch File Download Diff File Expand all files Collapse all files

87
SubProject/FEQ0000/dsPurchase.Designer.cs generated
View File

@@ -347,6 +347,8 @@ namespace FEQ0000 {
private global::System.Data.DataColumn columnrequestName;
private global::System.Data.DataColumn columnplace;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public PurchaseDataTable() {
@@ -652,6 +654,14 @@ namespace FEQ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn placeColumn {
get {
return this.columnplace;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -722,7 +732,8 @@ namespace FEQ0000 {
string orderno,
string gcode,
string receiveName,
string requestName) {
string requestName,
string place) {
PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -758,7 +769,8 @@ namespace FEQ0000 {
orderno,
gcode,
receiveName,
requestName};
requestName,
place};
rowPurchaseRow.ItemArray = columnValuesArray;
this.Rows.Add(rowPurchaseRow);
return rowPurchaseRow;
@@ -822,6 +834,7 @@ namespace FEQ0000 {
this.columngcode = base.Columns["gcode"];
this.columnreceiveName = base.Columns["receiveName"];
this.columnrequestName = base.Columns["requestName"];
this.columnplace = base.Columns["place"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -895,6 +908,8 @@ namespace FEQ0000 {
base.Columns.Add(this.columnreceiveName);
this.columnrequestName = new global::System.Data.DataColumn("requestName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnrequestName);
this.columnplace = new global::System.Data.DataColumn("place", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnplace);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -932,6 +947,7 @@ namespace FEQ0000 {
this.columnreceiveName.MaxLength = 200;
this.columnrequestName.ReadOnly = true;
this.columnrequestName.MaxLength = 200;
this.columnplace.MaxLength = 20;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1596,6 +1612,22 @@ namespace FEQ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string place {
get {
if (this.IsplaceNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tablePurchase.placeColumn]));
}
}
set {
this[this.tablePurchase.placeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IspdateNull() {
@@ -1955,6 +1987,18 @@ namespace FEQ0000 {
public void SetrequestNameNull() {
this[this.tablePurchase.requestNameColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsplaceNull() {
return this.IsNull(this.tablePurchase.placeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public void SetplaceNull() {
this[this.tablePurchase.placeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -2150,6 +2194,7 @@ namespace FEQ0000.dsPurchaseTableAdapters {
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("receiveName", "receiveName");
tableMapping.ColumnMappings.Add("requestName", "requestName");
tableMapping.ColumnMappings.Add("place", "place");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -2160,8 +2205,8 @@ namespace FEQ0000.dsPurchaseTableAdapters {
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO Purchase
(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate,
import, pumidx, isdel, bigo, manuproc, orderno, gcode)
VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode);
import, pumidx, isdel, bigo, manuproc, orderno, gcode, place)
VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode,@place);
SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -2187,7 +2232,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@po", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -2195,14 +2240,15 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manuproc", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "manuproc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE Purchase
SET pdate = @pdate, state = @state, process = @process, receive = @receive, sc = @sc, request = @request, sid = @sid, pumname = @pumname, pumscale = @pumscale, pumunit = @pumunit,
pumqty = @pumqty, pumprice = @pumprice, pumamt = @pumamt, supply = @supply, supplyidx = @supplyidx, project = @project, projectidx = @projectidx, asset = @asset, edate = @edate,
indate = @indate, po = @po, dept = @dept, wuid = @wuid, wdate = @wdate, import = @import, pumidx = @pumidx, isdel = @isdel, bigo = @bigo, manuproc = @manuproc,
orderno = @orderno
WHERE (idx = @Original_idx);
orderno = @orderno, place = @place
WHERE (idx = @Original_idx);
SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -2228,13 +2274,14 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@po", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, "bigo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manuproc", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "manuproc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
@@ -2253,7 +2300,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty,
pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode
pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place
FROM Purchase
WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY pdate DESC, idx DESC";
@@ -2271,7 +2318,7 @@ ORDER BY pdate DESC, idx DESC";
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT idx, asset, bigo, dept, edate, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive,
request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode
request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode, place
FROM Purchase
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY pdate DESC, idx DESC";
@@ -2463,7 +2510,8 @@ ORDER BY pdate DESC, idx DESC";
string bigo,
string manuproc,
string orderno,
string gcode) {
string gcode,
string place) {
if ((pdate == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -2645,6 +2693,12 @@ ORDER BY pdate DESC, idx DESC";
else {
this.Adapter.InsertCommand.Parameters[30].Value = ((string)(gcode));
}
if ((place == null)) {
this.Adapter.InsertCommand.Parameters[31].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[31].Value = ((string)(place));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -2696,6 +2750,7 @@ ORDER BY pdate DESC, idx DESC";
string bigo,
string manuproc,
string orderno,
string place,
int Original_idx,
int idx) {
if ((pdate == null)) {
@@ -2873,8 +2928,14 @@ ORDER BY pdate DESC, idx DESC";
else {
this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(orderno));
}
this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(idx));
if ((place == null)) {
this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(place));
}
this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {