diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs index 180b6ce..ae68085 100644 --- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs +++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs @@ -136,9 +136,7 @@ namespace MyCode.Project.Services.Implementation result.Insert(0, item1); return result; } - #endregion - - + #endregion #region @@ -157,7 +155,7 @@ namespace MyCode.Project.Services.Implementation ,FEntryNote,FBillAllAmount_LC,FMaterialId.FNAME,FQty,FEntryNote,FUnitId.fname,FDeliveryDate,FMaterialId.FSpecification,FPurchaserId.fname,FSupplierId.FNumber,FMaterialId.FNumber ,FSettleCurrId.fname,FBillTaxAmount,FExchangeTypeId.fname,FExchangeRate,FEntryTaxRate,FPrice,FAllAmount,FEntryAmount,FEntryTaxAmount,FReceiveQty,FMRPCloseStatus ,FPurchaseOrgId,FPurchaseOrgId.FName,F_TSPR_Text_qtr1,FDEMANDBILLNO,FReceiveOrgId,FReceiveOrgId.FNAME,FReceiveOrgId.FNumber - ,FCancelStatus,FRemainReceiveQty", + ,FCancelStatus,FRemainReceiveQty,F_YRVD_Date_apv,F_YRVD_Date_re5", //FieldKeys ="", TopRowCount = 100000, Limit = 2000000, @@ -232,6 +230,10 @@ namespace MyCode.Project.Services.Implementation var temp = updateList.FirstOrDefault(h => h.Id == t.Id); if (temp != null) { + if (t.ChengNuoJiaoQi.HasValue) + { + throw new BaseException($"修改承诺交期失败,已经有值了不许第二次修改"); + } t.ChengNuoJiaoQi = temp.NewTime; } try @@ -244,7 +246,7 @@ namespace MyCode.Project.Services.Implementation } catch (Exception ex) { - throw new BaseException($"修改承诺最新交期失败,原因是{ex.Message}"); + throw new BaseException($"修改承诺交期失败,原因是{ex.Message}"); } }); @@ -263,6 +265,7 @@ namespace MyCode.Project.Services.Implementation [TransactionCallHandler] public void BatchSetNewChengNuoJiaoQi(List updateList, string supplierId) { + throw new BaseException($"修改承诺最新交期失败,请联系美塞斯采购员在云星空修改。"); var ids = updateList.Select(t => t.Id).ToList(); var list = _purchaseOrderItemRepository.Queryable().Where(t => t.SupplierId == supplierId && ids.Contains(t.Id)).ToList(); SetChengNuoJiaoQiAct act = new SetChengNuoJiaoQiAct(); @@ -275,6 +278,10 @@ namespace MyCode.Project.Services.Implementation var temp = updateList.FirstOrDefault(h => h.Id == t.Id); if (temp != null) { + if (t.NewChengNuoJiaoQi.HasValue) + { + throw new BaseException($"修改承诺最新交期失败,已经有值了不许第二次修改"); + } t.NewChengNuoJiaoQi = temp.NewTime; } try @@ -459,6 +466,9 @@ namespace MyCode.Project.Services.Implementation purchaseOrderItem.freceiveorgId = item["FReceiveOrgId"]; purchaseOrderItem.ReceiveorgCode = item["FReceiveOrgId.FNumber"]; purchaseOrderItem.ReceiveorgName = item["FReceiveOrgId.FNAME"]; + purchaseOrderItem.ChengNuoJiaoQi= item["ChengNuoJiaoQi"]; + purchaseOrderItem.NewChengNuoJiaoQi = item["F_YRVD_Date_apv"]; + //FReceiveOrgId,FReceiveOrgId.FNAME,FReceiveOrgId.FNumber _purchaseOrderItemRepository.Add(purchaseOrderItem); } @@ -492,6 +502,8 @@ namespace MyCode.Project.Services.Implementation oldItem.freceiveorgId = item["FReceiveOrgId"]; oldItem.ReceiveorgCode = item["FReceiveOrgId.FNumber"]; oldItem.ReceiveorgName = item["FReceiveOrgId.FNAME"]; + oldItem.ChengNuoJiaoQi = item["ChengNuoJiaoQi"]; + oldItem.NewChengNuoJiaoQi = item["F_YRVD_Date_apv"]; _purchaseOrderItemRepository.Update(oldItem); }