提交代码

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -2660,17 +2660,20 @@ namespace Property.Module.FixedAssets
                         UnitPrice = Math.Round((x.ReportLossPrice ?? 0) / (x.ReportLossNum ?? 1), 2, MidpointRounding.AwayFromZero),
                         Remark = x.GoodsName + x.SpecificationName
                     });
+                    string sign = "";
+                    if (applyModel.CheckStatus == PropertyCheckStatusEnum.InventoryLosses)
+                    {
                         var financeObj = new
                         {
                             CreateBy = demodel.CreateBy,
                             IsPublic = 0,//  supplierModel.ClientBankAccount.AccountType, //financeConfigurineModel.AccountType,
                             ClientType = 10,
-                        ClientID = 3134,
+                            ClientID = 3170,
                             CurrencyId = Config.OutCurrencyId,
                             WBMoney = applyModel.DetailList.Sum(x => (x.ReportLossPrice ?? 0)),
                             RB_Branch_Id = Config.ExpendBranchId,
                             PayDate = System.DateTime.Now.ToString("yyyy-MM-dd"),
-                        TemplateId = applyModel.CheckStatus == PropertyCheckStatusEnum.InventoryLosses ? 129 : 130,
+                            TemplateId = 129,
                             OrderSource = 16,
                             OtherType = 17,
                             Remark = System.DateTime.Now.ToString("yyyy年MM月dd日") + "生成" + (applyModel.CheckStatus == PropertyCheckStatusEnum.InventoryLosses ? "盘亏" : "盘盈") + "财务单据",
@@ -2678,7 +2681,33 @@ namespace Property.Module.FixedAssets
                             RB_Depart_Id = RB_Department_Id,
                             ReFinanceId = Id
                         };
-                    string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
+                        sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
+                    }
+                    else if (applyModel.CheckStatus == PropertyCheckStatusEnum.InventoryProfit)
+                    {
+                        var financeObj = new
+                        {
+                            CreateBy = applyModel.CreateBy,
+                            IsPublic = 0,
+                            BType = 4,
+                            AccountId = 27,
+                            WBMoney = applyModel.DetailList.Sum(x => (x.ReportLossPrice ?? 0)),
+                            RB_Branch_Id = Config.ExpendBranchId,
+                            RemitterName = "商品盘点-盘盈",
+                            TradeDate = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"),
+                            AccountNumber = System.DateTime.Now.AddDays(-1).ToString("yyyyMMdd"),
+                            TemplateId = 130,
+                            OrderSource = 16,
+                            Remark = System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据",
+                            detailList,
+                            RB_Depart_Id = RB_Department_Id
+                        };
+                        sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
+                    }
+
+
+
+
                     var resultInfo = new
                     {
                         msg = sign,