1

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -3329,6 +3329,10 @@ namespace Property.Module.FixedAssets
                 #region 仓库
                 dmodel.WareHouseName = supplies_WareHouseRepository.GetEntity(dmodel.WarehouseId)?.Name ?? "";
                 #endregion
+
+                #region 采购
+                dmodel.FinanceId = procurementRepository.GetEntity(dmodel.ProcurementId ?? 0)?.FinanceId ?? 0;
+                #endregion
             }
             return dmodel;
         }

Property.Modele.FixedAssets/WorkFlowModule.cs

@@ -3236,16 +3236,16 @@ namespace Property.Module.FixedAssets
 
                 if (ToAuditFlow.Count == 1)
                 {//审批完成
-                    PushAuditMessage(EmNameList, WorkFlowId, $@"您的资产申请已完成！", "资产审批完成", empId, SysTemPushTypeEnum.PropertyAudit);
+                    PushAuditMessage(EmNameList, WorkFlowId, $@"您的耗材入库申请已完成！", "入库审批完成", empId, SysTemPushTypeEnum.SuppliesAudit);
                     //抄送人通知
-                    PushAuditMessage(CopyAccountList, WorkFlowId, $@"有审核完成的资产抄送通知！", "资产抄送通知", empId, SysTemPushTypeEnum.PropertyAudit);
+                    PushAuditMessage(CopyAccountList, WorkFlowId, $@"有审核完成的耗材入库抄送通知！", "入库抄送通知", empId, SysTemPushTypeEnum.SuppliesAudit);
                     //所有审核人
                     //AuditAccountList = aurList.Where(x => x.AuditStatus == WFRrocessStatus.AuditThrough && x.AuditEmId != empId).Select(x => new EmAccoutIdModel() { EmAccount = x.AuditEmAccout, EmployeeId = x.AuditEmId ?? 0 }).Distinct().ToList();
                 }
                 else
                 {
                     //审批通过
-                    PushAuditMessage(AuditAccountList, WorkFlowId, $@"你有待审核的资产消息！", "资产审核通知", empId, SysTemPushTypeEnum.PropertyAudit);
+                    PushAuditMessage(AuditAccountList, WorkFlowId, $@"你有待审核的耗材入库消息！", "入库审核通知", empId, SysTemPushTypeEnum.SuppliesAudit);
                 }
 
                 //日志
@@ -3258,7 +3258,7 @@ namespace Property.Module.FixedAssets
                     UpdateDate = System.DateTime.Now,
                     ResourceId = WorkFlowId,
                     Content = "审批通过",
-                    Type = 1
+                    Type = 2
                 };
                 workfolw_Change_LogRepository.Insert(logModel, trans);
 
@@ -3414,8 +3414,10 @@ namespace Property.Module.FixedAssets
                     };
                     bool stockInFlag = supplies_StockInRepository.Update(uflies, uwheres, trans);
                     if (stockInFlag) {
+                        var procurementModel = procurementRepository.GetEntity(usemodel.ProcurementId ?? 0);
                         Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                             { nameof(RB_Procurement_Extend.StockInStatus),2},
+                            { nameof(RB_Procurement_Extend.Remark),(procurementModel?.Remark??"")+"  入库单号："+usemodel.StockInNum+"("+usemodel.Id+")被驳回;"},
                             { nameof(RB_Procurement_Extend.UpdateDate),DateTime.Now}
                         };
                         List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -3430,7 +3432,7 @@ namespace Property.Module.FixedAssets
                             //回滚  采购单明细的入库数量
                             var dlist = supplies_StockInDetailRepository.GetList(new RB_Supplies_StockInDetail_Extend() { StockInId = usemodel.Id, RB_Group_Id = usemodel.RB_Group_Id });
                             var pdlist = procurement_DetailRepository.GetList(new RB_Procurement_Detail_Extend() { ProcurementId = usemodel.ProcurementId, RB_Group_Id = usemodel.RB_Group_Id });
-                            //增加采购单已入库数量
+                            //回滚采购单已入库数量
                             foreach (var item in dlist)
                             {
                                 var dModel = pdlist.Where(x => x.MaterialId == item.SuppliesId).FirstOrDefault();
@@ -3459,7 +3461,7 @@ namespace Property.Module.FixedAssets
                         UpdateDate = System.DateTime.Now,
                         ResourceId = WorkFlowId,
                         Content = "审批驳回,内容：" + Description,
-                        Type = 1
+                        Type = 2
                     };
                     workfolw_Change_LogRepository.Insert(logModel, trans);
 
@@ -3473,7 +3475,7 @@ namespace Property.Module.FixedAssets
                         EmId = CreateModel.EmployeeId;
                     }
                     var EmNameList = new List<EmAccoutIdModel>() { new EmAccoutIdModel() { EmAccount = EmAccout, EmployeeId = EmId } };
-                    PushAuditMessage(EmNameList, WorkFlowId, $@"您有资产申请已被驳回！", "审核不通过", empId, SysTemPushTypeEnum.PropertyAudit);
+                    PushAuditMessage(EmNameList, WorkFlowId, $@"您有耗材入库申请已被驳回！", "入库审核不通过", empId, SysTemPushTypeEnum.SuppliesAudit);
 
                     workflow_AuditRelevanceRepository.DBSession.Commit();
                     return ApiResult.Success("驳回成功");

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -2257,6 +2257,7 @@ namespace Property.WebApi.Controllers.User
                 model.SupplierName,
                 model.FinanceId,
                 model.AuditDescription,
+                model.TemplateName,
                 DetailList = model.DetailList.Select(z => new
                 {
                     z.Id,