From ad1aeb59db293e459695b131323fd0caa58e7be1 Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期四, 08 五月 2025 18:59:34 +0800 Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK --- StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs index a981c09..8f3b66b 100644 --- a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs @@ -94,9 +94,9 @@ .Deleteable<MesRohInData>() .Where(s => decimals.Contains(s.Id)) .ExecuteCommand() > 0; - - if (update && insertOrUpdate) return true; - throw new NotImplementedException("鏇存柊澶辫触"); + return true; + /* if (update && insertOrUpdate) return true; + throw new NotImplementedException("鏇存柊澶辫触");*/ } // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶 @@ -206,9 +206,9 @@ EbelnK3id = Convert.ToDecimal(s.id), ErpId = Convert.ToDecimal(s.Eid), BillNo = s.FBillNo, + SALES_ORDER_ID=s.SALES_ORDER_ID, OrderLineId = s.FSeq, - PurchaseOrderLineNumber = s.FSeq, - SalesOrderId = s.FDemandBillEntrySeq, + PurchaseOrderLineNumber = s.FSeq, ItemId = s.FMaterialId, PurchaseUnit = s.FUnitId, PurchaseQty = Convert.ToDecimal(s.FQty), @@ -269,11 +269,12 @@ ChangeFlag = s.FChangeFlag, DemandSource = s.FDemandType, DemandDocumentId = s.FDemandBillNo, - DemandDocumentLineId = s.FDemandBillEntrySeq, - DemandDept = s.FRequireDeptId, + + DemandDocumentLineId = s.FDemandBillEntrySeq + /* DemandDept = s.FRequireDeptId, FCGDDSctzda = s.F_CGDD_SCTZDA, FCGDDXHA = s.F_CGDD_XHA, - FXifgTextApv = s.F_XIFG_Text_apv + FXifgTextApv = s.F_XIFG_Text_apv*/ }; var single = rohInDataManager.GetSingle(it => -- Gitblit v1.9.3