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

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs
+2 -4
View File
@@ -1,17 +1,15 @@
using FineUIPro;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
public static class HJGLPackagingmanagedetailService
{
{
#region 获取列表
/// <summary>
/// 记录数
@@ -206,7 +204,7 @@ namespace BLL
MaterialMade = libItem.MaterialMade,
MaterialDef = libItem.MaterialDef,
Number = tb.Number,
CusBillCode = twOutItem.CusBillCode,
CusBillCode = twOutItem.CusBillCode,
};
result = q.ToList();
return result;
SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+20 -21
View File
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
{
@@ -106,7 +105,7 @@ namespace BLL
/// <param name="projectid"></param>
/// <param name="PipeArea"></param>
/// <returns></returns>
public static DataTable GetSHOPStockDt( string projectid)
public static DataTable GetSHOPStockDt(string projectid)
{
string strSql = @" SELECT mat.MaterialCode,
lib.MaterialName,
@@ -167,7 +166,7 @@ namespace BLL
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
}
}
public static DataTable GetFIELDStockDt(string projectid)
{
string strSql = @"
@@ -240,7 +239,7 @@ namespace BLL
/// <param name="PipeArea">管线划分</param>
/// <returns></returns>
public static List<Model.MaterialStockItem> GetMaterialStockItems(string projectid, string PipeArea)
{
{
List<Model.MaterialStockItem> list = new List<Model.MaterialStockItem>();
DataTable dataTable = new DataTable();
switch (PipeArea)
@@ -252,9 +251,9 @@ namespace BLL
dataTable = GetFIELDStockDt(projectid);
break;
}
if (dataTable!=null)
if (dataTable != null)
{
list =Funs.TableToEntity<Model.MaterialStockItem>(dataTable);
list = Funs.TableToEntity<Model.MaterialStockItem>(dataTable);
}
return list;
}
@@ -262,8 +261,8 @@ namespace BLL
{
decimal num = 0;
var list = GetMaterialStockItems(projectid, PipeArea);
if (list!=null && list.Count>0)
var list = GetMaterialStockItems(projectid, PipeArea);
if (list != null && list.Count > 0)
{
var item = list.Where(x => x.MaterialCode == materialcode).FirstOrDefault();
if (item != null)
@@ -280,17 +279,17 @@ namespace BLL
/// <param name="num"></param>
/// <param name="projectid"></param>
/// <returns></returns>
public static bool isInStockByMaterialCode(string MaterialCode, decimal num,string PipeArea,string projectid)
public static bool isInStockByMaterialCode(string MaterialCode, decimal num, string PipeArea, string projectid)
{
bool state=false;
bool state = false;
List<Model.MaterialStockItem> list = GetMaterialStockItems(projectid, PipeArea);
if (list != null && list.Count > 0)
{
var Material = list.Where(x => x.MaterialCode == MaterialCode).FirstOrDefault();
if (Material!=null)
if (Material != null)
{
var StockNum = Material.MaterialNum;
if (num<= StockNum)
if (num <= StockNum)
{
state = true;
}
@@ -299,7 +298,7 @@ namespace BLL
}
return state;
}
/// <summary>
/// 判断库存是否满足此管线
@@ -307,9 +306,9 @@ namespace BLL
/// <param name="pipelineid"></param>
/// <param name="projectid"></param>
/// <returns></returns>
public static bool isInStockByPipeline(string pipelineid,string projectid)
public static bool isInStockByPipeline(string pipelineid, string projectid)
{
bool state = true ;
bool state = true;
try
{
var q = from x in Funs.DB.HJGL_PipeLineMat
@@ -324,7 +323,7 @@ namespace BLL
{
var pipemodel = BLL.PipelineService.GetPipelineByPipelineId(pipelineid);
List<Model.MaterialStockItem> materialStockItems = new List<Model.MaterialStockItem>();
if (pipemodel.PipeArea==PipelineService.PipeArea_SHOP)
if (pipemodel.PipeArea == PipelineService.PipeArea_SHOP)
{
if (HJGL_MaterialService.materialStockItems_SHOP.Count == 0)
{
@@ -334,13 +333,13 @@ namespace BLL
}
else if (pipemodel.PipeArea == PipelineService.PipeArea_FIELD)
{
if(HJGL_MaterialService.materialStockItems_FIELD.Count == 0)
if (HJGL_MaterialService.materialStockItems_FIELD.Count == 0)
{
HJGL_MaterialService.materialStockItems_FIELD = GetMaterialStockItems(projectid, pipemodel.PipeArea);
}
materialStockItems = materialStockItems_FIELD;
}
//List<Model.MaterialStockItem> materialStockItems = GetMaterialStockItems(projectid, pipemodel.PipeArea);
if (materialStockItems != null && materialStockItems.Count > 0) //判断是否有库存信息
{
@@ -382,10 +381,10 @@ namespace BLL
{
state = false;
ErrLogInfo.WriteLog(ex.ToString ());
ErrLogInfo.WriteLog(ex.ToString());
}
return state;
}
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
-3
View File
@@ -1,12 +1,9 @@
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
namespace BLL
{
SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs
+1 -5
View File
@@ -1,10 +1,6 @@
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
@@ -136,7 +132,7 @@ namespace BLL
/// </summary>
/// <param name="projectId"></param>
/// <param name="unitWorkName"></param>
public static void DeleteProductionSchedulingPlanByUnitWork(string projectId,string unitWorkName)
public static void DeleteProductionSchedulingPlanByUnitWork(string projectId, string unitWorkName)
{
SGGLDB db = Funs.DB;
var q = (from x in db.HJGL_ProductionSchedulingPlan where x.ProjectId == projectId && x.MainItemName == unitWorkName select x).ToList();
SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs
+5 -7
View File
@@ -1,6 +1,4 @@
using FineUIPro;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
namespace BLL
@@ -30,7 +28,7 @@ namespace BLL
if (!string.IsNullOrEmpty(table.TrainNumber))
{
q = q.Where(x => x.TrainNumber.Contains(table.TrainNumber));
}
}
if (!string.IsNullOrEmpty(table.ProjectId))
{
q = q.Where(x => x.ProjectId.Contains(table.ProjectId));
@@ -99,9 +97,9 @@ namespace BLL
where x.ProjectId == ProjectId
select x.TrainNumber;
var max = q.Count();
var NewTrainNumber=(max+1).ToString().PadLeft(2, '0');
var NewTrainNumber = (max + 1).ToString().PadLeft(2, '0');
return NewTrainNumber;
}
public static void Add(Model.HJGL_TrainNumberManage newtable)
@@ -118,7 +116,7 @@ namespace BLL
ContactName = newtable.ContactName,
ContactPhone = newtable.ContactPhone,
Remark = newtable.Remark,
ReceiveDate=newtable.ReceiveDate,
ReceiveDate = newtable.ReceiveDate,
};
Funs.DB.HJGL_TrainNumberManage.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs
+12 -15
View File
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
@@ -16,10 +13,10 @@ namespace BLL
}
public static List<Model.HJGL_YardPlanning> GetHJGL_YardPlanningBySurperId(string SurperId)
{
var q= (from x in Funs.DB.HJGL_YardPlanning where x.SurperId== SurperId select x ) .ToList();
var q = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId == SurperId select x).ToList();
return q;
}
public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId,string unitworkid)
public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId, string unitworkid)
{
return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectId && e.UnitWorkId == unitworkid);
@@ -30,9 +27,9 @@ namespace BLL
/// <param name="projectid"></param>
/// <param name="unitid"></param>
/// <param name="imgurl"></param>
public static void SavePic(string projectid,string unitworkid, string imgurl)
public static void SavePic(string projectid, string unitworkid, string imgurl)
{
var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectid && e.UnitWorkId==unitworkid);
var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectid && e.UnitWorkId == unitworkid);
if (model != null)
{
model.FlowChartPic = imgurl;
@@ -51,12 +48,12 @@ namespace BLL
}
public static void SavePic(string YardPlanningId, string imgurl)
{
var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.YardPlanningId== YardPlanningId);
var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.YardPlanningId == YardPlanningId);
if (model != null)
{
model.FlowChartPic = imgurl;
UpdateHJGL_YardPlanning(model);
}
}
}
public static void AddHJGL_YardPlanning(Model.HJGL_YardPlanning newtable)
{
@@ -66,7 +63,7 @@ namespace BLL
table.Remark = newtable.Remark;
table.FlowChartPic = newtable.FlowChartPic;
table.UnitWorkId = newtable.UnitWorkId;
table.YardPlanName=newtable.YardPlanName;
table.YardPlanName = newtable.YardPlanName;
table.SurperId = newtable.SurperId;
Funs.DB.HJGL_YardPlanning.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -102,8 +99,8 @@ namespace BLL
}
public static void DeleteHJGL_YardPlanningBySurperId(string SurperId)
{
var q= GetHJGL_YardPlanningBySurperId(SurperId);
if (q.Count >0)
var q = GetHJGL_YardPlanningBySurperId(SurperId);
if (q.Count > 0)
{
Funs.DB.HJGL_YardPlanning.DeleteAllOnSubmit(q);
Funs.DB.SubmitChanges();
@@ -116,13 +113,13 @@ namespace BLL
var id = q.YardPlanningId;
DeleteHJGL_YardPlanningById(YardPlanningId);
var chirdList = GetHJGL_YardPlanningBySurperId(id);
if (chirdList.Count>0)
if (chirdList.Count > 0)
{
foreach (var item in chirdList)
{
DleteAllById(item.YardPlanningId);
}
}
}
}