lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据库变更CNPC_XJYJ

Browse Source
This commit is contained in:
夏菊
2025-08-04 18:04:41 +08:00
parent bafbf97359
commit 79a7f35e22
679 changed files with 5590 additions and 3465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HJGL/APIElectrodeRecoveryService.cs
+3 -3
View File
@@ -12,7 +12,7 @@ namespace BLL.API.HJGL
public static void AddElectrodeRecovery(ElectrodeRecoveryItem electrodeRecoveryItem)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Model.HJGL_ElectrodeRecovery newElectrodeRecovery = new Model.HJGL_ElectrodeRecovery();
//newElectrodeRecovery.RecoveryId = electrodeRecoveryItem.RecoveryId;
@@ -37,7 +37,7 @@ namespace BLL.API.HJGL
}
public static void UpdateElectrodeRecovery(ElectrodeRecoveryItem electrodeRecoveryItem)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Model.HJGL_ElectrodeRecovery newElectrodeRecovery = db.HJGL_ElectrodeRecovery.FirstOrDefault(x => x.ElectrodeRecoveryId == electrodeRecoveryItem.RecoveryId);
//newElectrodeRecovery.ElectrodeRecoveryId = electrodeRecoveryItem.RecoveryId;
@@ -63,7 +63,7 @@ namespace BLL.API.HJGL
public static List<ElectrodeRecoveryItem> GetListData(string projectId, int index, int page, string name)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = from u in db.HJGL_ElectrodeRecovery
where u.ProjectId == projectId
SGGL/BLL/API/HJGL/APIHotProcessHardService.cs
+5 -5
View File
@@ -16,7 +16,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getHotProessTrustNo(string unitWrokId,string hotProessTrustNo)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataLists = from x in db.HJGL_HotProess_Trust
select x;
@@ -48,7 +48,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getHardTrustNo(string unitWrokId,string hardTrustNo)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataLists = from x in db.HJGL_Hard_Trust
select x;
@@ -80,7 +80,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.HotProcessHardItem> getHotProcessItem(string hotProessTrustId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.View_HJGL_HotProess_TrustItem
where x.HotProessTrustId == hotProessTrustId
@@ -109,7 +109,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.HotProcessHardItem> getHardTrustItem(string hardTrustId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.View_HJGL_Hard_TrustItem
where x.HardTrustID == hardTrustId
@@ -136,7 +136,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetHardNoPassWarning(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Hard_TrustItem
join y in db.HJGL_Hard_Trust on x.HardTrustID equals y.HardTrustID
SGGL/BLL/API/HJGL/APINDETrustService.cs
+20 -20
View File
@@ -19,7 +19,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> getAutoPointBatchCode(string unitWorkId,string detectionTypeId,string detectionRateId, string pointBatchCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataList = from x in db.HJGL_Batch_PointBatch
where x.UnitWorkId == unitWorkId && x.EndDate == null
@@ -60,7 +60,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> getPointBatchCode(string unitWorkId, string detectionTypeId, string detectionRateId, string pointBatchCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataList = from x in db.HJGL_Batch_PointBatch
join y in db.HJGL_Batch_PointBatchItem on x.PointBatchId equals y.PointBatchId
@@ -101,7 +101,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> getPointBatchDetail(string pointBatchId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Batch_PointBatchItem
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
@@ -129,7 +129,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> getPointWeldJoint(string pointBatchId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Batch_PointBatchItem
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
@@ -157,7 +157,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> getPointWeldJoint(string pointBatchId, string weldJointId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
@@ -227,7 +227,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> GetPointWeldJointList(string unitWorkId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Batch_PointBatchItem
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
@@ -255,7 +255,7 @@ namespace BLL
/// <param name="unitWorkId"></param>
public static void GenerateTrust(string unitWorkId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getViewGenerateTrustLists = (from x in db.View_GenerateTrust where x.UnitWorkId == unitWorkId select x).ToList();
@@ -349,7 +349,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getBatchTrustCode(string unitWorkId, string detectionTypeId, string detectionRateId, bool? isAudit ,string trustBatchCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataList = from x in db.HJGL_Batch_BatchTrust
where x.UnitWorkId == unitWorkId
@@ -398,7 +398,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> GetBatchTrustDetail(string trustBatchId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Batch_BatchTrustItem
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
@@ -438,7 +438,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getBatchNdeCode(string unitWorkId, string detectionTypeId, string ndeCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataList = from x in db.HJGL_Batch_NDE
join y in db.HJGL_Batch_BatchTrust on x.TrustBatchId equals y.TrustBatchId
@@ -478,7 +478,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> GetBatchNDEDetail(string ndeId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Batch_NDEItem
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
@@ -510,7 +510,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetRepairRecord(string unitWorkId, bool isAudit, string repairRecordCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var repair = (from x in db.HJGL_RepairRecord
where x.UnitWorkId == unitWorkId
@@ -547,7 +547,7 @@ namespace BLL
/// <returns></returns>
public static Model.WeldJointItem GetRepairInfoByRepairRecordId(string repairRecordId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_RepairRecord
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
@@ -577,7 +577,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.NDETrustItem> GetRepairExpDetail(string repairRecordId, bool welder, bool pipeLine, bool daily, bool repairBefore, bool mat, bool spec)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var record = BLL.RepairRecordService.GetRepairRecordById(repairRecordId);
var jot = BLL.WeldJointService.GetViewWeldJointById(record.WeldJointId);
@@ -651,7 +651,7 @@ namespace BLL
/// <param name="isCut">是否切除</param>
public static void GetRepairExpSaveInfo(string repairRecordId, string expandId, string repairWelder, string repairDate, bool isCut)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Model.HJGL_RepairRecord repairRecord = BLL.RepairRecordService.GetRepairRecordById(repairRecordId);
// 更新返修记录
@@ -717,7 +717,7 @@ namespace BLL
/// <param name="repairRecordId"></param>
public static void RepairAudit(string repairRecordId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
// 更新返修记录
var repair = db.HJGL_RepairRecord.FirstOrDefault(x => x.RepairRecordId == repairRecordId);
@@ -738,7 +738,7 @@ namespace BLL
/// <returns></returns>
public static string GenerateRepairTrust(string repairRecordId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string submitStr = string.Empty;
Model.HJGL_RepairRecord repairRecord = BLL.RepairRecordService.GetRepairRecordById(repairRecordId);
@@ -846,7 +846,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetNdeCheckNoPassWarn(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var onecheckNoPass = (from x in db.HJGL_Batch_NDEItem
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
@@ -892,7 +892,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetNoTrustJointWarn(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var point = (from x in db.HJGL_Batch_PointBatchItem
join y in db.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId
@@ -930,7 +930,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetNoCheckJointWarn(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Batch_BatchTrustItem
join y in db.HJGL_Batch_BatchTrust on x.TrustBatchId equals y.TrustBatchId
SGGL/BLL/API/HJGL/APIPipeJointService.cs
+8 -8
View File
@@ -16,7 +16,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getPipelineList(string unitWrokId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_Pipeline
where x.UnitWorkId == unitWrokId
@@ -42,7 +42,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetWeldJointList(string pipeLineId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getData = (from x in db.View_HJGL_NoWeldJointFind
where x.PipelineId == pipeLineId
@@ -69,7 +69,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetAllWeldJointList(string pipeLineId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.HJGL_WeldJoint
where x.PipelineId == pipeLineId
@@ -93,7 +93,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getWelderList(string unitWorkId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var p = db.WBS_UnitWork.Where(x => x.UnitWorkId == unitWorkId).FirstOrDefault();
var getDataLists = (from x in db.SitePerson_Person
@@ -119,7 +119,7 @@ namespace BLL
/// <returns></returns>
public static Model.WeldJointItem getWeldJointInfo(string weldJointId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDateInfo = from x in db.HJGL_WeldJoint
where x.WeldJointId == weldJointId
@@ -172,7 +172,7 @@ namespace BLL
/// <returns></returns>
public static Model.WeldJointItem getWeldJointByIdentify(string weldJointIdentify)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDateInfo = from x in db.HJGL_WeldJoint
join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId
@@ -212,7 +212,7 @@ namespace BLL
/// <param name="addItem"></param>
public static void SavePipeWeldJoint(Model.WeldJointItem addItem)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string projectId = string.Empty;
string unitId = string.Empty;
@@ -369,7 +369,7 @@ namespace BLL
/// <param name="addItem"></param>
public static void SavePreWeldingDaily(Model.WeldJointItem addItem)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string projectId = string.Empty;
string unitId = string.Empty;
SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs
+3 -3
View File
@@ -20,7 +20,7 @@ namespace BLL
/// <returns></returns>
public static Model.HJGL_PreWeldingDailyItem getPreWeldingDailyInfo(string preWeldingDailyId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getInfo = from x in db.HJGL_PreWeldingDaily
where x.PreWeldingDailyId == preWeldingDailyId
@@ -46,7 +46,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.HJGL_PreWeldingDailyItem> getPreWeldingDailyList(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getList = from x in db.HJGL_PreWeldingDaily
where x.ProjectId == projectId
@@ -73,7 +73,7 @@ namespace BLL
/// <returns></returns>
public static void SavePreWeldingDaily(Model.HJGL_PreWeldingDailyItem newItem)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_PreWeldingDaily newP= new Model.HJGL_PreWeldingDaily
{
PreWeldingDailyId = newItem.PreWeldingDailyId,
SGGL/BLL/API/HJGL/APIReportQueryService.cs
+6 -6
View File
@@ -18,7 +18,7 @@ namespace BLL
/// <returns></returns>
public static Model.WelderPerformanceItem GetWelderPerformanceByQRC(string personId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
// todo 二维码分解待做
var getDataLists = from x in db.View_WelderPerformance
@@ -46,7 +46,7 @@ namespace BLL
private static string GetWeldAvgNum(string personId,decimal totalDin)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string vagDin = string.Empty;
var date = from x in db.HJGL_WeldJoint
@@ -75,7 +75,7 @@ namespace BLL
/// <returns></returns>
public static Model.WelderPerformanceItem GetWelderPerformanceByWelderCode(string projectId,string welderCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
// todo 二维码分解待做
var getDataLists = from x in db.View_WelderPerformance
@@ -109,7 +109,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getWelderQualify(string personId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDataLists = (from x in db.Welder_WelderQualify
where x.WelderId == personId
@@ -134,7 +134,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetWelderQualifyWarning(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var welder = from x in db.SitePerson_Person
where x.ProjectId == projectId && x.WorkPostId == Const.WorkPost_Welder
@@ -247,7 +247,7 @@ namespace BLL
/// <returns></returns>
public static Model.JointCompreInfoItem GetJointCompreInfo(string weldJointId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getDateInfo = from x in db.View_HJGL_WeldJoint
where x.WeldJointId == weldJointId
SGGL/BLL/API/HJGL/APITestPackageService.cs
+3 -3
View File
@@ -20,7 +20,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> getTestPackageNo(string unitWorkId, bool isFinish, string testPackageNo)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var dataList = from x in db.PTP_TestPackage
where x.UnitWorkId == unitWorkId
@@ -60,7 +60,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.TestPackageItem> GetTestPackageDetail(string ptp_Id)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
//var getDataLists = (from x in db.View_PTP_TestPackageAudit
// where x.PTP_ID == ptp_Id
@@ -91,7 +91,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.BaseInfoItem> GetCanTestPackageWarning(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
List<Model.BaseInfoItem> canTest = new List<Model.BaseInfoItem>();
// 获取项目中未完成的试压包
SGGL/BLL/API/HJGL/APIWelderEntranceService.cs
+7 -7
View File
@@ -17,7 +17,7 @@ namespace BLL
public static List<WelderEntrance> GetWelderList(string projectId, int index, int page, string name)
{
List<WelderEntrance> res = new List<WelderEntrance>();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = from x in db.BS_Welder_Entrance
where x.ProjectId == projectId
@@ -75,7 +75,7 @@ namespace BLL
/// <returns></returns>
public static WelderEntrance GetWelderById(string welderId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var item = db.BS_Welder_Entrance.FirstOrDefault(e => e.WED_ID == welderId);
@@ -123,7 +123,7 @@ namespace BLL
/// <param name="welder"></param>
public static void AddBSWelder(WelderEntrance welder)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Model.BS_Welder_Entrance newWelder = new Model.BS_Welder_Entrance();
newWelder.WED_ID = welder.WED_ID;
@@ -152,7 +152,7 @@ namespace BLL
/// <param name="teamGroup"></param>
public static void UpdateBSWelder(WelderEntrance welder)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Model.BS_Welder_Entrance newWelder = db.BS_Welder_Entrance.FirstOrDefault(e => e.WED_ID == welder.WED_ID);
if (newWelder != null)
@@ -216,7 +216,7 @@ namespace BLL
/// <returns>true-存在，false-不存在</returns>
public static bool IsExistWEDName(string WED_Name, string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = from x in db.BS_Welder_Entrance where x.WED_Name == WED_Name && x.ProjectId == projectId select x;
if (q.Count() > 0)
@@ -238,7 +238,7 @@ namespace BLL
/// <returns>true-存在，false-不存在</returns>
public static bool IsExistWEDCode(string WED_Code, string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = from x in db.BS_Welder_Entrance where x.WED_Code == WED_Code && x.ProjectId == projectId select x;
if (q.Count() > 0)
@@ -258,7 +258,7 @@ namespace BLL
/// <param name="WED_ID"></param>
public static void DeleteBSWelder(string WED_ID)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Model.BS_Welder_Entrance welder = db.BS_Welder_Entrance.FirstOrDefault(e => e.WED_ID == WED_ID);
if (welder != null)
SGGL/BLL/API/HJGL/APIWelderService.cs
+4 -4
View File
@@ -12,7 +12,7 @@ namespace BLL.API.HJGL
{
public static WelderItem GetWelderByIdCard(string idCard, string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
WelderItem item = new WelderItem();
var welder = db.BS_Welder.Where(u => u.IdentityCard == idCard && u.ProjectId == projectId).FirstOrDefault();
@@ -57,7 +57,7 @@ namespace BLL.API.HJGL
public static List<WeldingMethodItem> GetWelderMethod(string welderId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var items = from x in db.BS_WeldMethodItem where x.WED_ID == welderId select x.WME_ID;
var methods = from m in db.Base_WeldingMethod
@@ -77,7 +77,7 @@ namespace BLL.API.HJGL
public static List<BSSteelItem> GetWelderBSSteel(string welderId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var itemsSteel = from x in db.BS_WelderItem where x.WED_ID == welderId select x.STE_ID;
var steel = from x in db.BS_Steel
@@ -98,7 +98,7 @@ namespace BLL.API.HJGL
public static List<ConsumablesItem> GetConsumables()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var steel = from x in db.Base_Consumables
select new ConsumablesItem