Merge branch 'master' of http://gitlab.oytour.com/liudong1993/property

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -2700,9 +2700,11 @@ namespace Property.Module.FixedAssets
                             AccountNumber = System.DateTime.Now.AddDays(-1).ToString("yyyyMMdd"),
                             TemplateId = 130,
                             OrderSource = 16,
+                            OtherType = 17,
                             Remark = System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据",
                             detailList,
-                            RB_Depart_Id = RB_Department_Id
+                            RB_Depart_Id = RB_Department_Id,
+                            ReFinanceId = Id
                         };
                         sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
                     }
@@ -2731,14 +2733,16 @@ namespace Property.Module.FixedAssets
                         applyModel.DetailList.ForEach(x => x.CreateDate = applyModel.CreateDate);
                         applyModel.DetailList.ForEach(x => x.RB_Branch_Id = applyModel.RB_Branch_Id);
                         applyModel.DetailList.ForEach(x => x.RB_Group_Id = applyModel.RB_Group_Id);
-                        applyModel.DetailList.ForEach(x => x.Remark = applyModel.Remark);
+                        
                         //更新已出库的商品信息
                         foreach (var item in applyModel.DetailList)//更新盘点商品的盘点状态
                         {
                             Dictionary<string, object> filesApplyGoods = new Dictionary<string, object>() {
                             { nameof(RB_Supplies_CheckDetail.DealStatus),1},
                             { nameof(RB_Supplies_CheckDetail.UpdateBy),applyModel.CreateBy},
-                             { nameof(RB_Supplies_CheckDetail.UpdateDate),applyModel.CreateDate}
+                             { nameof(RB_Supplies_CheckDetail.UpdateDate),applyModel.CreateDate},
+                               { nameof(RB_Supplies_CheckDetail.FinanceId),frid},
+                                { nameof(RB_Supplies_CheckDetail.Remark),item.Remark+(string.IsNullOrWhiteSpace(item.Remark)?"":",")+ " 自动生成财务单据:"+frid+",最新单价："+Math.Round((item.ReportLossPrice ?? 0) / (item.ReportLossNum ?? 1), 2, MidpointRounding.AwayFromZero)},
                         };
                             List<WhereHelper> wheresApplyGoods = new List<WhereHelper>() {
                             new WhereHelper(){
@@ -2749,6 +2753,7 @@ namespace Property.Module.FixedAssets
                         };
                             supplies_CheckDetailRepository.Update(filesApplyGoods, wheresApplyGoods, trans);
                         }
+                        applyModel.DetailList.ForEach(x => x.Remark = applyModel.Remark);
                         //新增盘点商品的信息
                         suppliesReportLossRecordDetailRepository.InsertBatch(applyModel.DetailList, trans);
                     }