数据库变更CNPC_XJYJ
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user