From 33cfe29fcdd731c3c759dcae74bdcfaeecd309ea Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 15 十一月 2023 17:57:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/SCM/ClsSup_AskPriceBill.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DAL/SCM/ClsSup_AskPriceBill.cs b/DAL/SCM/ClsSup_AskPriceBill.cs
index 50525a8..82ec820 100644
--- a/DAL/SCM/ClsSup_AskPriceBill.cs
+++ b/DAL/SCM/ClsSup_AskPriceBill.cs
@@ -20,9 +20,9 @@
             base.MvarItemKeySub3 = "";
             base.MvarItemKeySub4 = "";
             base.MvarItemKey="Sup_AskPriceBillMain";
-            base.MvarReportTitle="璇环鍗�";
-            base.BillType="1506";
-            base.HBillSubType = "1506";
+            base.MvarReportTitle="渚涘簲鍟嗚浠峰崟";
+            base.BillType= "1120";
+            base.HBillSubType = "1120";
 
         }
 
@@ -137,8 +137,8 @@
                 ",HExplanation,HInnerBillNo" +
                 ") " +
                 " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
-                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
-                ",'" + omodel.HProcType + "'," + omodel.HEmpID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HBeginDate + "'" +
+                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "','" + omodel.HMakeDate +
+                "','" + omodel.HProcType + "'," + omodel.HEmpID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HBeginDate + "'" +
                 ",'" + omodel.HEndDate + "'," + omodel.HPayConditionID.ToString() + "," + omodel.HCurID.ToString() + 
                 ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
                 ") ");

--
Gitblit v1.9.1