能够实现多人扫码出库，材料匹配生成的任务单，排序需要一致，退货入库导入，匹配管线正在出库中管线不统计散件出库
This commit is contained in:
@@ -101,7 +101,7 @@
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="申请单" IsFluid="true"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id"
|
||||
EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
|
||||
AllowSorting="true" SortField="CusBillCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
|
||||
AllowSorting="true" SortField="PipeLineSortIndex" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
|
||||
EnableTextSelection="True" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" EnableRowGroup="true" DataRowGroupField="WeldTaskCode">
|
||||
<Columns>
|
||||
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
|
||||
@@ -200,7 +200,7 @@
|
||||
<Items>
|
||||
<f:Grid ID="Grid3" ShowBorder="False" ShowHeader="False" Title="管线材料明细" EnableCollapse="true" ForceFit="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="Id"
|
||||
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode" ExpandAllRowGroups="false"
|
||||
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="PipeLineSortIndex,MaterialCode" ExpandAllRowGroups="false"
|
||||
SortDirection="DESC" EnableRowGroup="true" DataRowGroupField="PipelineCode" AllowPaging="true" IsDatabasePaging="true" PageSize="10000" RowGroupRendererFunction="onGrid3RowGroupRenderer">
|
||||
<Columns>
|
||||
<f:RenderField Width="100px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.CLGL
|
||||
txtCreateMan.Text = this.CurrUser.PersonName;
|
||||
txtCreateDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
drpReqUnit.SelectedValue = this.CurrUser.UnitId;
|
||||
txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(this.CurrUser.UnitId)?.UnitCode);
|
||||
txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(this.CurrUser.UnitId)?.UnitCode, drpTypeInt.SelectedText);
|
||||
}
|
||||
|
||||
drpTypeInt_SelectedIndexChanged(null, null);
|
||||
|
||||
Binary file not shown.
@@ -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";
|
||||
}
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user