From 5fa021240cc5ee77fe6006ec7a3e136ffb43978c Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 04 一月 2022 17:30:42 +0800
Subject: [PATCH] 需求增加

---
 DAL/采购管理/ClsCg_POInStockBill.cs      |   12 +++++-------
 Model/采购管理/ClsCg_POInStockBillSub.cs |    2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
index 7678502..f665791 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
@@ -19,8 +19,8 @@
             base.MvarItemKeySub3 = "";
             base.MvarItemKeySub4 = "";
             base.MvarItemKey = "Cg_POInStockBillMain";
-            base.MvarReportTitle="鏀舵枡閫氱煡鍗�";
-            base.BillType="1103";
+            base.MvarReportTitle = "鏀舵枡閫氱煡鍗�";
+            base.BillType = "1103";
             base.HBillSubType = "1103";
 
         }
@@ -67,7 +67,7 @@
                 ",HRemark='" + omodel.HRemark + "'" +
                 ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                 ",HUpDateDate=getdate()" +
-                    //========================================
+                //========================================
                 ",HAddress='" + omodel.HAddress + "'" +
                 ",HSupID=" + omodel.HSupID.ToString() +
                 ",HCurID=" + omodel.HCurID.ToString() +
@@ -154,7 +154,6 @@
                         "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                         ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                         ",HAddress,HSupID,HCurID,HWHID,HExRate,HDHDate" +
-
                         ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HDeliveryNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID,HMainSourceInterID" +
                         ",HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate) " +
                         " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
@@ -173,7 +172,7 @@
                       ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HRelationQty,HRelationMoney" +
                       ",HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HWWOrderDetaiLID" +
                       ",HPropertyID,HSecUnitID,HSecUnitRate,HTaxPrice,HTaxMoney,HMainSourceInterID,HBatChNo" +
-                      ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID) values("
+                      ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD) values("
                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                       ",'" + oSub.HDate + "','" + oSub.HKFDate + "'," + oSub.HKFPeriod.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HPrice.ToString() +
                       "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HStatus + "," + oSub.HSPID.ToString() + ",'','" + oSub.HEntryCloseDate +
@@ -181,8 +180,7 @@
                       "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HRelationQty + "," + oSub.HRelationMoney +
                       "," + oSub.HWWOrderInterID.ToString() + "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HWWOrderDetaiLID.ToString() +
                       "," + oSub.HPropertyID.ToString() + ",0," + oSub.HSecUnitRate.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HMainSourceInterID.ToString() + ",'" + oSub.HBatChNo +
-                      "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() +
-                      ") ");
+                      "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "') ");
                 }
                 //鍥炲~鍏宠仈鏁伴噺
                 //oCn.RunProc("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString());
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
index 7aa82b1..37373c5 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
@@ -44,5 +44,7 @@
         public Int64 HERPEntryID;
         public decimal HReturnedQty;
         public Int64 HDetailID;
+        public string F_xbkf_Combo;
+        public string FSHDD;
     }
 }

--
Gitblit v1.9.1