From ffb5fa50d9a02ff3efbd3044d3cee6a5285471a8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 七月 2021 16:14:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API

---
 WebAPI/DLL/ClsSc_ICMOReportBill.cs |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index d42b486..45c7003 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -51,6 +51,11 @@
                 ",HUpDater='" + omodel.HMaker + "'" +
                 ",HUpDateDate=getdate()" +
                 //========================================
+                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
+                ",HMainSourceInterID=" + omodel.HMainSourceInterID.ToString() +
+                ",HMainSourceEntryID=" + omodel.HMainSourceEntryID.ToString() +
+                ",HMainSourceBillType=" + omodel.HMainSourceBillType.ToString() +
+
                 ",HDeptID=" + omodel.HDeptID.ToString() +
                 ",HDeptNumber='" + omodel.HDeptNumber +"'"+
                 ",HEmpID=" + omodel.HEmpID.ToString() +
@@ -150,10 +155,12 @@
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" + 
                 ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
                 ",HGroupID,HDeptID,HDeptNumber" +
+                ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
                 ") " +
                 " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker+ "',getdate()" +
                 "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HEmpID.ToString() + "','" + omodel.HEmpNumber +
                 "','" + omodel.HGroupID.ToString() + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'"+
+                "','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "'" +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl)

--
Gitblit v1.9.1