From 70f147e9f20d2993b09546b2f00a904cae60c0f9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 25 八月 2023 11:11:00 +0800
Subject: [PATCH] 1

---
 DAL/生产管理/模具管理/ClsSc_MouldDotCheckBill.cs |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckBill.cs"
index b1128a3..c6f2d8d 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckBill.cs"
@@ -9,11 +9,12 @@
     {
         public Model.ClsSc_MouldDotCheckBillMain omodel = new Model.ClsSc_MouldDotCheckBillMain();
         public List<Model.ClsSc_MouldDotCheckBillSub> DetailColl = new List<Model.ClsSc_MouldDotCheckBillSub>();
+        public List<Model.ClsSc_MouldDotCheckBillSub_Item> DetailCol = new List<Model.ClsSc_MouldDotCheckBillSub_Item>();
 
         public ClsSc_MouldDotCheckBill()
         {
             base.MvarItemKeySub = "Sc_MouldDotCheckBillSub";
-            base.MvarItemKeySub2 = "";
+            base.MvarItemKeySub2 = "Sc_MouldDotCheckBillSub_Item";
             base.MvarItemKeySub3 = "";
             base.MvarItemKeySub4 = "";
             base.MvarItemKey="Sc_MouldDotCheckBillMain";
@@ -41,7 +42,6 @@
                 //鏇存柊涓昏〃
                 oCn.RunProc("UpDate Sc_MouldDotCheckBillMain set  " +
                 " HBillNo='" + omodel.HBillNo + "'" +  //鍥哄畾璧嬪��===============
-                ",HDate='" + omodel.HDate + "'" +
                 ",HYear='" + omodel.HYear.ToString() + "'" +
                 ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                 //",HStockType='" + omodel.HStockType + "'" +
@@ -51,6 +51,7 @@
                     //========================================
                 ",HPlanNo='" + omodel.HPlanNo + "'" +
                 ",HPlanInterID=" + omodel.HPlanInterID.ToString() +
+                ",HMouldDotCheckRuleID=" + omodel.HMouldDotCheckRuleID.ToString() +
 
 
                 ",HMouldID=" + omodel.HMouldID.ToString() +
@@ -65,6 +66,7 @@
                 DeleteRelation(ref sReturn, lngBillKey);
                 //鍒犻櫎瀛愯〃
                 DeleteBillSub(lngBillKey);
+                //DeleteBillSub2(lngBillKey);
                 //鎻掑叆瀛愯〃
                 omodel.HInterID = lngBillKey;
                 //鎻掑叆瀛愯〃
@@ -84,6 +86,22 @@
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                       ") ");
                 }
+
+                ////閰嶄欢椤圭洰
+                //foreach (Model.ClsSc_MouldDotCheckBillSub_Item oSub in DetailCol)
+                //{
+                //    oCn.RunProc("Insert into Sc_MouldDotCheckBillSub_Item " +
+                //    " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+                //    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                //    ",HMaterID,HUnitID" +
+                //    ",HQty,HQtyMust" +
+                //    ") values("
+                //    + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                //    "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                //    "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
+                //    "," + oSub.HQty.ToString() + "," + oSub.HQtyMust.ToString() +
+                //    ") ");
+                //}
                 //
                 //foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
                 //{
@@ -122,13 +140,13 @@
                 ",HYear,HPeriod,HRemark" +
                 ",HMouldID,HBeginDate"+
                 ",HEndDate,HPlanNo,HPlanInterID" +
-                ",HInnerBillNo,HExplanation" +
+                ",HInnerBillNo,HExplanation,HMouldDotCheckRuleID" +
                 ") " +
-                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
-                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
+                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
+                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                 "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
                 ",'" + omodel.HEndDate + "','" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() +
-                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" +
+                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," + omodel.HMouldDotCheckRuleID +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
@@ -147,6 +165,22 @@
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                       ") ");
                 }
+
+                ////閰嶄欢椤圭洰
+                //foreach (Model.ClsSc_MouldDotCheckBillSub_Item oSub in DetailCol)
+                //{
+                //    oCn.RunProc("Insert into Sc_MouldDotCheckBillSub_Item " +
+                //    " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+                //    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                //    ",HMaterID,HUnitID" +
+                //    ",HQty,HQtyMust" +
+                //    ") values("
+                //    + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                //    "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                //    "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
+                //    "," + oSub.HQty.ToString() + "," + oSub.HQtyMust.ToString() +
+                //    ") ");
+                //}
                 //
                 //foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
                 //{

--
Gitblit v1.9.1