lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch warehouse matching to use IDs

Browse Source
This commit is contained in:
李鹏飞
2026-06-24 23:25:06 +08:00
parent 4670220614
commit bd9b5a6f4d
27 changed files with 776 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
+2 -2
View File
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.CLGL
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
table.WarehouseId = drpWarehouse.SelectedValue;
}
var tb = BLL.TwInOutplanmasterService.GetListData(table, Grid1);
Grid1.RecordCount = TwInOutplanmasterService.Count;
@@ -542,4 +542,4 @@ namespace FineUIPro.Web.CLGL
}
}
}
}
}
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.CLGL
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
table.WarehouseId = drpWarehouse.SelectedValue;
}
var tb = BLL.TwInputmasterService.GetListData(table, Grid1);
Grid1.RecordCount = TwInputmasterService.Count;
SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs
+2 -2
View File
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.CLGL
table.PipeLineMatCode = txtMatCode.Text.Trim();
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
table.WarehouseId = drpWarehouse.SelectedValue;
}
table.ProjectId = this.CurrUser.LoginProjectId;
var tb = BLL.TwMaterialstockService.GetListData(table, Grid1);
@@ -230,4 +230,4 @@ namespace FineUIPro.Web.CLGL
BindGrid();
}
}
}
}
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
+1 -1
View File
@@ -73,7 +73,7 @@ namespace FineUIPro.Web.CLGL
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
table.WarehouseId = drpWarehouse.SelectedValue;
}
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
{
SGGL/FineUIPro.Web/CLGL/OutPlanMasterDetailImport.aspx.cs
+1 -1
View File
@@ -328,7 +328,7 @@ namespace FineUIPro.Web.CLGL
private List<Tw_MaterialStockOutput> GetSelectableStockList(Tw_InOutPlanMaster master)
{
Tw_MaterialStockOutput stockQuery = new Tw_MaterialStockOutput();
stockQuery.WarehouseCode = master.WarehouseCode;
stockQuery.WarehouseId = master.WarehouseId;
stockQuery.ProjectId = CurrUser.LoginProjectId;
stockQuery.MaterialUnit = GetRequiredMaterialUnit(master.Category);
return TwMaterialstockService.GetTw_MaterialStockByModle(stockQuery);
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs
+5 -3
View File
@@ -62,7 +62,7 @@ namespace FineUIPro.Web.CLGL
txtCreateDate.Text = result.CreateDate.Value.ToString("yyyy-MM-dd");
drpReqUnit.SelectedValue = result.ReqUnitId;
drpTypeInt.SelectedValue = result.TypeInt.ToString();
drpWarehouse.SelectedValue = result.WarehouseCode;
drpWarehouse.SelectedValue = result.WarehouseId;
drpCategory.SelectedValue = result.Category.ToString();
txtRemark.Text = result.Remark;
txtCusBillCode.Text = result.CusBillCode;
@@ -184,7 +184,8 @@ namespace FineUIPro.Web.CLGL
Id = Id,
ProjectId = this.CurrUser.LoginProjectId,
CusBillCode = txtCusBillCode.Text,
WarehouseCode = drpWarehouse.SelectedValue,
WarehouseId = drpWarehouse.SelectedValue,
WarehouseCode = drpWarehouse.SelectedText,
WeldTaskId = UnitWorkId,
Source = 1,
CreateDate = DateTime.Now,
@@ -202,7 +203,8 @@ namespace FineUIPro.Web.CLGL
{
var model = TwInOutplanmasterService.GetById(Id);
model.CusBillCode = txtCusBillCode.Text;
model.WarehouseCode = drpWarehouse.SelectedValue;
model.WarehouseId = drpWarehouse.SelectedValue;
model.WarehouseCode = drpWarehouse.SelectedText;
// model.WeldTaskId = UnitWorkId;
model.Source = 1;
model.CreateDate = DateTime.Now;
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx.cs
+2 -2
View File
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.CLGL
Model.Tw_MaterialStockOutput table = new Model.Tw_MaterialStockOutput();
table.PipeLineMatCode = txtMatCode.Text.Trim();
table.WarehouseCode = inoutplanmaster.WarehouseCode;
table.WarehouseId = inoutplanmaster.WarehouseId;
table.ProjectId = this.CurrUser.LoginProjectId;
if (inoutplanmaster.Category == (int)TwConst.Category.管段)
{
@@ -160,4 +160,4 @@ namespace FineUIPro.Web.CLGL
BindGrid();
}
}
}
}
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
+2 -2
View File
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.CLGL
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
table.WarehouseId = drpWarehouse.SelectedValue;
}
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
@@ -697,4 +697,4 @@ namespace FineUIPro.Web.CLGL
}
}
}
}
}