数据库变更CNPC_XJYJ

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
@@ -144,7 +144,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string EMaterialRegistId = Grid1.DataKeys[rowIndex][0].ToString();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == EMaterialRegistId);
//BLL.HJGL_EMaterialRegistService.DeleteEMaterialRegistItem(this.CurrUser.LoginProjectId, eMaterialRegist.Unit, EMaterialRegistId);
BLL.HJGL_EMInventoryRecordsService.UpdateEMInventoryRecords(this.CurrUser.LoginProjectId, eMaterialRegist.Unit, eMaterialRegist.WMT_ID, "", "", -decimal.Parse(eMaterialRegist.Amount));
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
{
string EMaterialRegistId = Grid1.DataKeys[rowIndex][0].ToString();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == EMaterialRegistId);
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string ElectrodeRecoveryId = Grid1.DataKeys[rowIndex][0].ToString();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_ElectrodeRecovery electrodeRecovery = db.HJGL_ElectrodeRecovery.First(e => e.ElectrodeRecoveryId == ElectrodeRecoveryId);
BLL.HJGL_ElectrodeRecoveryService.DeleteElectrodeRecoveryItem(this.CurrUser.LoginProjectId, electrodeRecovery.UnitId, ElectrodeRecoveryId);
db.HJGL_ElectrodeRecovery.DeleteOnSubmit(electrodeRecovery);
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
string date = string.Empty;
if (JOT_ID != null)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var ProessDate = (from x in db.HJGL_HotProess_Report where x.WeldJointId == JOT_ID.ToString() && x.ProessDate != null select x.ProessDate).FirstOrDefault();
if (ProessDate != null)
{
@@ -1958,7 +1958,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
bool b = true;
if (ISO_ID != null)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var jointIds = (from x in db.PW_JointInfo where x.ISO_ID == ISO_ID.ToString() && x.IS_Proess == "1" select x.JOT_ID).ToList();
var notCompletedviews = from x in db.View_HJGL_HotProess_TrustItem where x.ProjectId == this.CurrUser.LoginProjectId && jointIds.Contains(x.WeldJointId) && x.IsCompleted != "完成" select x;
if (notCompletedviews.Count() > 0)