Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -7041,7 +7041,7 @@ namespace Business.Replenishment
                         srm_Pr.create_by_name = user;
                         srm_Pr.update_time = DateTime.Now;
                         srm_Pr.update_by_name = user;
-                        srm_Pr.remark = "生成交货单采购单不足，自动创建的Pr";
+                        srm_Pr.remark = "物料需求计划ID[" + demandplans[i].Id + "]生成交货单采购单不足，自动创建的Pr";
                         prInserts.Add(srm_Pr);
 
                         //处理总数量，需求数量
@@ -7054,7 +7054,7 @@ namespace Business.Replenishment
                         info.Icdsid = demandplans[i].Id;
                         info.ItemNum = demandplans[i].itemnum;
                         info.CreateTime = DateTime.Now;
-                        info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]"+ (curChaes[j].IsRequireGoods == 0 ? "采购申请" : "要货令") + "不足，已生成采购申请，请转采购订单后再生成交货单";
+                        info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]" + (curChaes[j].IsRequireGoods == 0 ? "采购订单不足，已生成采购申请并推送SAP，请转采购订单后再生成交货单" : "要货令不足，已生成采购申请并自动转要货令，请重新生成交货单");
                         info.NeedQty = needQty - restQty;
                         info.OptTime = optime;
                         exceptions.Add(info);

MicroServices/Business/Bussiness.MongoDB/BussinessMongoDbModule.cs

@@ -23,7 +23,7 @@ namespace Bussiness.MongoDB
 
             Configure<AbpUnitOfWorkDefaultOptions>(options =>
             {
-                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Auto;
             });
 
             Configure<AbpAuditingOptions>(options =>