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

能够实现多人扫码出库，材料匹配生成的任务单，排序需要一致，退货入库导入，匹配管线正在出库中管线不统计散件出库

Browse Source
This commit is contained in:
李超
2025-01-23 15:52:33 +08:00
parent 718467e9f9
commit 0ff22e7876
13 changed files with 124 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+6 -6
View File
@@ -392,12 +392,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Grid3.DataBind();
for (int i = 0; i < Grid3.Rows.Count; i++)
{
var model = Grid3.Rows[i].DataItem ;
var model2= JsonConvert.DeserializeObject<Dictionary<string, string>>(JsonConvert.SerializeObject(model));
string pipeid= model2.First().Value;
var relationModle=TwInoutplandetailRelationService.GetByPipelineId(pipeid,WarehouseCode);
if (relationModle!= null)
var model = Grid3.Rows[i].DataItem;
var model2 = JsonConvert.DeserializeObject<Dictionary<string, string>>(JsonConvert.SerializeObject(model));
string pipeid = model2.First().Value;
var relationModle = TwInoutplandetailRelationService.GetByPipelineId(pipeid, WarehouseCode);
if (relationModle != null)
{
Grid3.Rows[i].RowCssClass = "yellow";
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+5 -2
View File
@@ -61,7 +61,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接任务单" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true"
SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
SortField="PipeLineSortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="false" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True"
EnableCheckBoxSelect="true" KeepCurrentSelection="true">
<Toolbars>
@@ -141,7 +141,10 @@
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="排序" ColumnID="PipeLineSortIndex" Hidden="true"
DataField="PipeLineSortIndex" SortField="PipeLineSortIndex" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+7 -2
View File
@@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.UnitWorkId == node.NodeID
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber }).Distinct().ToList().OrderByDescending(x => x.Date);
select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber, x.PipeLineSortIndex }).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
if (p.Count() > 0)
{
foreach (var item in p)
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
where x.UnitWorkId == node.NodeID && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
orderby x.TaskDate descending
select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber }).Distinct().ToList().OrderByDescending(x => x.Date);
select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber ,x.PipeLineSortIndex}).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
if (p.Count() > 0)
{
foreach (var item in p)
@@ -894,6 +894,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
NewItem.Dia = values.Value<int>("Dia");
}
if (!string.IsNullOrEmpty(values.Value<string>("PipeLineSortIndex")) && !string.IsNullOrEmpty(values.Value<int>("PipeLineSortIndex").ToString()))
{
NewItem.PipeLineSortIndex = values.Value<int>("PipeLineSortIndex");
}
if (!string.IsNullOrEmpty(values.Value<int>("Thickness").ToString()))
{
NewItem.Thickness = values.Value<int>("Thickness");
@@ -902,6 +906,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
NewItem.WeldingMethodCode = values.Value<string>("WeldingMethodCode").ToString();
}
getNewWeldTaskItem.Add(NewItem);
}