From 65438b8c1f9ec323c3c2ae265561dae4ff536379 Mon Sep 17 00:00:00 2001 From: xwt <2740516069@qq.com> Date: 星期四, 19 六月 2025 14:20:54 +0800 Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK --- StandardInterface/MES.Service/service/WomcaaManager.cs | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs index c59443d..853ca03 100644 --- a/StandardInterface/MES.Service/service/WomcaaManager.cs +++ b/StandardInterface/MES.Service/service/WomcaaManager.cs @@ -60,7 +60,7 @@ .IgnoreColumns(true).ExecuteCommand() > 0; //鎵归噺鎻掑叆蹇界暐绌哄瓧娈� - var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1) + var baOrUpdate = db.Insertable(mesWomcabs).PageSize(10) .IgnoreColumnsNull() .ExecuteCommand() > 0; @@ -76,6 +76,7 @@ var insertOrUpdate = db .Deleteable<Womcab>().In(decimals) .ExecuteCommand() > 0; + if (update && insertOrUpdate) return true; throw new NotImplementedException("鏇存柊澶辫触"); @@ -200,8 +201,17 @@ Typea = dto.TypeA, /// 鍗曟嵁鐘舵�� RkOrg = dto.RK_ORG, //鍏ュ簱缁勭粐 Rcn=dto.RCN, //鏃ヤ骇鑳� - - + Cglineid=dto.CG_LINE_ID, //閲囪喘璁㈠崟琛宨d + Kh=dto.KH, + Khjc=dto.KH_JCZL, + Scph=dto.SC_PH, + Moldno=dto.MOLd_no, + Oldmoldno=dto.Old_mold_no, + Jt=dto.JT, + Xscn=dto.XS_CN, + Sjxs=dto.SJ_xs, + Nextgx=dto.NEXT_Gx, + Rks=dto.RKS, //娌冨皵鏂板 // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD //WR_F_SCDD_XH = dto.F_SCDD_XH @@ -265,8 +275,12 @@ var entity = Db.Queryable<Womcab>() .Where(s => s.Erpid == womcab.Erpid).Single(); - if (entity != null) womcab.Id = entity.Id; - + if (entity != null) + { + // 鍒犻櫎宸叉湁鐨� Erpid 鐩稿叧鐨� Womcab 鏁版嵁 + // Db.Deleteable<Womcab>().Where(s => s.Erpid == womcab.Erpid).ExecuteCommand(); + womcab.Id = entity.Id; + } womcabList.Add(womcab); } -- Gitblit v1.9.3