Compare commits
No commits in common. "54ba2f172c03a444a322e393da7831e03e4200d2" and "bfd4b879db766d93a07f57ddc80688ff9b5020d5" have entirely different histories.
54ba2f172c
...
bfd4b879db
|
|
@ -72,7 +72,7 @@ namespace BLL
|
||||||
Model.HJGL_BS_Welder newWelder = db.HJGL_BS_Welder.FirstOrDefault(e => e.WED_ID == welder.WED_ID);
|
Model.HJGL_BS_Welder newWelder = db.HJGL_BS_Welder.FirstOrDefault(e => e.WED_ID == welder.WED_ID);
|
||||||
if (newWelder != null)
|
if (newWelder != null)
|
||||||
{
|
{
|
||||||
bool needUpdatePic = false;
|
newWelder.WED_Code = welder.WED_Code;
|
||||||
newWelder.WED_Name = welder.WED_Name;
|
newWelder.WED_Name = welder.WED_Name;
|
||||||
newWelder.WED_Unit = welder.WED_Unit;
|
newWelder.WED_Unit = welder.WED_Unit;
|
||||||
newWelder.EDU_ID = welder.EDU_ID;
|
newWelder.EDU_ID = welder.EDU_ID;
|
||||||
|
|
@ -95,19 +95,9 @@ namespace BLL
|
||||||
newWelder.MaxHanTiao = welder.MaxHanTiao;
|
newWelder.MaxHanTiao = welder.MaxHanTiao;
|
||||||
newWelder.MaxWeldingWire = welder.MaxWeldingWire;
|
newWelder.MaxWeldingWire = welder.MaxWeldingWire;
|
||||||
newWelder.IsOAM = welder.IsOAM;
|
newWelder.IsOAM = welder.IsOAM;
|
||||||
if (!string.IsNullOrEmpty(welder.PhotoUrl) && newWelder.PhotoUrl != welder.PhotoUrl)
|
|
||||||
{
|
|
||||||
newWelder.PhotoUrl = welder.PhotoUrl;
|
|
||||||
needUpdatePic = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(welder.WED_Code) && newWelder.WED_Code != welder.WED_Code)
|
|
||||||
{
|
|
||||||
newWelder.WED_Code = welder.WED_Code;
|
|
||||||
needUpdatePic = true;
|
|
||||||
}
|
|
||||||
db.SubmitChanges();
|
db.SubmitChanges();
|
||||||
if (needUpdatePic)
|
if (!string.IsNullOrEmpty(newWelder.PhotoUrl))
|
||||||
{
|
{
|
||||||
var pw = from x in db.Project_Welder
|
var pw = from x in db.Project_Welder
|
||||||
where x.WED_ID == welder.WED_ID
|
where x.WED_ID == welder.WED_ID
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue