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

1

This commit is contained in:
李鹏飞 2024-09-24 20:38:50 +08:00
parent 4e9832dc8a
commit 8edf7e1389
46 changed files with 3109 additions and 748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin_New/v17/.wsuo
View File

Binary file not shown.

98
DataBase/版本日志/SGGLDB_V2024-09-24.sql Normal file
View File

@ -0,0 +1,98 @@
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'FD1ED6C2-93BD-412F-A0B6-661F44339CA8', N'BCCA4D81-410C-4746-B1E4-F882BC3A25F4', N'修改', 4);
go
alter table dbo.Tw_InOutPlanMaster
add AuditMan nvarchar(50)
go
exec sp_addextendedproperty 'MS_Description', N'审核人', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
'AuditMan'
go
alter table dbo.Tw_InOutPlanMaster
add AuditDate datetime
go
exec sp_addextendedproperty 'MS_Description', N'审核时间', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
'AuditDate'
go
alter table dbo.Tw_InputMaster
add AuditMan nvarchar(50)
go
exec sp_addextendedproperty 'MS_Description', N'审核人', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InputMaster', 'COLUMN',
'AuditMan'
go
alter table dbo.Tw_InputMaster
add AuditDate datetime
go
exec sp_addextendedproperty 'MS_Description', N'审核时间', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InputMaster', 'COLUMN',
'AuditDate'
go
alter table dbo.Tw_OutputMaster
add AuditMan nvarchar(50)
go
exec sp_addextendedproperty 'MS_Description', N'审核人', 'SCHEMA', 'dbo', 'TABLE', 'Tw_OutputMaster', 'COLUMN',
'AuditMan'
go
alter table dbo.Tw_OutputMaster
add AuditDate datetime
go
exec sp_addextendedproperty 'MS_Description', N'审核时间', 'SCHEMA', 'dbo', 'TABLE', 'Tw_OutputMaster', 'COLUMN',
'AuditDate'
go
alter table dbo.Tw_InOutPlanMaster
add Remark nvarchar(200)
go
alter table dbo.Tw_InputMaster
add Remark nvarchar(200)
go
alter table dbo.Tw_InOutPlanMaster
add AuditMan2 nvarchar(50)
go
exec sp_addextendedproperty 'MS_Description', N'专工审核人', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
'AuditMan2'
go
alter table dbo.Tw_InOutPlanMaster
add AuditDate2 datetime
go
exec sp_addextendedproperty 'MS_Description', N'专工审核时间', 'SCHEMA', 'dbo', 'TABLE', 'Tw_InOutPlanMaster', 'COLUMN',
'AuditDate2'
go
alter table dbo.HJGL_PipeLineMat
add IsLooseParts BIT
go
exec sp_addextendedproperty 'MS_Description', N'是否散件', 'SCHEMA', 'dbo', 'TABLE', 'HJGL_PipeLineMat', 'COLUMN',
'IsLooseParts'
go
-- auto-generated definition
create table dbo.Tw_InOutPlanDetail_Relation
(
Id nvarchar(50) not null
constraint Tw_InOutPlanDetail_Relation_pk
primary key,
PipelineId nvarchar(50),
InOutPlanMasterId nvarchar(50),
MaterialCode nvarchar(50),
PrefabricatedComponents nvarchar(100),
Number decimal(9, 2),
)
go

63
DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
View File

@ -569,6 +569,69 @@ GO
--GO
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'9B828E92-733B-4AF9-9DD0-55ECD8B64AB8', N'材料管理', null, N'', 16, N'0', N'Menu_HJGL', 0, 0, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'E29C1839-3530-45EC-A752-B26A0027E2CD', N'入库管理', null, N'', 20, N'9B828E92-733B-4AF9-9DD0-55ECD8B64AB8', N'Menu_HJGL', 0, 0, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'324C72AF-447A-4308-AFB7-ABF788C58240', N'入库申请', null, N'CLGL/InPlanMaster.aspx', 10, N'E29C1839-3530-45EC-A752-B26A0027E2CD', N'Menu_HJGL', 0, 1, 1);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'E752513A-55FA-4001-9126-C236905AA1FD', N'324C72AF-447A-4308-AFB7-ABF788C58240', N'增加', 1);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'1EC8735B-0726-4340-9312-27C5A05BE4AD', N'324C72AF-447A-4308-AFB7-ABF788C58240', N'保存', 2);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'63A38163-DCA0-4444-8A50-40507D48EB4A', N'324C72AF-447A-4308-AFB7-ABF788C58240', N'删除', 3);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'8F3CD189-C233-40C0-A096-6CDB820A6CA8', N'324C72AF-447A-4308-AFB7-ABF788C58240', N'修改', 4);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'F06E072B-73F5-473E-B03E-8DA392E68BAC', N'324C72AF-447A-4308-AFB7-ABF788C58240', N'审核', 4);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'4A55351A-2440-4A2D-8509-3FFEE5FC8861', N'入库单管理', null, N'CLGL/InputMaster.aspx', 20, N'E29C1839-3530-45EC-A752-B26A0027E2CD', N'Menu_HJGL', 0, 1, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'16A22282-4966-4946-B0F8-855E1300AE2B', N'出库管理', null, N'', 30, N'9B828E92-733B-4AF9-9DD0-55ECD8B64AB8', N'Menu_HJGL', 0, 0, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'E910F410-07FB-41C3-AA80-8E30D1563BC1', N'出库申请', null, N'CLGL/OutPlanMaster.aspx', 10, N'16A22282-4966-4946-B0F8-855E1300AE2B', N'Menu_HJGL', 0, 1, 1);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'3B78F59D-AB75-42DD-B07D-AC952672D317', N'E910F410-07FB-41C3-AA80-8E30D1563BC1', N'增加', 1);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'4EC606B1-5315-4779-8B53-C51EF94127E9', N'E910F410-07FB-41C3-AA80-8E30D1563BC1', N'保存', 2);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'E41A9D51-C215-49DE-B5B1-7415FF85D910', N'E910F410-07FB-41C3-AA80-8E30D1563BC1', N'删除', 3);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'79344E58-A7F2-4583-A1CD-058E4C7DD882', N'E910F410-07FB-41C3-AA80-8E30D1563BC1', N'修改', 4);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'052CA576-108B-4FBC-966B-2B228509E570', N'E910F410-07FB-41C3-AA80-8E30D1563BC1', N'审核', 4);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'BCCA4D81-410C-4746-B1E4-F882BC3A25F4', N'出库单管理', null, N'CLGL/OutputMaster.aspx', 20, N'16A22282-4966-4946-B0F8-855E1300AE2B', N'Menu_HJGL', 0, 1, 1);
go
INSERT INTO dbo.Sys_ButtonToMenu (ButtonToMenuId, MenuId, ButtonName, SortIndex) VALUES (N'FD1ED6C2-93BD-412F-A0B6-661F44339CA8', N'BCCA4D81-410C-4746-B1E4-F882BC3A25F4', N'修改', 4);
go
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'9579C717-769E-4CC0-9E54-EE03D87C15A5', N'库存管理', null, N'', 40, N'9B828E92-733B-4AF9-9DD0-55ECD8B64AB8', N'Menu_HJGL', 0, 0, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'803F9828-52FA-4EF7-99C7-ADA99DADE9FB', N'库存管理', null, N'CLGL/MaterialStock.aspx', 10, N'9579C717-769E-4CC0-9E54-EE03D87C15A5', N'Menu_HJGL', 0, 1, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'D15E534F-98F3-4B8A-8656-EAF165DE917F', N'盘点', null, N'CLGL/MaterialStock.aspx', 20, N'9579C717-769E-4CC0-9E54-EE03D87C15A5', N'Menu_HJGL', 0, 1, 1);
go
INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'C05EF3BE-AB13-4852-B2AA-1095BE4EEB2F', N'到货分析', null, N'CLGL/ArrivalStatistics.aspx', 30, N'9579C717-769E-4CC0-9E54-EE03D87C15A5', N'Menu_HJGL', 0, 1, 1);
go
/* INSERT INTO dbo.Sys_Menu (MenuId, MenuName, Icon, Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'818B8FAE-6939-44F0-B911-14FD717AF03C', N'归档资料', null, N'', 50, N'9B828E92-733B-4AF9-9DD0-55ECD8B64AB8', N'Menu_HJGL', 0, 0, 1);
*/

6
SGGL/BLL/BLL.csproj
View File

@ -56,8 +56,9 @@
<Reference Include="EmitMapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll</HintPath>
</Reference>
<Reference Include="FineUIPro">
<HintPath>..\FineUIPro\Reference BLL\FineUIPro.dll</HintPath>
<Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
@ -264,6 +265,7 @@
<Compile Include="BaseInfo\WorkStageService.cs" />
<Compile Include="CLGL\TwArrivalStatisticsService.cs" />
<Compile Include="CLGL\TwConst.cs" />
<Compile Include="CLGL\TwInOutplandetailRelationService.cs" />
<Compile Include="CLGL\TwInOutplandetailService.cs" />
<Compile Include="CLGL\TwInOutplanmasterService.cs" />
<Compile Include="CLGL\TwInputdetailService.cs" />

5
SGGL/BLL/CLGL/TwConst.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
namespace BLL;
namespace BLL
{
public class TwConst
{
public enum InOutType : int
@ -55,3 +55,4 @@ public class TwConst
{ "管段" ,(int)Category.管段},
};
}
}

200
SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs Normal file
View File

@ -0,0 +1,200 @@
using FineUIPro;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
public static class TwInoutplandetailRelationService
{
#region 获取列表
/// <summary>
/// 记录数
/// </summary>
public static int Count
{
get;
set;
}
public static IQueryable<Model.Tw_InOutPlanDetail_Relation> GetTw_InOutPlanDetail_RelationByModle(Model.Tw_InOutPlanDetail_Relation table)
{
var q = from x in Funs.DB.Tw_InOutPlanDetail_Relation
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.PipelineId) || x.PipelineId.Contains(table.PipelineId)) &&
(string.IsNullOrEmpty(table.InOutPlanMasterId) || x.InOutPlanMasterId.Contains(table.InOutPlanMasterId)) &&
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode)) &&
(string.IsNullOrEmpty(table.PrefabricatedComponents) || x.PrefabricatedComponents.Contains(table.PrefabricatedComponents))
select x
;
return q;
}
/// <summary>
/// 获取分页列表
/// </summary>
/// <param name="table"></param>
/// <param name="grid1"></param>
/// <returns></returns>
public static IEnumerable GetListData(Model.Tw_InOutPlanDetail_Relation table, Grid grid1)
{
var q = GetTw_InOutPlanDetail_RelationByModle(table);
Count = q.Count();
if (Count == 0)
{
return null;
}
q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
join mat in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals mat.MaterialCode into mm
from mat in mm.DefaultIfEmpty()
orderby x.PipelineId, x.PrefabricatedComponents
select new
{
x.Id,
x.PipelineId,
y.PipelineCode,
x.InOutPlanMasterId,
x.MaterialCode,
x.PrefabricatedComponents,
x.Number,
mat.MaterialName,
};
}
#endregion
public static Model.Tw_InOutPlanDetail_Relation GetById(string Id)
{
return Funs.DB.Tw_InOutPlanDetail_Relation.FirstOrDefault(x => x.Id == Id);
}
public static void Add(Model.Tw_InOutPlanDetail_Relation newtable)
{
Model.Tw_InOutPlanDetail_Relation table = new Model.Tw_InOutPlanDetail_Relation
{
Id = newtable.Id,
PipelineId = newtable.PipelineId,
InOutPlanMasterId = newtable.InOutPlanMasterId,
MaterialCode = newtable.MaterialCode,
PrefabricatedComponents = newtable.PrefabricatedComponents,
Number = newtable.Number,
};
Funs.DB.Tw_InOutPlanDetail_Relation.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 批量添加计划明细
/// </summary>
/// <param name="list"></param>
/// <param name="inoutPlanMasterId"></param>
public static void AddList(IEnumerable<Model.Tw_InOutPlanDetail_Relation> list, string inoutPlanMasterId)
{
foreach (var item in list)
{
item.Id = SQLHelper.GetNewID();
item.InOutPlanMasterId = inoutPlanMasterId;
Add(item);
}
}
public static void Update(Model.Tw_InOutPlanDetail_Relation newtable)
{
Model.Tw_InOutPlanDetail_Relation table = Funs.DB.Tw_InOutPlanDetail_Relation.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
{
table.Id = newtable.Id;
table.PipelineId = newtable.PipelineId;
table.InOutPlanMasterId = newtable.InOutPlanMasterId;
table.MaterialCode = newtable.MaterialCode;
table.PrefabricatedComponents = newtable.PrefabricatedComponents;
table.Number = newtable.Number;
Funs.DB.SubmitChanges();
}
}
public static void DeleteById(string Id)
{
Model.Tw_InOutPlanDetail_Relation table = Funs.DB.Tw_InOutPlanDetail_Relation.FirstOrDefault(x => x.Id == Id);
if (table != null)
{
Funs.DB.Tw_InOutPlanDetail_Relation.DeleteOnSubmit(table);
Funs.DB.SubmitChanges();
}
}
public static void DeleteByInOutPlanMasterId(string inoutPlanMasterId)
{
var list = Funs.DB.Tw_InOutPlanDetail_Relation.Where(x => x.InOutPlanMasterId == inoutPlanMasterId);
if (list != null)
{
Funs.DB.Tw_InOutPlanDetail_Relation.DeleteAllOnSubmit(list);
Funs.DB.SubmitChanges();
}
}
public static void InsertByPipeLineMat(string inOutPlanMasterId, List<Model.Tw_PipeLineMat> tw_PipeLineMats)
{
var master =TwInOutplanmasterService.GetById(inOutPlanMasterId);
if (master == null)
{
return;
}
var outMateriaList = from x in tw_PipeLineMats
group x by new { x.MaterialCode, x.MaterialUnit }
into g
select new
{
g.Key.MaterialCode,
planNum = g.Sum(x => x.Number) ?? 0,
MaterialName = g.Key.MaterialUnit,
};
switch (master.Category)
{
case (int)TwConst.Category.管段:
outMateriaList.Where(x => x.MaterialName.Contains("米"));//管段
break;
case (int)TwConst.Category.管件:
outMateriaList.Where(x => x.MaterialName.Contains("个"));//管件
break;
}
foreach (var item in outMateriaList)
{
Model.Tw_InOutPlanDetail detail = new Model.Tw_InOutPlanDetail
{
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = inOutPlanMasterId,
MaterialCode = item.MaterialCode,
PlanNum = item.planNum,
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = tw_PipeLineMats.Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
Number = x.Number,
PrefabricatedComponents = x.PrefabricatedComponents,
}).ToList();
TwInoutplandetailRelationService.AddList(twinoutplandetailRelationList, inOutPlanMasterId);
}
}
}

28
SGGL/BLL/CLGL/TwInOutplandetailService.cs
View File

@ -74,8 +74,6 @@ namespace BLL
{
return Funs.DB.Tw_InOutPlanDetail.FirstOrDefault(x => x.Id == Id);
}
public static void Add(Model.Tw_InOutPlanDetail newtable)
{
if (string.IsNullOrEmpty(newtable.Id))
@ -136,7 +134,6 @@ namespace BLL
}
}
public static void DeleteByInOutPlanMasterId (string inoutPlanMasterId)
{
var list = Funs.DB.Tw_InOutPlanDetail.Where(x => x.InOutPlanMasterId == inoutPlanMasterId);
@ -147,5 +144,30 @@ namespace BLL
}
}
public static void GenInOutPlanDetailByInoutPlanMasterId(string inOutPlanMasterId)
{
var list = Funs.DB.Tw_InOutPlanDetail_Relation.Where(x => x.InOutPlanMasterId == inOutPlanMasterId).ToList();
var outMateriaList = from x in list
group x by x.MaterialCode
into g
select new
{
g.Key,
planNum = g.Sum(x => x.Number) ?? 0
};
TwInOutplandetailService.DeleteByInOutPlanMasterId(inOutPlanMasterId);
foreach (var item in outMateriaList)
{
Model.Tw_InOutPlanDetail detail = new Model.Tw_InOutPlanDetail
{
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = inOutPlanMasterId,
MaterialCode = item.Key,
PlanNum = item.planNum,
};
TwInOutplandetailService.Add(detail);
}
}
}
}

264
SGGL/BLL/CLGL/TwInOutplanmasterService.cs
View File

@ -35,6 +35,10 @@ namespace BLL
from y in yy.DefaultIfEmpty()
join person in Funs.DB.Person_Persons on x.CreateMan equals person.PersonId into persons
from person in persons.DefaultIfEmpty()
join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons
from auditperson in auditpersons.DefaultIfEmpty()
join auditperson2 in Funs.DB.Person_Persons on x.AuditMan2 equals auditperson2.PersonId into auditpersons2
from auditperson2 in auditpersons2.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units
from unit in units.DefaultIfEmpty()
where
@ -69,7 +73,13 @@ namespace BLL
ReqUnitId = x.ReqUnitId,
ReqUnitName = unit.UnitName,
UnitWorkId = y.UnitWorkId,
WeldTaskCode = y.TaskCode
WeldTaskCode = y.TaskCode,
AuditMan = x.AuditMan,
AuditManName = auditperson.PersonName,
AuditDate = x.AuditDate,
Remark = x.Remark,
AuditManName2 = auditperson2.PersonName,
AuditDate2 = x.AuditDate2,
}
;
@ -82,43 +92,6 @@ namespace BLL
/// <param name="table"></param>
/// <param name="grid1"></param>
/// <returns></returns>
public static IEnumerable GetListData(Model.Tw_InOutMasterOutput table, Grid grid1)
{
var q = GetModle(table);
Count = q.Count();
if (Count == 0)
{
return null;
}
var result = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in result
select new Model.Tw_InOutMasterOutput
{
Id = x.Id,
ProjectId = x.ProjectId,
CusBillCode = x.CusBillCode,
WarehouseCode = x.WarehouseCode,
Source = x.Source,
InOutType = x.InOutType,
TypeInt = x.TypeInt,
Category = x.Category,
State = x.State,
CreateMan = x.CreateMan,
CreateManName = x.CreateManName,
CreateDate = x.CreateDate,
OutputMasterId = x.OutputMasterId,
WeldTaskId = x.WeldTaskId,
ReqUnitId = x.ReqUnitId,
ReqUnitName = x.ReqUnitName,
UnitWorkId = x.UnitWorkId,
WeldTaskCode= x.WeldTaskId!=null? x.WeldTaskId.Contains('|')? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode :"":"",
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key
};
}
public static List<Tw_InOutMasterOutput> GetListData(Model.Tw_InOutMasterOutput table)
{
@ -154,10 +127,61 @@ namespace BLL
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
Remark = x.Remark,
AuditManName2 = x.AuditManName2,
AuditDate2 = x.AuditDate2,
}).ToList();
}
public static IEnumerable GetListData(Model.Tw_InOutMasterOutput table, Grid grid1)
{
var q = GetModle(table);
Count = q.Count();
if (Count == 0)
{
return null;
}
var result = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in result
select new Model.Tw_InOutMasterOutput
{
Id = x.Id,
ProjectId = x.ProjectId,
CusBillCode = x.CusBillCode,
WarehouseCode = x.WarehouseCode,
Source = x.Source,
InOutType = x.InOutType,
TypeInt = x.TypeInt,
Category = x.Category,
State = x.State,
CreateMan = x.CreateMan,
CreateManName = x.CreateManName,
CreateDate = x.CreateDate,
OutputMasterId = x.OutputMasterId,
WeldTaskId = x.WeldTaskId,
ReqUnitId = x.ReqUnitId,
ReqUnitName = x.ReqUnitName,
UnitWorkId = x.UnitWorkId,
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
Remark = x.Remark,
AuditManName2 = x.AuditManName2,
AuditDate2 = x.AuditDate2,
};
}
#endregion
/// <summary>
@ -167,7 +191,7 @@ namespace BLL
/// <param name="projectid"></param>
/// <param name="creatUserId"></param>
/// <returns></returns>
public static ResponeData ImportData(string path, string projectid, string creatUserId)
public static ResponeData ImportData(string OriFileName,string path, string projectid, string creatUserId)
{
var responeData = new ResponeData();
List<Tw_InputDataIn> temeplateDtoIns;
@ -259,6 +283,7 @@ namespace BLL
twInOutPlanMaster.ProjectId = projectid;
twInOutPlanMaster.CreateMan = creatUserId;
twInOutPlanMaster.CreateDate = DateTime.Now;
twInOutPlanMaster.Remark = OriFileName;
Add(twInOutPlanMaster);
TwInOutplandetailService.AddList(twInOutPlanDetails, twInOutPlanMaster.Id); //插入入库明细
@ -290,6 +315,11 @@ namespace BLL
OutputMasterId = newtable.OutputMasterId,
WeldTaskId = newtable.WeldTaskId,
ReqUnitId = newtable.ReqUnitId,
AuditMan = newtable.AuditMan,
AuditDate = newtable.AuditDate,
Remark = newtable.Remark,
AuditMan2=newtable.AuditMan2,
AuditDate2=newtable.AuditDate2,
};
Funs.DB.Tw_InOutPlanMaster.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@ -314,6 +344,11 @@ namespace BLL
table.OutputMasterId = newtable.OutputMasterId;
table.WeldTaskId = newtable.WeldTaskId;
table.ReqUnitId = newtable.ReqUnitId;
table.AuditMan = newtable.AuditMan;
table.AuditDate = newtable.AuditDate;
table.Remark = newtable.Remark;
table.AuditMan2 = newtable.AuditMan2;
table.AuditDate2 = newtable.AuditDate2;
Funs.DB.SubmitChanges();
}
@ -325,6 +360,7 @@ namespace BLL
if (table != null)
{
TwInOutplandetailService.DeleteByInOutPlanMasterId(table.Id);
TwInoutplandetailRelationService.DeleteByInOutPlanMasterId(table.Id);
Funs.DB.Tw_InOutPlanMaster.DeleteOnSubmit(table);
Funs.DB.SubmitChanges();
@ -405,7 +441,7 @@ namespace BLL
Source = 2,
Category = outMaster.Category,
TypeInt = outMaster.TypeInt,
State = (int)TwConst.State.待审核,
State = (int)TwConst.State.已审核,
CreateMan = outMaster.CreateMan,
CreateDate = DateTime.Now,
ReqUnitId = outMaster.ReqUnitId,
@ -473,5 +509,151 @@ namespace BLL
}
return cusBillCode;
}
/// <summary>
/// 根据任务单生成出库计划单
/// </summary>
/// <param name="unitworkid"></param>
/// <param name="unitid"></param>
/// <param name="date"></param>
/// <param name="Personid"></param>
public static void GenOutPlanmasterByWeldTaskId(string unitworkid,string unitid,DateTime date,string Personid)
{
Model.SGGLDB db = Funs.DB;
Model.View_HJGL_WeldingTask weldTask = db.View_HJGL_WeldingTask.FirstOrDefault(e => e.UnitWorkId==unitworkid && e.UnitId==unitid&& e.TaskDate.Value.Date==date.Date);
if (weldTask==null)
{
return;
}
string WeldTaskId= unitworkid+"|"+unitid+ "|" + string.Format("{0:yyyyMMMMdd}", date);
//判断是否已经生成过出库计划单
var queryIsExitInMaster = new Tw_InOutMasterOutput();
queryIsExitInMaster.WeldTaskId = WeldTaskId;
queryIsExitInMaster.InOutType=(int)TwConst.InOutType.出库;
queryIsExitInMaster.TypeInt = (int)TwConst.TypeInt.领料出库;
var IsExitInMaster = TwInOutplanmasterService.GetModle(queryIsExitInMaster).FirstOrDefault();
if (IsExitInMaster != null)
{
return;
}
var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date).Select(x=>x.PipelineId).Distinct().ToList();
var MaterDatial= from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where pipelineList.Contains(x.PipelineId)
select new
{
x.PipelineId,
x.PrefabricatedComponents,
x.MaterialCode,
x.Number,
y.MaterialUnit,
};
//var outMateriaList = from x in db.HJGL_PipeLineMat
// join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
// where pipelineList.Contains(x.PipelineId)
// group x by new { x.MaterialCode, y.MaterialUnit }
// into g
// select new
// {
// g.Key.MaterialCode,
// planNum = g.Sum(x => x.Number) ?? 0,
// MaterialName = g.Key.MaterialUnit,
// };
var outMateriaList = from x in MaterDatial
group x by new { x.MaterialCode, x.MaterialUnit }
into g
select new
{
g.Key.MaterialCode,
planNum = g.Sum(x => x.Number) ?? 0,
MaterialName = g.Key.MaterialUnit,
};
var outPlanDetailListPiece = outMateriaList.Where(x => x.MaterialName.Contains("个"));//管件
var outPlanDetailListOthere = outMateriaList.Where(x => x.MaterialName.Contains("米"));//管段
var weldTaskCode = WeldTaskService.GetWeldTaskById(weldTask.WeldTaskId)?.TaskCode;
if (outPlanDetailListPiece.Any())
{
Model.Tw_InOutPlanMaster table = new Model.Tw_InOutPlanMaster
{
Id = Guid.NewGuid().ToString(),
ProjectId = weldTask.ProjectId,
// CusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + UnitService.GetUnitCodeByUnitId(weldTask.UnitId) + "-" + UnitWorkService.getUnitWorkByUnitWorkId(weldTask.UnitWorkId)?.UnitWorkCode + "AP-PF01",
CusBillCode=TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode,TwConst.TypeInt.领料出库,TwConst.Category.管件),
WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(),
Source = 1,
InOutType = (int)TwConst.InOutType.出库,
TypeInt = (int)TwConst.TypeInt.领料出库,
State = (int)TwConst.State.待审核,
Category = (int)TwConst.Category.管件,
CreateMan = Personid,
CreateDate = DateTime.Now,
WeldTaskId = WeldTaskId,
ReqUnitId = weldTask.UnitId,
};
TwInOutplanmasterService.Add(table);
foreach (var item in outPlanDetailListPiece)
{
Model.Tw_InOutPlanDetail detail = new Model.Tw_InOutPlanDetail
{
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = table.Id,
MaterialCode = item.MaterialCode,
PlanNum = item.planNum,
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
Number = x.Number,
PrefabricatedComponents = x.PrefabricatedComponents,
}).ToList();
TwInoutplandetailRelationService.AddList(twinoutplandetailRelationList, table.Id);
}
if (outPlanDetailListOthere.Any())
{
Model.Tw_InOutPlanMaster table = new Model.Tw_InOutPlanMaster
{
Id = Guid.NewGuid().ToString(),
ProjectId = weldTask.ProjectId,
CusBillCode =TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode, TwConst.TypeInt.领料出库, TwConst.Category.管段),
WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(),
Source = 1,
InOutType = (int)TwConst.InOutType.出库,
TypeInt = (int)TwConst.TypeInt.领料出库,
State = (int)TwConst.State.待审核,
Category = (int)TwConst.Category.管段,
CreateMan = Personid,
CreateDate = DateTime.Now,
WeldTaskId = WeldTaskId,
ReqUnitId = weldTask.UnitId,
};
TwInOutplanmasterService.Add(table);
foreach (var item in outPlanDetailListOthere)
{
Model.Tw_InOutPlanDetail detail = new Model.Tw_InOutPlanDetail
{
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = table.Id,
MaterialCode = item.MaterialCode,
PlanNum = item.planNum,
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
Number = x.Number,
PrefabricatedComponents = x.PrefabricatedComponents,
}).ToList();
TwInoutplandetailRelationService.AddList(twinoutplandetailRelationList, table.Id);
}
}
}
}

41
SGGL/BLL/CLGL/TwInputmasterService.cs
View File

@ -26,10 +26,13 @@ namespace BLL
var q = from x in Funs.DB.Tw_InputMaster
join person in Funs.DB.Person_Persons on x.CreateMan equals person.PersonId into persons
from person in persons.DefaultIfEmpty()
join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons
from auditperson in auditpersons.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units
from unit in units.DefaultIfEmpty()
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.InOutPlanMasterId) || x.InOutPlanMasterId.Contains(table.InOutPlanMasterId)) &&
(string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId)) &&
(string.IsNullOrEmpty(table.CusBillCode) || x.CusBillCode.Contains(table.CusBillCode)) &&
(string.IsNullOrEmpty(table.WarehouseCode) || x.WarehouseCode.Contains(table.WarehouseCode)) &&
@ -54,6 +57,10 @@ namespace BLL
CreateDate = x.CreateDate,
ReqUnitId = x.ReqUnitId,
ReqUnitName = unit.UnitName,
AuditMan = x.AuditMan,
AuditManName = auditperson.PersonName,
AuditDate = x.AuditDate,
Remark = x.Remark
};
return q;
@ -94,7 +101,11 @@ namespace BLL
Category = x.Category,
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
Remark=x.Remark
};
}
@ -127,7 +138,11 @@ namespace BLL
Category = x.Category,
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
Remark = x.Remark
}).ToList();
}
#endregion
@ -155,6 +170,9 @@ namespace BLL
CreateMan = newtable.CreateMan,
CreateDate = newtable.CreateDate,
ReqUnitId = newtable.ReqUnitId,
AuditMan= newtable.AuditMan,
AuditDate = newtable.AuditDate,
Remark = newtable.Remark
};
Funs.DB.Tw_InputMaster.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@ -178,6 +196,9 @@ namespace BLL
table.CreateMan = newtable.CreateMan;
table.CreateDate = newtable.CreateDate;
table.ReqUnitId = newtable.ReqUnitId;
table.AuditMan = newtable.AuditMan;
table.AuditDate = newtable.AuditDate;
table.Remark = newtable.Remark;
Funs.DB.SubmitChanges();
}
@ -197,7 +218,7 @@ namespace BLL
/// <summary>
/// 根据计划单生成入库单
/// </summary>
public static void GenInMasterByPlanId(string planId)
public static void GenInMasterByPlanId(string planId, List<Model.Tw_InputDetail> detailLists)
{
//获取计划单
var planQueryModel = new Tw_InOutMasterOutput();
@ -231,6 +252,9 @@ namespace BLL
CreateMan = plan.CreateMan,
CreateDate = DateTime.Now,
ReqUnitId = plan.ReqUnitId,
AuditMan = plan.CreateMan,
AuditDate = plan.AuditDate,
Remark=plan.Remark
};
if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库)
{
@ -238,12 +262,13 @@ namespace BLL
(BLL.TwConst.Category)plan.Category);
}
else
{
master.CusBillCode= plan.CusBillCode.Replace("-AP", "");
}
Add(master);
//生成明细
Tw_InOutDetailOutput query = new Tw_InOutDetailOutput();
query.InOutPlanMasterId= planId;
var details = TwInOutplandetailService.GetByModle(query).ToList();
foreach (var detail in details)
foreach (var detail in detailLists)
{
var detailTable = new Model.Tw_InputDetail()
{
@ -251,7 +276,7 @@ namespace BLL
InputMasterId = master.Id,
MaterialCode = detail.MaterialCode,
PlanNum = detail.PlanNum,
ActNum = detail.PlanNum,
ActNum = detail.ActNum,
};
TwInputdetailService.Add(detailTable);
TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.入库, detailTable.ActNum);

5
SGGL/BLL/CLGL/TwOutputdetailService..cs
View File

@ -1,4 +1,5 @@
using FineUIPro;
using NPOI.OpenXmlFormats.Wordprocessing;
using System;
using System.Collections;
using System.Collections.Generic;
@ -28,6 +29,8 @@ namespace BLL
from y in yy.DefaultIfEmpty()
join mat in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals mat.MaterialCode into mm
from mat in mm.DefaultIfEmpty()
join stock in Funs.DB.Tw_MaterialStock on x.MaterialCode equals stock.PipeLineMatCode into st
from stock in st.DefaultIfEmpty()
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.OutputMasterId) || x.OutputMasterId.Contains(table.OutputMasterId)) &&
@ -43,6 +46,8 @@ namespace BLL
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
MaterialName = mat.MaterialName,
StockNum = stock.StockNum ?? 0,
DiffNum = (x.ActNum??0) - (x.PlanNum??0),
}
;

29
SGGL/BLL/CLGL/TwOutputmasterService.cs
View File

@ -32,6 +32,8 @@ namespace BLL
//from z in zz.DefaultIfEmpty()
join person in Funs.DB.Person_Persons on x.CreateMan equals person.PersonId into persons
from person in persons.DefaultIfEmpty()
join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons
from auditperson in auditpersons.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units
from unit in units.DefaultIfEmpty()
where
@ -63,6 +65,9 @@ namespace BLL
ReqUnitId = x.ReqUnitId,
ReqUnitName = unit.UnitName,
WeldTaskId = y.WeldTaskId,
AuditMan = x.AuditMan,
AuditManName = auditperson.PersonName,
AuditDate = x.AuditDate,
};
return q;
@ -105,6 +110,9 @@ namespace BLL
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
WeldTaskId = x.WeldTaskId,
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate
};
}
@ -140,6 +148,9 @@ namespace BLL
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
WeldTaskId = x.WeldTaskId,
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate
}).ToList();
}
@ -168,6 +179,8 @@ namespace BLL
CreateMan = newtable.CreateMan,
CreateDate = newtable.CreateDate,
ReqUnitId = newtable.ReqUnitId,
AuditMan = newtable.AuditMan,
AuditDate = newtable.AuditDate
};
Funs.DB.Tw_OutputMaster.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@ -191,6 +204,8 @@ namespace BLL
table.CreateMan = newtable.CreateMan;
table.CreateDate = newtable.CreateDate;
table.ReqUnitId = newtable.ReqUnitId;
table.AuditMan = newtable.AuditMan;
table.AuditDate = newtable.AuditDate;
Funs.DB.SubmitChanges();
}
@ -244,6 +259,8 @@ namespace BLL
CreateMan = plan.CreateMan,
CreateDate = DateTime.Now,
ReqUnitId = plan.ReqUnitId,
AuditMan = plan.CreateMan,
AuditDate = plan.AuditDate
};
Add(master);
//生成出库单明细
@ -268,14 +285,16 @@ namespace BLL
/// 根据计划单撤销出库单
/// </summary>
/// <param name="planId"></param>
public static void RevokeGenOutMasterByPlanId(string planId)
public static string RevokeGenOutMasterByPlanId(string planId)
{
string result = "";
Tw_InOutMasterOutput query = new Tw_InOutMasterOutput();
query.InOutPlanMasterId = planId;
var master = GetModle(query).FirstOrDefault();
if (master == null)
{
return;
result = "未找到对应的出库单";
return result;
}
DeleteById(master.Id); //删除出库单
//删除明细
@ -288,8 +307,10 @@ namespace BLL
//撤销出库，即增加库存
TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.入库, detail.ActNum);
}
var planModel= TwInOutplanmasterService.GetById(planId);
planModel.State= (int)TwConst.State.已审核;
TwInOutplanmasterService.Update(planModel);
return result;
}
public static string GetCusBillCodeByTaskCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category)

13
SGGL/BLL/HJGL/WeldingManage/PipelineMatService.cs
View File

@ -1,7 +1,9 @@
namespace BLL
{
using Model;
using Model;
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public static class PipelineMatService
{
/// <summary>
@ -13,6 +15,11 @@
return Funs.DB.HJGL_PipeLineMat.FirstOrDefault(e => e.PipeLineMatId == pipelineMatId);
}
public static List<Model.HJGL_PipeLineMat> GetPipeLineMatsByPipelineId(string pipelineId)
{
return Funs.DB.HJGL_PipeLineMat.Where(e => e.PipelineId == pipelineId).ToList();
}
/// <summary>
/// 增加管线材料
/// </summary>

109
SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs
View File

@ -308,114 +308,5 @@ namespace BLL
db.SubmitChanges();
}
}
public static void GenOutPlanmasterByWeldTaskId(string unitworkid,string unitid,DateTime date,string Personid)
{
Model.SGGLDB db = Funs.DB;
Model.View_HJGL_WeldingTask weldTask = db.View_HJGL_WeldingTask.FirstOrDefault(e => e.UnitWorkId==unitworkid && e.UnitId==unitid&& e.TaskDate.Value.Date==date.Date);
if (weldTask==null)
{
return;
}
string WeldTaskId= unitworkid+"|"+unitid+ "|" + string.Format("{0:yyyyMMMMdd}", date);
//判断是否已经生成过出库计划单
var queryIsExitInMaster = new Tw_InOutMasterOutput();
queryIsExitInMaster.WeldTaskId = WeldTaskId;
queryIsExitInMaster.InOutType=(int)TwConst.InOutType.出库;
queryIsExitInMaster.TypeInt = (int)TwConst.TypeInt.领料出库;
var IsExitInMaster = TwInOutplanmasterService.GetModle(queryIsExitInMaster).FirstOrDefault();
if (IsExitInMaster != null)
{
return;
}
var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date).Select(x=>x.PipelineId).Distinct().ToList();
//var outMateriaList = db.HJGL_PipeLineMat.Where(x => pipelineList.Contains(x.PipelineId))
// .GroupBy(x => x.MaterialCode).Select(x => new
// {
// x.Key,
// planNum = x.Sum(y => y.Number)??0,
// }).ToList();
var outMateriaList = from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where pipelineList.Contains(x.PipelineId)
group x by new { x.MaterialCode, y.MaterialUnit }
into g
select new
{
g.Key.MaterialCode,
planNum = g.Sum(x => x.Number) ?? 0,
MaterialName = g.Key.MaterialUnit,
};
var outPlanDetailListPiece = outMateriaList.Where(x => x.MaterialName.Contains("个"));//管件
var outPlanDetailListOthere = outMateriaList.Where(x => x.MaterialName.Contains("米"));//管段
var weldTaskCode = GetWeldTaskById(weldTask.WeldTaskId)?.TaskCode;
if (outPlanDetailListPiece.Any())
{
Model.Tw_InOutPlanMaster table = new Model.Tw_InOutPlanMaster
{
Id = Guid.NewGuid().ToString(),
ProjectId = weldTask.ProjectId,
// CusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + UnitService.GetUnitCodeByUnitId(weldTask.UnitId) + "-" + UnitWorkService.getUnitWorkByUnitWorkId(weldTask.UnitWorkId)?.UnitWorkCode + "AP-PF01",
CusBillCode=TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode,TwConst.TypeInt.领料出库,TwConst.Category.管件),
WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(),
Source = 1,
InOutType = (int)TwConst.InOutType.出库,
TypeInt = (int)TwConst.TypeInt.领料出库,
State = (int)TwConst.State.待审核,
Category = (int)TwConst.Category.管件,
CreateMan = Personid,
CreateDate = DateTime.Now,
WeldTaskId = WeldTaskId,
ReqUnitId = weldTask.UnitId,
};
TwInOutplanmasterService.Add(table);
foreach (var item in outPlanDetailListPiece)
{
Model.Tw_InOutPlanDetail detail = new Model.Tw_InOutPlanDetail
{
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = table.Id,
MaterialCode = item.MaterialCode,
PlanNum = item.planNum,
};
TwInOutplandetailService.Add(detail);
}
}
if (outPlanDetailListOthere.Any())
{
Model.Tw_InOutPlanMaster table = new Model.Tw_InOutPlanMaster
{
Id = Guid.NewGuid().ToString(),
ProjectId = weldTask.ProjectId,
CusBillCode =TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode, TwConst.TypeInt.领料出库, TwConst.Category.管段),
WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(),
Source = 1,
InOutType = (int)TwConst.InOutType.出库,
TypeInt = (int)TwConst.TypeInt.领料出库,
State = (int)TwConst.State.待审核,
Category = (int)TwConst.Category.管段,
CreateMan = Personid,
CreateDate = DateTime.Now,
WeldTaskId = WeldTaskId,
ReqUnitId = weldTask.UnitId,
};
TwInOutplanmasterService.Add(table);
foreach (var item in outPlanDetailListOthere)
{
Model.Tw_InOutPlanDetail detail = new Model.Tw_InOutPlanDetail
{
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = table.Id,
MaterialCode = item.MaterialCode,
PlanNum = item.planNum,
};
TwInOutplandetailService.Add(detail);
}
}
}
}
}

3
SGGL/FineUIPro.Mobile/res/css/common.css
View File

@ -65,3 +65,6 @@ table.result {
white-space: normal;
word-break: break-all;
}
.f-grid-row .f-grid-rowgroup .f-expanded .f-grid-row-unselectable {
height: 56.67px;
}

12
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
View File

@ -58,7 +58,7 @@
</f:Button>
<f:Button ID="btnPassMaster" Text="审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" Hidden="true">
</f:Button>
<f:Button ID="btnGenInMaster" Text="生成入库单" Icon="ArrowRefresh" runat="server" OnClick="btnGenInMaster_Click" Hidden="true">
<f:Button ID="btnGenInMaster" Text="入库" Icon="ArrowRefresh" runat="server" OnClick="btnGenInMaster_Click" Hidden="true">
</f:Button>
<f:Button ID="btnRevokeGenInMaster" Text="撤销入库" Icon="ArrowRefresh" runat="server" OnClick="btnRevokeGenInMaster_Click" Hidden="true">
</f:Button>
@ -98,7 +98,15 @@
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

18
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
View File

@ -229,6 +229,8 @@ namespace FineUIPro.Web.CLGL
else
{
planMaster.State = (int)TwConst.State.已审核;
planMaster.AuditMan=this.CurrUser.PersonId;
planMaster.AuditDate = DateTime.Now;
TwInOutplanmasterService.Update(planMaster);
ShowNotify("审核通过！", MessageBoxIcon.Success);
BindGrid();
@ -251,10 +253,20 @@ namespace FineUIPro.Web.CLGL
}
else
{
TwInputmasterService.GenInMasterByPlanId(planId);
BindGrid();
ShowNotify("生成入库单成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
}
//if ( planMaster.State != (int)TwConst.State.已审核)
//{
// Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
// return;
//}
//else
//{
// TwInputmasterService.GenInMasterByPlanId(planId);
// BindGrid();
// ShowNotify("生成入库单成功！", MessageBoxIcon.Success);
//}
}

2
SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx.cs
View File

@ -68,7 +68,7 @@ namespace FineUIPro.Web.CLGL
var fileName = rootPath + initPath + hdFileName.Text;
ResponeData responeData;
responeData = TwInOutplanmasterService.ImportData(fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
responeData = TwInOutplanmasterService.ImportData(fuAttachUrl.FileName,fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
if (responeData.code == 1)

145
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
View File

@ -17,153 +17,67 @@
<form id="form1" runat="server">
<div>
<f:PageManager runat="server" AutoSizePanelID="Form2" />
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="入库单详情"
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="出库单详情"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" Hidden="True">
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" >
<Items>
<f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="SystemSave" OnClick="btnSave_Click"
<f:Button ID="btnSave" ToolTip="入库" Text="入库" Icon="SystemSave" OnClick="btnSave_Click"
EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnEditProcess" ToolTip="编辑流程" Text="编辑流程" Icon="ApplicationEdit" OnClick="btnEditProcess_Click"
<%--<f:Button ID="btnEditProcess" ToolTip="编辑流程" Text="编辑流程" Icon="ApplicationEdit" OnClick="btnEditProcess_Click"
EnablePostBack="true" runat="server">
</f:Button>
</f:Button>--%>
</Items>
</f:Toolbar>
<f:Toolbar ID="TbApprove" Position="Top" ToolbarAlign="Right" runat="server" Hidden="True">
<items>
<f:Button ID="btnAgree" Icon="SystemSave" runat="server" ToolTip="同意" Text="同意" ValidateForms="SimpleForm1"
OnClick="btnAgree_Click" ConfirmText="请确认是否同意！" Size="Medium">
</f:Button>
<f:Button ID="btnDisgree" Icon="SystemSave" runat="server" ToolTip="不同意" Text="不同意" ValidateForms="SimpleForm1"
OnClick="btnDisgree_Click" ConfirmText="请确认是否不同意！" Size="Medium">
</f:Button>
</items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Panel ID="Panel4" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextBox ID="txtProjectName" Label="项目名称" Readonly="true" ColumnWidth="40%" runat="server">
<f:TextBox ID="txtProjectName" Label="任务单编号" Readonly="true" ColumnWidth="40%" runat="server" Hidden="true">
</f:TextBox>
<f:TextBox ID="txtContractNum" Label="合同编号" Readonly="true" ColumnWidth="30%" runat="server">
<f:TextBox ID="txtCusBillCode" Label="编号" Readonly="true" ColumnWidth="30%" runat="server">
</f:TextBox>
<f:TextBox ID="txtSellerName" Label="供应商名称" Readonly="true" ColumnWidth="30%" runat="server">
<f:TextBox ID="txtWarehouseCode" Label="仓库" Readonly="true" ColumnWidth="30%" runat="server">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="PanelOrderIn" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server" Hidden="True">
<f:Panel ID="PanelOrderIn" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server" >
<Items>
<f:DatePicker ID="txtOrderInDate" Label="入库日期" ColumnWidth="40%" runat="server"></f:DatePicker>
<f:TextBox ID="txtInvoiceDate" Label="发票日期" Readonly="true" ColumnWidth="30%" runat="server"></f:TextBox>
<f:TextBox ID="txtOrderCode" Label="入库单编号" ColumnWidth="30%" runat="server">
<f:TextBox ID="txtCreateMan" Label="发起人" ColumnWidth="40%" runat="server"></f:TextBox>
<f:TextBox ID="txtCreateDate" Label="发起时间" Readonly="true" ColumnWidth="30%" runat="server"></f:TextBox>
<f:TextBox ID="txtReqUnitName" Label="领料单位" ColumnWidth="30%" runat="server" Hidden="true">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="PanelOrderOut" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server" Hidden="True">
<Items>
<f:DatePicker ID="txtOrderOutDate" Label="出库日期" ColumnWidth="40%" runat="server"></f:DatePicker>
<f:TextBox ID="txtMaterialRequisitionUnit" Label="领料单位" ColumnWidth="30%" runat="server"></f:TextBox>
</Items>
</f:Panel>
<f:TextBox ID="txtInvoiceNumber" Label="发票号码" Readonly="true" ColumnWidth="40%" runat="server">
</f:TextBox>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="入库单列表"
runat="server" BoxFlex="1" DataKeyNames="InvoiceDetailId" AllowCellEditing="true" ForceFit="true"
DataIDField="InvoiceDetailId" EnableColumnLines="true" Height="400" EnableBigData="true" OnRowCommand="Grid1_OnRowCommand" OnRowDataBound="Grid1_RowDataBound"
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="出库单列表"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"
EnableTextSelection="True">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="100px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="300px" ColumnID="GoodsOrServicesName" DataField="GoodsOrServicesName" SortField="GoodsOrServicesName"
FieldType="String" HeaderText="产品名称" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SpecificationModel" DataField="SpecificationModel" SortField="SpecificationModel"
FieldType="String" HeaderText="产品规格" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Unit" DataField="Unit" SortField="Unit"
FieldType="String" HeaderText="计量单位" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
FieldType="String" HeaderText="数量" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="230px" ColumnID="UnitPrice" DataField="UnitPrice" SortField="UnitPrice"
FieldType="String" HeaderText="未含税单价(元)" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="ActNum" DataField="ActNum" FieldType="Float"
HeaderText="实际数量">
<Editor>
<f:NumberBox ID="tbActNum" NoDecimal="False" NoNegative="true" DecimalPrecision="2" Increment="0.01" Required="True" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:TemplateField Width="200px" EnableColumnHide="false" ColumnID="NoTaxPrice" HeaderText="未税金额(元)" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetNoTaxPrice(Eval("Amount"),Eval("Tax")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="150px" EnableColumnHide="false" ColumnID="TaxRate" HeaderText="税率(%)" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# GetTaxRate(Eval("TaxRate")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="Tax" DataField="Tax" SortField="Tax"
FieldType="String" HeaderText="税额(元)" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Amount" DataField="Amount" SortField="Amount"
FieldType="String" HeaderText="价税合计(元)" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField Width="100px" ColumnID="btnDelete" TextAlign="Center" CommandName="delete" Icon="Delete" ConfirmText="确定要删除本行？" ConfirmTarget="Top" />
</Columns>
</f:Grid>
<f:Panel ID="Panel1" Layout="Column" ShowHeader="True" ShowBorder="False" Margin="10 10 0 0" Title="统计信息" runat="server">
<Items>
<f:TextBox ID="txtSumUnitPrice" Label="未税金额(元)" Readonly="True" ColumnWidth="25%" runat="server"></f:TextBox>
<f:TextBox ID="txtSumTax" Label="税额(元)" Readonly="True" ColumnWidth="25%" runat="server"></f:TextBox>
<f:TextBox ID="txtSumAmount" Label="价税合计(元)" Readonly="True" ColumnWidth="25%" runat="server"></f:TextBox>
<f:TextBox ID="txtAmountInWords" Label="金额大写" Readonly="True" ColumnWidth="25%" runat="server"></f:TextBox>
</Items>
</f:Panel>
<f:Form ID="Form_approve" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="审批流程" Hidden="True"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Items>
<f:TextArea ID="txtApproveIdea" Height="100px" Required="true" Label="审批意见" ShowRedStar="true" runat="server" Text="">
</f:TextArea>
<f:Grid ID="Grid2" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="审批记录"
runat="server" BoxFlex="1" DataKeyNames="ApproveId" AllowCellEditing="true" ForceFit="true"
ClicksToEdit="2" DataIDField="ApproveId" EnableColumnLines="true" Height="400" EnableBigData="true"
EnableTextSelection="True">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="ApproveMan" DataField="ApproveMan" Width="150px" FieldType="String" HeaderText="审批人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsAgree" DataField="IsAgree" Width="150px" FieldType="String" HeaderText="是否同意" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveIdea" DataField="ApproveIdea" Width="320px" FieldType="String" HeaderText="审批意见" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveDate" DataField="ApproveDate" Width="320px" FieldType="String" HeaderText="审批时间" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Form>
</Items>
</f:Form>
@ -177,3 +91,4 @@
</form>
</body>
</html>

93
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
View File

@ -1,4 +1,6 @@
using System;
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@ -7,11 +9,98 @@ using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
public partial class InPlanMasterEdit : System.Web.UI.Page
public partial class InPlanMasterEdit : PageBase
{
public string Id
{
get
{
return (string)ViewState["Id"];
}
set
{
ViewState["Id"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
Id = Request.QueryString["Id"];
if (!string.IsNullOrEmpty(Id))
{
var model = TwInOutplanmasterService.GetById(Id);
txtCusBillCode.Text = model.CusBillCode;
txtWarehouseCode.Text = model.WarehouseCode;
txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
txtReqUnitName.Text = UnitService.GetUnitNameByUnitId(model.ReqUnitId);
var queryModel = new Model.Tw_InOutDetailOutput()
{
InOutPlanMasterId = Id
};
var detailList = TwInOutplandetailService.GetByModle(queryModel).ToList();
foreach (var item in detailList)
{
item.ActNum = item.PlanNum;
}
Grid1.DataSource = detailList;
Grid1.DataBind();
}
}
}
/// <summary>
/// 保存明细项
/// </summary>
private List<Model.Tw_InputDetail> SaveDetail(string InOutPlanMasterId)
{
//根据列表中的明细项添加
List<Model.Tw_InputDetail> detailLists = new List<Model.Tw_InputDetail>();
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Tw_InputDetail newDetail = new Model.Tw_InputDetail
{
Id = SQLHelper.GetNewID(),
InputMasterId = InOutPlanMasterId,
//ProNoticeCId= values.Value<string>("ProNoticeCId"),
MaterialCode = values.Value<string>("MaterialCode"),
PlanNum = values.Value<decimal>("PlanNum"),
ActNum = values.Value<decimal>("ActNum"),
};
detailLists.Add(newDetail);
}
return detailLists;
}
protected void btnEditProcess_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
protected void btnSave_Click(object sender, EventArgs e)
{
TwInputmasterService.GenInMasterByPlanId(Id, SaveDetail(Id));
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
protected void btnAgree_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
protected void btnDisgree_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
}
}

195
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs generated
View File

@ -50,42 +50,6 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnEditProcess 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnEditProcess;
/// <summary>
/// TbApprove 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar TbApprove;
/// <summary>
/// btnAgree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAgree;
/// <summary>
/// btnDisgree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDisgree;
/// <summary>
/// Panel4 控件。
/// </summary>
@ -105,22 +69,22 @@ namespace FineUIPro.Web.CLGL
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// txtContractNum 控件。
/// txtCusBillCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContractNum;
protected global::FineUIPro.TextBox txtCusBillCode;
/// <summary>
/// txtSellerName 控件。
/// txtWarehouseCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSellerName;
protected global::FineUIPro.TextBox txtWarehouseCode;
/// <summary>
/// PanelOrderIn 控件。
@ -132,67 +96,31 @@ namespace FineUIPro.Web.CLGL
protected global::FineUIPro.Panel PanelOrderIn;
/// <summary>
/// txtOrderInDate 控件。
/// txtCreateMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtOrderInDate;
protected global::FineUIPro.TextBox txtCreateMan;
/// <summary>
/// txtInvoiceDate 控件。
/// txtCreateDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInvoiceDate;
protected global::FineUIPro.TextBox txtCreateDate;
/// <summary>
/// txtOrderCode 控件。
/// txtReqUnitName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOrderCode;
/// <summary>
/// PanelOrderOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel PanelOrderOut;
/// <summary>
/// txtOrderOutDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtOrderOutDate;
/// <summary>
/// txtMaterialRequisitionUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialRequisitionUnit;
/// <summary>
/// txtInvoiceNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInvoiceNumber;
protected global::FineUIPro.TextBox txtReqUnitName;
/// <summary>
/// Grid1 控件。
@ -204,112 +132,13 @@ namespace FineUIPro.Web.CLGL
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// lblPageIndex 控件。
/// tbActNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// txtSumUnitPrice 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSumUnitPrice;
/// <summary>
/// txtSumTax 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSumTax;
/// <summary>
/// txtSumAmount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSumAmount;
/// <summary>
/// txtAmountInWords 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAmountInWords;
/// <summary>
/// Form_approve 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form_approve;
/// <summary>
/// txtApproveIdea 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtApproveIdea;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
protected global::FineUIPro.NumberBox tbActNum;
/// <summary>
/// Window1 控件。

15
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx
View File

@ -84,7 +84,15 @@
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -134,7 +142,10 @@
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
FieldType="String" HeaderText="实际数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>

54
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx
View File

@ -74,7 +74,9 @@
</f:Button>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
</f:Button>
<f:Button ID="btnPassMaster" Text="审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" Hidden="true">
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" Hidden="true">
</f:Button>
<f:Button ID="btnPassMaster2" Text="材控审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster2_OnClick" Hidden="true">
</f:Button>
<f:Button ID="btnGenInOutMaster" Text="出库" Icon="ArrowRefresh" runat="server" OnClick="btnGenInOutMaster_Click" Hidden="true">
</f:Button>
@ -87,11 +89,11 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="申请单"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="申请单" IsFluid="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
AllowSorting="true" SortField="CusBillCode" SortDirection="ASC" OnSort="Grid1_Sort"
EnableTextSelection="True" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick">
EnableTextSelection="True" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" EnableRowGroup="true" DataRowGroupField="WeldTaskCode">
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
@ -123,6 +125,18 @@
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
FieldType="String" HeaderText="审核人(专工)" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间(专工" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditManName2" DataField="AuditManName2" SortField="AuditManName2"
FieldType="String" HeaderText="审核人(材控)" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditDate2" DataField="AuditDate2" SortField="AuditDate2" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间(材控)" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ReqUnitName" DataField="ReqUnitName" SortField="ReqUnitName"
FieldType="String" HeaderText="领料单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@ -143,15 +157,13 @@
<Tabs>
<f:Tab ID="TabDetail" Title="出库明细" BodyPadding="1px" Layout="VBox" runat="server" AutoScroll="true">
<Items>
<f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="入库申请明细表" EnableCollapse="true" ForceFit="true"
<f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="出库明细" EnableCollapse="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
SortDirection="DESC" EnableColumnLines="true" EnableBigData="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
<Columns>
<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@ -165,6 +177,32 @@
</f:Grid>
</Items>
</f:Tab>
<f:Tab ID="TabStrip2" Title="管线材料明细" BodyPadding="1px" Layout="VBox" runat="server" AutoScroll="true">
<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"
SortDirection="DESC" EnableRowGroup="true" DataRowGroupField="PipelineCode" AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
<Columns>
<f:RenderField Width="150px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PrefabricatedComponents" DataField="PrefabricatedComponents" SortField="PrefabricatedComponents"
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Number" DataField="Number" SortField="Number"
FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>

125
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
View File

@ -83,6 +83,9 @@ namespace FineUIPro.Web.CLGL
Grid2.DataSource = null;
Grid2.DataBind();
Grid3.DataSource = null;
Grid3.DataBind();
}
private void BindDetailGrid(string inOutPlanMasterId)
@ -93,6 +96,14 @@ namespace FineUIPro.Web.CLGL
Grid2.DataSource = tb;
Grid2.DataBind();
}
private void BindDetailRelationGrid(string inOutPlanMasterId)
{
Model.Tw_InOutPlanDetail_Relation table = new Model.Tw_InOutPlanDetail_Relation();
table.InOutPlanMasterId = inOutPlanMasterId;
var tb = BLL.TwInoutplandetailRelationService.GetListData(table, Grid3);
Grid3.DataSource = tb;
Grid3.DataBind();
}
#endregion
#region 排序
@ -159,11 +170,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork1)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.Text = q.UnitWorkName ;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1);
@ -173,11 +184,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork2)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.Text = q.UnitWorkName ;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
@ -215,6 +226,7 @@ namespace FineUIPro.Web.CLGL
{
string ID = Grid1.DataKeys[e.RowIndex][0].ToString();
BindDetailGrid(ID);
BindDetailRelationGrid(ID);
}
}
@ -229,9 +241,9 @@ namespace FineUIPro.Web.CLGL
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnAdd))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutPlanMasterMenuId, Const.BtnAdd))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InOutPlanMasterEdit.aspx?}", "新增 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx", "新增 - ")));
}
else
{
@ -241,7 +253,7 @@ namespace FineUIPro.Web.CLGL
protected void btnMenuInOutPlanMasterDelete_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutPlanMasterMenuId, Const.BtnDelete))
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
@ -287,7 +299,7 @@ namespace FineUIPro.Web.CLGL
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterOut.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
}
}
@ -300,7 +312,18 @@ namespace FineUIPro.Web.CLGL
return;
}
string planId = Grid1.SelectedRowID;
TwOutputmasterService.RevokeGenOutMasterByPlanId(planId);
string message = TwOutputmasterService.RevokeGenOutMasterByPlanId(planId);
if (string .IsNullOrEmpty(message))
{
ShowNotify("撤销出库成功!", MessageBoxIcon.Success);
BindGrid();
}
else
{
Alert.ShowInTop(message, MessageBoxIcon.Warning);
return;
}
}
@ -308,6 +331,62 @@ namespace FineUIPro.Web.CLGL
{
}
protected void btnPassMaster_OnClick(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string planId = Grid1.SelectedRowID;
var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
if (planMaster.State != (int)TwConst.State.待审核)
{
Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
return;
}
else
{
//planMaster.State = (int)TwConst.State.已审核;
planMaster.AuditMan = this.CurrUser.PersonId;
planMaster.AuditDate = DateTime.Now;
TwInOutplanmasterService.Update(planMaster);
BindGrid();
ShowNotify("审核通过！", MessageBoxIcon.Success);
}
}
protected void btnPassMaster2_OnClick(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string planId = Grid1.SelectedRowID;
var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
if (planMaster.State != (int)TwConst.State.待审核)
{
Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
return;
}
else
{
if (string.IsNullOrEmpty(planMaster.AuditMan))
{
Alert.ShowInTop("请专工先进行预审核！", MessageBoxIcon.Warning);
return;
}
planMaster.State = (int)TwConst.State.已审核;
planMaster.AuditMan2 = this.CurrUser.PersonId;
planMaster.AuditDate2 = DateTime.Now;
TwInOutplanmasterService.Update(planMaster);
BindGrid();
ShowNotify("审核通过！", MessageBoxIcon.Success);
}
}
#endregion
#region 报表打印
@ -469,12 +548,12 @@ namespace FineUIPro.Web.CLGL
/// <returns></returns>
private void GetButtonPower()
{
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.Tw_InPlanMasterMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.Tw_OutPlanMasterMenuId);
if (buttonList.Count > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
// this.btnNew.Hidden = false;
this.btnNew.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
@ -490,34 +569,12 @@ namespace FineUIPro.Web.CLGL
if (buttonList.Contains(BLL.Const.BtnAuditing))
{
this.btnPassMaster.Hidden = false;
this.btnPassMaster2.Hidden = false;
}
}
}
#endregion
protected void btnPassMaster_OnClick(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string planId = Grid1.SelectedRowID;
var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
if (planMaster.State != (int)TwConst.State.待审核)
{
Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
return;
}
else
{
planMaster.State = (int)TwConst.State.已审核;
TwInOutplanmasterService.Update(planMaster);
BindGrid();
ShowNotify("审核通过！", MessageBoxIcon.Success);
}
}
}
}

27
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs generated
View File

@ -185,6 +185,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Button btnPassMaster;
/// <summary>
/// btnPassMaster2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPassMaster2;
/// <summary>
/// btnGenInOutMaster 控件。
/// </summary>
@ -266,6 +275,24 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// TabStrip2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab TabStrip2;
/// <summary>
/// Grid3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// Window1 控件。
/// </summary>

56
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx
View File

@ -22,9 +22,12 @@
<Toolbars>
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnSave" ToolTip="出库" Text="出库" Icon="SystemSave" OnClick="btnSave_Click"
<f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="SystemSave" OnClick="btnSave_Click"
EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSave" runat="server" ToolTip="提交" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click" >
</f:Button>
<%--<f:Button ID="btnEditProcess" ToolTip="编辑流程" Text="编辑流程" Icon="ApplicationEdit" OnClick="btnEditProcess_Click"
EnablePostBack="true" runat="server">
</f:Button>--%>
@ -35,29 +38,49 @@
<f:Panel ID="Panel4" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextBox ID="txtProjectName" Label="任务单编号" Readonly="true" ColumnWidth="40%" runat="server">
<f:TextBox ID="txtWeldTaskCode" Label="任务单编号" Readonly="true" ColumnWidth="20%" runat="server">
</f:TextBox>
<f:TextBox ID="txtCusBillCode" Label="编号" Readonly="true" ColumnWidth="30%" runat="server">
</f:TextBox>
<f:TextBox ID="txtWarehouseCode" Label="仓库" Readonly="true" ColumnWidth="30%" runat="server">
<f:DropDownList ID="drpWarehouse" runat="server" Label="仓库" ColumnWidth="20%"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList ID="drpTypeInt" runat="server" Label="类型" ColumnWidth="20%"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:TextBox ID="txtCusBillCode" Label="编号" ColumnWidth="40%" runat="server">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="PanelOrderIn" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextBox ID="txtCreateMan" Label="发起人" ColumnWidth="40%" runat="server"></f:TextBox>
<f:TextBox ID="txtCreateDate" Label="发起时间" Readonly="true" ColumnWidth="30%" runat="server"></f:TextBox>
<f:TextBox ID="txtReqUnitName" Label="领料单位" ColumnWidth="30%" runat="server">
<f:TextBox ID="txtCreateMan" Label="发起人" runat="server" ColumnWidth="20%"></f:TextBox>
<f:TextBox ID="txtCreateDate" Label="发起时间" runat="server" ColumnWidth="20%"></f:TextBox>
<f:DropDownList ID="drpReqUnit" runat="server" Label="领料单位" ColumnWidth="30%"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:TextBox ID="txtRemark" Label="备注" runat="server" ColumnWidth="30%">
</f:TextBox>
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="出库单列表"
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="出库明细"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"
DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true" OnRowCommand="Grid1_RowCommand"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnSelect" Icon="ShapeSquareSelect" Text="选择" runat="server" ToolTip="选择" ValidateForms="SimpleForm1"
OnClick="btnSelect_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
<f:RenderField Width="150px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PrefabricatedComponents" DataField="PrefabricatedComponents" SortField="PrefabricatedComponents"
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
@ -66,16 +89,15 @@
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ActNum" DataField="ActNum" FieldType="Float"
HeaderText="实际数量">
<f:RenderField Width="100px" ColumnID="Number" DataField="Number" FieldType="Float"
HeaderText="计划数量">
<Editor>
<f:NumberBox ID="tbActNum" NoDecimal="False" NoNegative="true" DecimalPrecision="2" Increment="0.01" Required="True" runat="server">
<f:NumberBox ID="tbNumber" NoDecimal="False" NoNegative="true" DecimalPrecision="2" Increment="0.01" Required="True" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" ConfirmTarget="Top"
CommandName="delete" Icon="Delete" />
</Columns>
</f:Grid>
</Items>

211
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs
View File

@ -1,17 +1,37 @@
using System;
using BLL;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.HJGL.WeldingManage;
using FineUIPro.Web.ProjectData;
using Microsoft.Office.Interop.Word;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using static BLL.TwConst;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterEdit :PageBase
{
/// <summary>
/// 单位工程主键
/// </summary>
public string UnitWorkId
{
get
{
return (string)ViewState["UnitWorkId"];
}
set
{
ViewState["UnitWorkId"] = value;
}
}
public string Id
{
get
@ -27,81 +47,172 @@ namespace FineUIPro.Web.CLGL
{
if (!IsPostBack)
{
InitDrpList();
UnitWorkId = Request.QueryString["UnitWorkId"];
Id = Request.QueryString["Id"];
if (!string.IsNullOrEmpty(Id))
{
var model= TwInOutplanmasterService.GetById(Id);
txtCusBillCode.Text = model.CusBillCode;
txtWarehouseCode.Text = model.WarehouseCode;
txtCreateDate.Text =string.Format("{0:yyyy-MM-dd}", model.CreateDate);
txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
txtReqUnitName.Text = UnitService.GetUnitNameByUnitId(model.ReqUnitId);
var queryModel = new Model.Tw_InOutDetailOutput()
var queryModel = new Model.Tw_InOutMasterOutput()
{
InOutPlanMasterId = Id
Id=Id,
};
var detailList= TwInOutplandetailService.GetByModle(queryModel).ToList();
foreach (var item in detailList)
var result = BLL.TwInOutplanmasterService.GetListData(queryModel).FirstOrDefault();
txtCreateMan.Text = result.CreateManName;
txtCreateDate.Text =result.CreateDate.Value.ToString("yyyy-MM-dd");
drpReqUnit.SelectedValue = result.ReqUnitId;
BindGrid(Id);
}
else
{
item.ActNum=item.PlanNum;
txtCreateMan.Text = this.CurrUser.PersonName;
txtCreateDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
drpReqUnit.SelectedValue = this.CurrUser.UnitId;
}
}
Grid1.DataSource=detailList;
}
private void InitDrpList()
{
drpWarehouse.DataTextField = "Text";
drpWarehouse.DataValueField = "Value";
drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
drpWarehouse.DataBind();
Funs.FineUIPleaseSelect(this.drpWarehouse);
drpTypeInt.DataTextField = "Key";
drpTypeInt.DataValueField = "Value";
drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x => x.Key.Contains("出库")); ;
drpTypeInt.DataBind();
Funs.FineUIPleaseSelect(this.drpTypeInt);
UnitService.InitUnitDropDownList(drpReqUnit, this.CurrUser.LoginProjectId, true);
}
private void BindGrid(string inOutPlanMasterId)
{
var queryRelationModel = new Tw_InOutPlanDetail_Relation();
queryRelationModel.InOutPlanMasterId = Id;
var tb = TwInoutplandetailRelationService.GetListData(queryRelationModel, Grid1);
Grid1.DataSource = tb;
Grid1.DataBind();
}
#region 选择按钮
/// <summary>
/// 选择按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSelect_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterSelect.aspx", "选择- ")));
}
#endregion
protected void btnSave_Click(object sender, EventArgs e)
{
Save(Const.BtnSave);
ShowNotify("保存成功！", MessageBoxIcon.Success);
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
Save(Const.BtnSubmit);
ShowNotify("提交成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
void Save(string type)
{
int state = (int)TwConst.State.待提交;
switch (type)
{
case Const.BtnSave:
state=(int)TwConst.State.待提交;
break;
case Const.BtnSubmit:
state = (int)TwConst.State.待审核;
break;
}
if (string.IsNullOrEmpty(Id))
{
Id = Guid.NewGuid().ToString();
var model = new Tw_InOutPlanMaster()
{
Id = Id,
ProjectId=this.CurrUser.LoginProjectId,
CusBillCode=txtCusBillCode.Text,
WarehouseCode = drpWarehouse.SelectedValue,
WeldTaskId=UnitWorkId,
Source=1,
CreateDate = DateTime.Now,
CreateMan = this.CurrUser.PersonId,
ReqUnitId = drpReqUnit.SelectedValue,
TypeInt = int.Parse( drpTypeInt.SelectedValue),
Remark = txtRemark.Text,
InOutType=(int)TwConst.InOutType.出库,
Category= (int)TwConst.Category.全部,
State=state
};
TwInOutplanmasterService.Add(model);
}
else
{
var model = TwInOutplanmasterService.GetById(Id);
model.ProjectId = this.CurrUser.LoginProjectId;
model.CusBillCode = txtCusBillCode.Text;
model.WarehouseCode = drpWarehouse.SelectedValue;
model.WeldTaskId = UnitWorkId;
model.Source = 1;
model.CreateDate = DateTime.Now;
model.CreateMan = this.CurrUser.PersonId;
model.ReqUnitId = drpReqUnit.SelectedValue;
model.TypeInt = int.Parse(drpTypeInt.SelectedValue);
model.Remark = txtRemark.Text;
model.InOutType = (int)TwConst.InOutType.出库;
model.Category = (int)TwConst.Category.全部;
model.State = state;
TwInOutplanmasterService.Update(model);
}
}
}
/// <summary>
/// 保存明细项
/// </summary>
private List<Model.Tw_OutputDetail> SaveDetail(string InOutPlanMasterId)
private void SaveDetail()
{
//根据列表中的明细项添加
List<Model.Tw_OutputDetail> detailLists = new List<Model.Tw_OutputDetail>();
List<Model.Tw_InOutPlanDetail_Relation> detailLists = new List<Model.Tw_InOutPlanDetail_Relation>();
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Tw_OutputDetail newDetail = new Model.Tw_OutputDetail
{
Id = SQLHelper.GetNewID(),
OutputMasterId = InOutPlanMasterId,
//ProNoticeCId= values.Value<string>("ProNoticeCId"),
MaterialCode = values.Value<string>("MaterialCode"),
PlanNum = values.Value<decimal>("PlanNum"),
ActNum = values.Value<decimal>("ActNum"),
};
detailLists.Add(newDetail);
}
return detailLists;
}
protected void btnEditProcess_Click(object sender, EventArgs e)
var mdoel=TwInoutplandetailRelationService.GetById(values.Value<string>("Id"));
if (mdoel != null)
{
throw new NotImplementedException();
mdoel.Number= values.Value<decimal>("Number");
}
TwInoutplandetailRelationService.Update(mdoel);
}
TwInOutplandetailService.GenInOutPlanDetailByInoutPlanMasterId(Id);
}
protected void btnSave_Click(object sender, EventArgs e)
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
TwOutputmasterService.GenOutMasterByPlanId(Id, SaveDetail(Id));
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
protected void btnAgree_Click(object sender, EventArgs e)
if (e.CommandName == "delete" )
{
throw new NotImplementedException();
}
protected void btnDisgree_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
string id = e.RowID;
TwInoutplandetailRelationService.DeleteById(id);
TwInOutplandetailService.GenInOutPlanDetailByInoutPlanMasterId(Id);
BindGrid(Id);
}
}
}
}

75
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.designer.cs generated
View File

@ -50,6 +50,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// Panel4 控件。
/// </summary>
@ -60,13 +69,31 @@ namespace FineUIPro.Web.CLGL
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// txtProjectName 控件。
/// txtWeldTaskCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
protected global::FineUIPro.TextBox txtWeldTaskCode;
/// <summary>
/// drpWarehouse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWarehouse;
/// <summary>
/// drpTypeInt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTypeInt;
/// <summary>
/// txtCusBillCode 控件。
@ -77,15 +104,6 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.TextBox txtCusBillCode;
/// <summary>
/// txtWarehouseCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWarehouseCode;
/// <summary>
/// PanelOrderIn 控件。
/// </summary>
@ -114,13 +132,22 @@ namespace FineUIPro.Web.CLGL
protected global::FineUIPro.TextBox txtCreateDate;
/// <summary>
/// txtReqUnitName 控件。
/// drpReqUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtReqUnitName;
protected global::FineUIPro.DropDownList drpReqUnit;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// Grid1 控件。
@ -132,13 +159,31 @@ namespace FineUIPro.Web.CLGL
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// tbActNum 控件。
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox tbActNum;
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// btnSelect 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelect;
/// <summary>
/// tbNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox tbNumber;
/// <summary>
/// Window1 控件。

93
SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx Normal file
View File

@ -0,0 +1,93 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OutPlanMasterOut.aspx.cs" Inherits="FineUIPro.Web.CLGL.OutPlanMasterOut" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<style type="text/css">
.f-readonly {
opacity: .5;
filter: alpha(opacity=50);
}
</style>
</head>
<body>
<form id="form1" runat="server">
<div>
<f:PageManager runat="server" AutoSizePanelID="Form2" />
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="出库单详情"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" >
<Items>
<f:Button ID="btnSave" ToolTip="出库" Text="出库" Icon="SystemSave" OnClick="btnSave_Click"
EnablePostBack="true" runat="server">
</f:Button>
<%--<f:Button ID="btnEditProcess" ToolTip="编辑流程" Text="编辑流程" Icon="ApplicationEdit" OnClick="btnEditProcess_Click"
EnablePostBack="true" runat="server">
</f:Button>--%>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Panel ID="Panel4" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextBox ID="txtWeldTaskCode" Label="任务单编号" Readonly="true" ColumnWidth="40%" runat="server">
</f:TextBox>
<f:TextBox ID="txtCusBillCode" Label="编号" Readonly="true" ColumnWidth="30%" runat="server">
</f:TextBox>
<f:TextBox ID="txtWarehouseCode" Label="仓库" Readonly="true" ColumnWidth="30%" runat="server">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="PanelOrderIn" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server" >
<Items>
<f:TextBox ID="txtCreateMan" Label="发起人" ColumnWidth="40%" runat="server"></f:TextBox>
<f:TextBox ID="txtCreateDate" Label="发起时间" Readonly="true" ColumnWidth="30%" runat="server"></f:TextBox>
<f:TextBox ID="txtReqUnitName" Label="领料单位" ColumnWidth="30%" runat="server">
</f:TextBox>
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="出库单列表"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"
EnableTextSelection="True">
<Columns>
<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ActNum" DataField="ActNum" FieldType="Float"
HeaderText="实际数量">
<Editor>
<f:NumberBox ID="tbActNum" NoDecimal="False" NoNegative="true" DecimalPrecision="2" Increment="0.01" Required="True" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Form>
</div>
<f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true"
Title="编辑" EnableIFrame="true" Height="650px"
Width="1200px">
</f:Window>
</form>
</body>
</html>

111
SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs Normal file
View File

@ -0,0 +1,111 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using FineUIPro.Web.HSSE.EduTrain;
using Model;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterOut : PageBase
{
public string Id
{
get
{
return (string)ViewState["Id"];
}
set
{
ViewState["Id"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
Id = Request.QueryString["Id"];
if (!string.IsNullOrEmpty(Id))
{
Model.Tw_InOutMasterOutput table = new Model.Tw_InOutMasterOutput();
table.InOutPlanMasterId = Id;
var model = TwInOutplanmasterService.GetListData(table).FirstOrDefault();
txtCusBillCode.Text = TwOutputmasterService.GetCusBillCodeByTaskCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category);
txtWarehouseCode.Text = model.WarehouseCode;
txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
txtReqUnitName.Text = UnitService.GetUnitNameByUnitId(model.ReqUnitId);
txtWeldTaskCode.Text = model.WeldTaskCode;
var queryModel = new Model.Tw_InOutDetailOutput()
{
InOutPlanMasterId = Id
};
var detailList= TwInOutplandetailService.GetByModle(queryModel).ToList();
foreach (var item in detailList)
{
item.ActNum=item.PlanNum;
}
Grid1.DataSource=detailList;
Grid1.DataBind();
}
}
}
/// <summary>
/// 保存明细项
/// </summary>
private List<Model.Tw_OutputDetail> SaveDetail(string InOutPlanMasterId)
{
//根据列表中的明细项添加
List<Model.Tw_OutputDetail> detailLists = new List<Model.Tw_OutputDetail>();
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Tw_OutputDetail newDetail = new Model.Tw_OutputDetail
{
Id = SQLHelper.GetNewID(),
OutputMasterId = InOutPlanMasterId,
//ProNoticeCId= values.Value<string>("ProNoticeCId"),
MaterialCode = values.Value<string>("MaterialCode"),
PlanNum = values.Value<decimal>("PlanNum"),
ActNum = values.Value<decimal>("ActNum"),
};
detailLists.Add(newDetail);
}
return detailLists;
}
protected void btnEditProcess_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
protected void btnSave_Click(object sender, EventArgs e)
{
TwOutputmasterService.GenOutMasterByPlanId(Id, SaveDetail(Id));
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
protected void btnAgree_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
protected void btnDisgree_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
}
}

152
SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,152 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterOut
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// TbCreate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar TbCreate;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// txtWeldTaskCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldTaskCode;
/// <summary>
/// txtCusBillCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCusBillCode;
/// <summary>
/// txtWarehouseCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWarehouseCode;
/// <summary>
/// PanelOrderIn 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel PanelOrderIn;
/// <summary>
/// txtCreateMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCreateMan;
/// <summary>
/// txtCreateDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCreateDate;
/// <summary>
/// txtReqUnitName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtReqUnitName;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// tbActNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox tbActNum;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}

123
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx Normal file
View File

@ -0,0 +1,123 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OutPlanMasterSelect.aspx.cs" Inherits="FineUIPro.Web.CLGL.OutPlanMasterSelect" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>查询焊口</title>
<style type="text/css">
.tn-color-green .f-tree-folder {
color: green;
}
</style>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="280px" Title="管线" ShowBorder="true" Layout="VBox"
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线"
EmptyText="输入查询条件" Width="190px" LabelWidth="80px"
LabelAlign="Left">
</f:TextBox>
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
runat="server" LabelWidth="80px"
Width="180px" LabelAlign="Left">
</f:DropDownList>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="管线列表"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" OnNodeExpand="tvControlItem_TreeNodeExpanded"
EnableTextSelection="true">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊口信息"
TitleToolTip="焊口信息" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound" DisableUnselectableRows="true"
DataKeyNames="WeldJointId" EnableColumnLines="true"
DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointNum,WeldJointNumStr"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true" OnRowCommand="Grid1_RowCommand"
PageSize="1000" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="PageSave" runat="server" ToolTip="保存" Text="保存"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnAccept" Icon="Accept" runat="server" ToolTip="提交" Text="提交"
OnClick="btnAccept_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
FieldType="String" HeaderText="规格" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialUnit" DataField="MaterialUnit" SortField="MaterialUnit"
FieldType="String" HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
FieldType="String" HeaderText="实时库存" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
<script>
function renderIsProess(value) {
return value == "1" ? '是' : '否';
}
</script>
</body>
</html>

521
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs Normal file
View File

@ -0,0 +1,521 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterSelect : PageBase
{
#region 定义项
/// <summary>
/// 单位工程主键
/// </summary>
public string UnitWorkId
{
get
{
return (string)ViewState["UnitWorkId"];
}
set
{
ViewState["UnitWorkId"] = value;
}
}
public string Id
{
get
{
return (string)ViewState["Id"];
}
set
{
ViewState["Id"] = value;
}
}
// public List<HJGL_Pipeline> Tree_hJGL_Pipelines;
public int pageSize = PipelineService.pageSize;
#endregion
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.InitTreeMenu();//加载树
}
}
#endregion
#region 加载树
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
this.tvControlItem.Nodes.Clear();
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.PipeArea == PipelineService.PipeArea_SHOP && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.PipeArea == PipelineService.PipeArea_FIELD && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
TreeNode rootNode1 = new TreeNode();
rootNode1.NodeID = BLL.PipelineService.PipeArea_SHOP;
rootNode1.Text = "工厂预制";
rootNode1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); //页码|总页
rootNode1.EnableClickEvent = true;
rootNode1.EnableExpandEvent = true;
this.tvControlItem.Nodes.Add(rootNode1);
if (a > 0)
{
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
rootNode1.Nodes.Add(newNode);
}
TreeNode rootNode2 = new TreeNode();
rootNode2.NodeID = BLL.PipelineService.PipeArea_FIELD;
rootNode2.Text = "现场施工";
rootNode2.CommandName = 1 + "|" + Funs.GetEndPageNumber(b, pageSize);
rootNode2.EnableClickEvent = true;
rootNode2.EnableExpandEvent = true;
this.tvControlItem.Nodes.Add(rootNode2);
if (b > 0)
{
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
rootNode2.Nodes.Add(newNode);
}
}
void AddTreeNode(string PipeArea, TreeNode node)
{
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.UnitWorkId
&& x.PipeArea == PipeArea
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
{
pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
}
var joints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
int pageindex = int.Parse(node.CommandName.Split('|')[0]);
int pageCount = int.Parse(node.CommandName.Split('|')[1]);
if (pageindex <= pageCount)
{
pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); ;
foreach (var item in pipeline)
{
TreeNode newNode = new TreeNode();
int totalJointNum = joints.Count(x => x.PipelineId == item.PipelineId);
int weldJointNum = joints.Count(x => x.PipelineId == item.PipelineId && x.WeldingDailyId != null);
//bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId);
//if (istrue)
//{
// newNode.CssClass = "tn-color-green";
//}
newNode.Text = item.PipelineCode + "(" + (totalJointNum - weldJointNum).ToString() + ")";
newNode.NodeID = item.PipelineId;
newNode.ToolTip = item.PipelineCode;
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
if (pageindex < pageCount)
{
TreeNode newNode = new TreeNode();
newNode.Text = "加载";
newNode.NodeID = SQLHelper.GetNewID();
newNode.Icon = Icon.ArrowDown;
newNode.CommandName = PipeArea;
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
}
}
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
if (e.Node.Nodes[0].NodeID == "加载管线...")
{
e.Node.Nodes.Clear();
if (e.Node.Text == "工厂预制")
{
AddTreeNode(BLL.PipelineService.PipeArea_SHOP, e.Node);
}
else if (e.Node.Text == "现场施工")
{
AddTreeNode(BLL.PipelineService.PipeArea_FIELD, e.Node);
}
}
}
#endregion
#region 点击TreeView
/// <summary>
/// 点击TreeView
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
if (e.Node.Text == "加载")
{
string CommandName = e.Node.ParentNode.CommandName;
e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]);
TreeNode treeNode = e.Node.ParentNode;
treeNode.Nodes.Remove(e.Node);
if (e.Node.CommandName == "1")
{
AddTreeNode(BLL.PipelineService.PipeArea_SHOP, e.Node.ParentNode);
}
else if (e.Node.CommandName == "2")
{
AddTreeNode(BLL.PipelineService.PipeArea_FIELD, e.Node.ParentNode);
}
}
else
{
this.BindGrid();
}
}
#endregion
#region 数据绑定
/// <summary>
/// 数据绑定
/// </summary>
private void BindGrid()
{
//var tb=from x in Funs.DB.HJGL_PipeLineMat
// join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
// join z in Funs.DB.Tw_MaterialStock on x.MaterialCode equals z.PipeLineMatCode
// where y.ProjectId == this.CurrUser.LoginProjectId && y.UnitWorkId == this.UnitWorkId && y.PipelineId== this.tvControlItem.SelectedNodeID
////var tb = PipelineMatService.GetPipeLineMatsByPipelineId(this.tvControlItem.SelectedNodeID);
//Grid1.DataSource = tb;
//Grid1.DataBind();
}
private void InitDropList()
{
/* var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.UnitWorkId
select x.FlowingSection).Distinct().ToList();
this.drpFlowingSection.DataTextField = "Value";
this.drpFlowingSection.DataValueField = "Value";
this.drpFlowingSection.DataSource = pipeline;
this.drpFlowingSection.DataBind();
Funs.FineUIPleaseSelect(drpFlowingSection);*/
}
#endregion
#region 管线查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnQuery_Click(object sender, EventArgs e)
{
this.InitTreeMenu();
this.BindGrid();
}
#endregion
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
this.BindGrid();
}
#endregion
#region 提交按钮
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAccept_Click(object sender, EventArgs e)
{
//PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference());
}
protected void btnSave_Click(object sender, EventArgs e)
{
/*if (string.IsNullOrEmpty(this.txtTaskCode.Text.Trim()))
{
ShowNotify("请输入焊接任务单编号", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(txtTaskDate.Text))
{
if (!string.IsNullOrEmpty(TaskDate))
{
SaveTask(false);
BindGrid();
}
else
{
var task = from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == UnitWorkId && x.UnitId == this.drpUnit.SelectedValue
&& x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd")
select x;
if (task.Count() > 0)
{
ShowNotify("所选预计焊接日期已存在,请重新选择！", MessageBoxIcon.Warning);
return;
}
else
{
SaveTask(false);
TaskDate = txtTaskDate.Text;
BindGrid();
}
}
}
else
{
ShowNotify("请选择预计焊接日期", MessageBoxIcon.Warning);
return;
}*/
}
private void SaveTask(bool IsCloseForm)
{
/*var weldingRods = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "2" select x;
var weldingWires = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "1" select x;
string[] selectRowId = Grid1.SelectedRowIDArray;
for (int i = 0; i < selectRowId.Count(); i++)
{
string canWeldingRodName = string.Empty;
string canWeldingWireName = string.Empty;
Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask();
NewTask.ProjectId = this.CurrUser.LoginProjectId;
NewTask.UnitWorkId = this.UnitWorkId;
NewTask.UnitId = drpUnit.SelectedValue;
NewTask.TaskCode = this.txtTaskCode.Text.Trim();
NewTask.WeldTaskId = SQLHelper.GetNewID();
NewTask.WeldJointId = selectRowId[i];
var oldWeldTask = BLL.WeldTaskService.GetWeldTaskByWeldJointId(NewTask.WeldJointId);
if (oldWeldTask != null)
{
ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Warning);
return;
}
Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId);
if (weldJoint != null)
{
NewTask.WeldingRod = weldJoint.WeldingRod;
NewTask.WeldingWire = weldJoint.WeldingWire;
//获取可替代焊丝焊条
var mat = BLL.Base_MaterialService.GetMaterialByMaterialId(weldJoint.Material1Id);
string matClass = mat.MaterialClass;
var matRod = weldingRods.FirstOrDefault(x => x.ConsumablesId == weldJoint.WeldingRod);
if (matRod != null)
{
foreach (var item in weldingRods)
{
if (matClass == "Fe-1" || matClass == "Fe-3")
{
if (IsCoverClass(matRod.SteelType, item.SteelType))
{
canWeldingRodName = canWeldingRodName + item.ConsumablesName + ",";
}
}
else
{
if (matRod.SteelType == item.SteelType)
{
canWeldingRodName = canWeldingRodName + item.ConsumablesName + ",";
}
}
}
if (!string.IsNullOrEmpty(canWeldingRodName))
{
NewTask.CanWeldingRodName = canWeldingRodName.Substring(0, canWeldingRodName.Length - 1);
}
}
var matWire = weldingWires.FirstOrDefault(x => x.ConsumablesId == weldJoint.WeldingWire);
if (matWire != null)
{
foreach (var item in weldingWires)
{
if (matClass == "Fe-1" || matClass == "Fe-3")
{
if (IsCoverClass(matWire.SteelType, item.SteelType))
{
canWeldingWireName = canWeldingWireName + item.ConsumablesName + ",";
}
}
else
{
if (matWire.SteelType == item.SteelType)
{
canWeldingWireName = canWeldingWireName + item.ConsumablesName + ",";
}
}
}
if (!string.IsNullOrEmpty(canWeldingWireName))
{
NewTask.CanWeldingWireName = canWeldingWireName.Substring(0, canWeldingWireName.Length - 1);
}
}
}
//NewTask.JointAttribute = drpJointAttribute.SelectedValue;
NewTask.JointAttribute = weldJoint.JointAttribute;
NewTask.WeldingMode = drpWeldingMode.SelectedValue;
NewTask.TaskDate = Convert.ToDateTime(txtTaskDate.Text);
NewTask.Tabler = this.CurrUser.PersonId;
NewTask.TableDate = DateTime.Now;
weldJoint.WeldingMode = drpWeldingMode.SelectedValue;
BLL.WeldJointService.UpdateWeldJoint(weldJoint);
BLL.WeldTaskService.AddWeldTask(NewTask);
}
//string pipelineId = this.tvControlItem.SelectedNodeID;
//var model = BLL.PipelineService.GetPipelineByPipelineId(pipelineId);
//model.State = 1;
//PipelineService.UpdatePipeline(model);
ShowNotify("保存成功！", MessageBoxIcon.Success);
if (IsCloseForm)
{
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference());
}*/
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
/// <summary>
/// 判断耗材强度是否大于WPS耗材强度，如是为true,否则为false
/// </summary>
/// <param name="wpsClass"></param>
/// <param name="matClass"></param>
/// <returns></returns>
private bool IsCoverClass(string wpsClass, string matClass)
{
bool isCover = false;
/*int wpsSn = 0;
int matSn = 0;
if (wpsClass.Length > 2 && matClass.Length > 2)
{
string wpsPre = wpsClass.Substring(0, wpsClass.Length - 2);
string matPre = matClass.Substring(0, matClass.Length - 2);
string wps = wpsClass.Substring(wpsClass.Length - 1, 1);
wpsSn = Funs.GetNewInt(wps).HasValue ? Funs.GetNewInt(wps).Value : 0;
string mat = matClass.Substring(matClass.Length - 1, 1);
matSn = Funs.GetNewInt(mat).HasValue ? Funs.GetNewInt(mat).Value : 0;
if (wpsPre == matPre && matSn >= wpsSn)
{
return true;
}
}*/
return isCover;
}
#endregion
protected void txtTaskDate_TextChanged(object sender, EventArgs e)
{
// this.txtTaskCode.Text = BLL.WeldTaskService.GetTaskCodeByDate(this.CurrUser.LoginProjectId, this.txtTaskDate.Text, UnitWorkId, drpUnit.SelectedValue);
}
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
//this.txtTaskCode.Text = BLL.WeldTaskService.GetTaskCodeByDate(this.CurrUser.LoginProjectId, this.txtTaskDate.Text, UnitWorkId, drpUnit.SelectedValue);
}
protected void drpJointAttribute_SelectedIndexChanged(object sender, EventArgs e)
{
BindGrid();
}
/// <summary>
/// 行绑定事件（没有焊接方法无法选择）
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
/*DataRowView row = e.DataItem as DataRowView;
if (string.IsNullOrEmpty(row["WeldingMethodCode"].ToString()))
{
e.RowSelectable = false;
};*/
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "ResetWpq")
{
/*var weldJointId = e.RowID;
var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId);
if (model != null)
{
model.WPQId = null;
WeldJointService.UpdateWeldJoint(model);
List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
if (wpqList != null)
{
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
newJot.WPQId = wps.WPQId;
newJot.WeldJointId = model.WeldJointId;
newJot.WeldingRod = wps.WeldingRod;
newJot.WeldingWire = wps.WeldingWire;
newJot.WeldingMethodId = wps.WeldingMethodId;
newJot.GrooveTypeId = wps.GrooveType;
newJot.PreTemperature = wps.PreTemperature;
newJot.IsHotProess = wps.IsHotProess;
newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
BLL.WeldJointService.UpdateConWeldJoint(newJot);
}
BindGrid();
ShowNotify("焊评已重置！", MessageBoxIcon.Success);
}*/
}
}
}
}

170
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,170 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterSelect
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// drpFlowingSection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpFlowingSection;
/// <summary>
/// tvControlItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnAccept 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAccept;
}
}

21
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx
View File

@ -1,4 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OutputMaster.aspx.cs" Inherits="FineUIPro.Web.CLGL.OutputMaster" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
@ -15,9 +16,11 @@
color: blue;
font-weight: bold;
}
.f-grid-row.red {
background-color: red;
}
.f-grid-row.yellow {
background-color: yellow;
}
@ -77,7 +80,7 @@
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
</f:Button>
<f:Button ID="btnGenInPlanMaster" Text="生成退料申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenInPlanMaster_Click" Hidden="true">
<f:Button ID="btnGenInPlanMaster" Text="生成退料通知单" Icon="ArrowRefresh" runat="server" OnClick="btnGenInPlanMaster_Click" Hidden="true">
</f:Button>
<f:Button ID="btnGenOutPlanMaster" Text="生成补料申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click" Hidden="true">
</f:Button>
@ -125,6 +128,12 @@
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ReqUnitName" DataField="ReqUnitName" SortField="ReqUnitName"
FieldType="String" HeaderText="领料单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@ -151,9 +160,9 @@
SortDirection="DESC" EnableColumnLines="true" EnableBigData="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
<Columns>
<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
<%--<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@ -166,6 +175,12 @@
<f:RenderField Width="150px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
FieldType="String" HeaderText="实际数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DiffNum" DataField="DiffNum" SortField="DiffNum"
FieldType="String" HeaderText="差异" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
FieldType="String" HeaderText="实时库存" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>

10
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
View File

@ -170,11 +170,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork1)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.Text = q.UnitWorkName ;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1);
@ -184,11 +184,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork2)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn2.Text = q.UnitWorkName ;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
@ -511,7 +511,7 @@ namespace FineUIPro.Web.CLGL
/// <returns></returns>
private void GetButtonPower()
{
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.Tw_InPlanMasterMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.Tw_OutputMasterMenuId);
if (buttonList.Count > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))

18
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -94,7 +94,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\FastReport.Web.dll</HintPath>
</Reference>
<Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<Reference Include="FineUIPro, Version=8.2.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
@ -307,12 +307,14 @@
<Content Include="CLGL\ArrivalStatistics.aspx" />
<Content Include="CLGL\OutPlanMaster.aspx" />
<Content Include="CLGL\OutPlanMasterEdit.aspx" />
<Content Include="CLGL\OutPlanMasterOut.aspx" />
<Content Include="CLGL\InPlanMaster.aspx" />
<Content Include="CLGL\InPlanMasterDataIn.aspx" />
<Content Include="CLGL\InPlanMasterEdit.aspx" />
<Content Include="CLGL\InputMaster.aspx" />
<Content Include="CLGL\InputMasterEdit.aspx" />
<Content Include="CLGL\MaterialStock.aspx" />
<Content Include="CLGL\OutPlanMasterSelect.aspx" />
<Content Include="CLGL\OutputMaster.aspx" />
<Content Include="CLGL\OutputMasterEdit.aspx" />
<Content Include="common\main2.aspx" />
@ -8032,6 +8034,13 @@
<Compile Include="CLGL\OutPlanMasterEdit.aspx.designer.cs">
<DependentUpon>OutPlanMasterEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutPlanMasterOut.aspx.cs">
<DependentUpon>OutPlanMasterOut.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\OutPlanMasterOut.aspx.designer.cs">
<DependentUpon>OutPlanMasterOut.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\InPlanMaster.aspx.cs">
<DependentUpon>InPlanMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -8074,6 +8083,13 @@
<Compile Include="CLGL\MaterialStock.aspx.designer.cs">
<DependentUpon>MaterialStock.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutPlanMasterSelect.aspx.cs">
<DependentUpon>OutPlanMasterSelect.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\OutPlanMasterSelect.aspx.designer.cs">
<DependentUpon>OutPlanMasterSelect.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutputMaster.aspx.cs">
<DependentUpon>OutputMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

4
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
View File

@ -43,7 +43,7 @@
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" EnableCollapse="true"
ShowHeader="false" Layout="Region" >
<Items>
<f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true" RegionPercent="60%"
<f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true" RegionPercent="60%" Hidden="true"
ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
TitleToolTip="三维模型显示" >
<Items>
@ -54,7 +54,7 @@
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" ShowBorder="true"
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" RegionSplit="true" ShowBorder="true"
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="管线信息"
TitleToolTip="管线信息" AutoScroll="true" RegionPercent="40%">
<Toolbars>

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -177,7 +177,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.drpUnitWork.SelectedValue = w.UnitWorkId;
}
this.SimpleForm1.Reset(); ///重置所有字段
//this.SimpleForm1.Reset(); ///重置所有字段
this.txtTabler.Text = this.CurrUser.PersonName;
this.hdTablerId.Text = this.CurrUser.PersonId;

3
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -1279,8 +1279,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId2 = tvControlItem.SelectedNodeID.Split('|')[1];
taskdate = tvControlItem.SelectedNodeID.Split('|')[2];
WeldTaskService.GenOutPlanmasterByWeldTaskId(unitWorkId, unitId2, Convert.ToDateTime(taskdate), this.CurrUser.PersonId);
TwInOutplanmasterService.GenOutPlanmasterByWeldTaskId(unitWorkId, unitId2, Convert.ToDateTime(taskdate), this.CurrUser.PersonId);
ShowNotify("生成出库申请单成功", MessageBoxIcon.Success);
}
else

16
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -14,6 +14,7 @@
.sd-header2 .sd-header2-right ul li .sd-message-dot-none::after {
display: none;
}
.f-tabstrip-header-clip {
width: 100%;
height: 35px;
@ -24,6 +25,11 @@
padding: 0 10px;
}
.f-widget-content {
border: none;
background: none;
}
.item-s {
padding: 0;
}
@ -43,6 +49,16 @@
padding: 0 !important;
line-height: 1;
}
/*.f-panel .f-widget-content .f-panel-border .f-messagebox .f-shadow .f-window .f-messagebox-alert .f-cmp .f-widget {
background-color:#fff;
}*/
.f-messagebox {
background: #fff !important;
}
.f-tabstrip > .f-panel-bodyct > .f-panel-body {
padding-top: 10px;
}
.activeClick {
font-weight: 800;

BIN
SGGL/FineUIPro/FineUIPro.dll
View File

Binary file not shown.

8
SGGL/Model/CLGL/Tw_InOutDetailOutput.cs
View File

@ -12,5 +12,13 @@ namespace Model
public string MaterialName { get; set; } //预制组件代码
public string InputMasterId { get; set; }
public string OutputMasterId { get; set; }
/// <summary>
/// 库存数量
/// </summary>
public decimal StockNum { get; set; }
/// <summary>
/// 差异数量
/// </summary>
public decimal DiffNum { get; set; }
}
}

2
SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
View File

@ -13,6 +13,8 @@ namespace Model
public string StateString { get; set; }
public string TypeString { get; set; }
public string CreateManName { get; set; }
public string AuditManName { get; set; }
public string AuditManName2 { get; set; }
public string ReqUnitName { get; set; }
public string UnitWorkId { get; set; }
public string WeldTaskCode { get; set; }

17
SGGL/Model/CLGL/Tw_PipeLineMat.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
public class Tw_PipeLineMat
{
public string PipelineId { get; set; }
public string PrefabricatedComponents { get; set; }
public string MaterialCode { get; set; }
public decimal? Number { get; set; }
public string MaterialUnit { get; set; }
}
}

433
SGGL/Model/Model.cs
View File

@ -1673,6 +1673,9 @@ namespace Model
partial void InsertTw_InOutPlanDetail(Tw_InOutPlanDetail instance);
partial void UpdateTw_InOutPlanDetail(Tw_InOutPlanDetail instance);
partial void DeleteTw_InOutPlanDetail(Tw_InOutPlanDetail instance);
partial void InsertTw_InOutPlanDetail_Relation(Tw_InOutPlanDetail_Relation instance);
partial void UpdateTw_InOutPlanDetail_Relation(Tw_InOutPlanDetail_Relation instance);
partial void DeleteTw_InOutPlanDetail_Relation(Tw_InOutPlanDetail_Relation instance);
partial void InsertTw_InOutPlanMaster(Tw_InOutPlanMaster instance);
partial void UpdateTw_InOutPlanMaster(Tw_InOutPlanMaster instance);
partial void DeleteTw_InOutPlanMaster(Tw_InOutPlanMaster instance);
@ -6243,6 +6246,14 @@ namespace Model
}
}
public System.Data.Linq.Table<Tw_InOutPlanDetail_Relation> Tw_InOutPlanDetail_Relation
{
get
{
return this.GetTable<Tw_InOutPlanDetail_Relation>();
}
}
public System.Data.Linq.Table<Tw_InOutPlanMaster> Tw_InOutPlanMaster
{
get
@ -257083,6 +257094,188 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Tw_InOutPlanDetail_Relation")]
public partial class Tw_InOutPlanDetail_Relation : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _PipelineId;
private string _InOutPlanMasterId;
private string _MaterialCode;
private string _PrefabricatedComponents;
private System.Nullable<decimal> _Number;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnPipelineIdChanging(string value);
partial void OnPipelineIdChanged();
partial void OnInOutPlanMasterIdChanging(string value);
partial void OnInOutPlanMasterIdChanged();
partial void OnMaterialCodeChanging(string value);
partial void OnMaterialCodeChanged();
partial void OnPrefabricatedComponentsChanging(string value);
partial void OnPrefabricatedComponentsChanged();
partial void OnNumberChanging(System.Nullable<decimal> value);
partial void OnNumberChanged();
#endregion
public Tw_InOutPlanDetail_Relation()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")]
public string PipelineId
{
get
{
return this._PipelineId;
}
set
{
if ((this._PipelineId != value))
{
this.OnPipelineIdChanging(value);
this.SendPropertyChanging();
this._PipelineId = value;
this.SendPropertyChanged("PipelineId");
this.OnPipelineIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOutPlanMasterId", DbType="NVarChar(50)")]
public string InOutPlanMasterId
{
get
{
return this._InOutPlanMasterId;
}
set
{
if ((this._InOutPlanMasterId != value))
{
this.OnInOutPlanMasterIdChanging(value);
this.SendPropertyChanging();
this._InOutPlanMasterId = value;
this.SendPropertyChanged("InOutPlanMasterId");
this.OnInOutPlanMasterIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")]
public string MaterialCode
{
get
{
return this._MaterialCode;
}
set
{
if ((this._MaterialCode != value))
{
this.OnMaterialCodeChanging(value);
this.SendPropertyChanging();
this._MaterialCode = value;
this.SendPropertyChanged("MaterialCode");
this.OnMaterialCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PrefabricatedComponents", DbType="NVarChar(100)")]
public string PrefabricatedComponents
{
get
{
return this._PrefabricatedComponents;
}
set
{
if ((this._PrefabricatedComponents != value))
{
this.OnPrefabricatedComponentsChanging(value);
this.SendPropertyChanging();
this._PrefabricatedComponents = value;
this.SendPropertyChanged("PrefabricatedComponents");
this.OnPrefabricatedComponentsChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(9,2)")]
public System.Nullable<decimal> Number
{
get
{
return this._Number;
}
set
{
if ((this._Number != value))
{
this.OnNumberChanging(value);
this.SendPropertyChanging();
this._Number = value;
this.SendPropertyChanged("Number");
this.OnNumberChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Tw_InOutPlanMaster")]
public partial class Tw_InOutPlanMaster : INotifyPropertyChanging, INotifyPropertyChanged
{
@ -257117,6 +257310,16 @@ namespace Model
private System.Nullable<int> _Category;
private string _AuditMan;
private System.Nullable<System.DateTime> _AuditDate;
private string _Remark;
private string _AuditMan2;
private System.Nullable<System.DateTime> _AuditDate2;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -257149,6 +257352,16 @@ namespace Model
partial void OnReqUnitIdChanged();
partial void OnCategoryChanging(System.Nullable<int> value);
partial void OnCategoryChanged();
partial void OnAuditManChanging(string value);
partial void OnAuditManChanged();
partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
partial void OnAuditDateChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnAuditMan2Changing(string value);
partial void OnAuditMan2Changed();
partial void OnAuditDate2Changing(System.Nullable<System.DateTime> value);
partial void OnAuditDate2Changed();
#endregion
public Tw_InOutPlanMaster()
@ -257436,6 +257649,106 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")]
public string AuditMan
{
get
{
return this._AuditMan;
}
set
{
if ((this._AuditMan != value))
{
this.OnAuditManChanging(value);
this.SendPropertyChanging();
this._AuditMan = value;
this.SendPropertyChanged("AuditMan");
this.OnAuditManChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")]
public System.Nullable<System.DateTime> AuditDate
{
get
{
return this._AuditDate;
}
set
{
if ((this._AuditDate != value))
{
this.OnAuditDateChanging(value);
this.SendPropertyChanging();
this._AuditDate = value;
this.SendPropertyChanged("AuditDate");
this.OnAuditDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")]
public string Remark
{
get
{
return this._Remark;
}
set
{
if ((this._Remark != value))
{
this.OnRemarkChanging(value);
this.SendPropertyChanging();
this._Remark = value;
this.SendPropertyChanged("Remark");
this.OnRemarkChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan2", DbType="NVarChar(50)")]
public string AuditMan2
{
get
{
return this._AuditMan2;
}
set
{
if ((this._AuditMan2 != value))
{
this.OnAuditMan2Changing(value);
this.SendPropertyChanging();
this._AuditMan2 = value;
this.SendPropertyChanged("AuditMan2");
this.OnAuditMan2Changed();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate2", DbType="DateTime")]
public System.Nullable<System.DateTime> AuditDate2
{
get
{
return this._AuditDate2;
}
set
{
if ((this._AuditDate2 != value))
{
this.OnAuditDate2Changing(value);
this.SendPropertyChanging();
this._AuditDate2 = value;
this.SendPropertyChanged("AuditDate2");
this.OnAuditDate2Changed();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -257669,6 +257982,12 @@ namespace Model
private System.Nullable<int> _Category;
private string _AuditMan;
private System.Nullable<System.DateTime> _AuditDate;
private string _Remark;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -257697,6 +258016,12 @@ namespace Model
partial void OnReqUnitIdChanged();
partial void OnCategoryChanging(System.Nullable<int> value);
partial void OnCategoryChanged();
partial void OnAuditManChanging(string value);
partial void OnAuditManChanged();
partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
partial void OnAuditDateChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
#endregion
public Tw_InputMaster()
@ -257944,6 +258269,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")]
public string AuditMan
{
get
{
return this._AuditMan;
}
set
{
if ((this._AuditMan != value))
{
this.OnAuditManChanging(value);
this.SendPropertyChanging();
this._AuditMan = value;
this.SendPropertyChanged("AuditMan");
this.OnAuditManChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")]
public System.Nullable<System.DateTime> AuditDate
{
get
{
return this._AuditDate;
}
set
{
if ((this._AuditDate != value))
{
this.OnAuditDateChanging(value);
this.SendPropertyChanging();
this._AuditDate = value;
this.SendPropertyChanged("AuditDate");
this.OnAuditDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")]
public string Remark
{
get
{
return this._Remark;
}
set
{
if ((this._Remark != value))
{
this.OnRemarkChanging(value);
this.SendPropertyChanging();
this._Remark = value;
this.SendPropertyChanged("Remark");
this.OnRemarkChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -258335,6 +258720,10 @@ namespace Model
private System.Nullable<int> _Category;
private string _AuditMan;
private System.Nullable<System.DateTime> _AuditDate;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -258363,6 +258752,10 @@ namespace Model
partial void OnReqUnitIdChanged();
partial void OnCategoryChanging(System.Nullable<int> value);
partial void OnCategoryChanged();
partial void OnAuditManChanging(string value);
partial void OnAuditManChanged();
partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
partial void OnAuditDateChanged();
#endregion
public Tw_OutputMaster()
@ -258610,6 +259003,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")]
public string AuditMan
{
get
{
return this._AuditMan;
}
set
{
if ((this._AuditMan != value))
{
this.OnAuditManChanging(value);
this.SendPropertyChanging();
this._AuditMan = value;
this.SendPropertyChanged("AuditMan");
this.OnAuditManChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")]
public System.Nullable<System.DateTime> AuditDate
{
get
{
return this._AuditDate;
}
set
{
if ((this._AuditDate != value))
{
this.OnAuditDateChanging(value);
this.SendPropertyChanging();
this._AuditDate = value;
this.SendPropertyChanged("AuditDate");
this.OnAuditDateChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;

1
SGGL/Model/Model.csproj
View File

@ -184,6 +184,7 @@
<Compile Include="CLGL\Tw_InOutMasterOutput.cs" />
<Compile Include="CLGL\Tw_InputDataIn.cs" />
<Compile Include="CLGL\Tw_MaterialStockOutput.cs" />
<Compile Include="CLGL\Tw_PipeLineMat.cs" />
<Compile Include="ConstructionLogCQMS.cs" />
<Compile Include="ConstructionLogHSE.cs" />
<Compile Include="ConstructionLogMachineItem.cs" />