From b0c9966e0ed10d5e1e09e7a31e3b06bddff75696 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期三, 13 一月 2021 16:15:56 +0800
Subject: [PATCH] 单据字段修改

---
 SCM/单据资料/Sc_ICMOReportToBarCode.cs |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
index c3ac64d..6104ed7 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
@@ -670,7 +670,7 @@
                             ",HLogo,HPackageSize,HMaterialJQty,HMaterialMQty,HCustomBatchNo " +
                             ",HSTOCKORGID,HOWNERID,HBeginDate,HSeOrderBillNo,HGBBarCode " +
                             ",POOrderBillNo,HSourceID " +
-                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo " +
+                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HBadReasonList,HProdLev " +
                             ") values ("
                             + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                             + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -681,7 +681,7 @@
                             + ",'" + HLogo + "','" + HPackageSize + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + ",'" + HCustomBatchNo + "'"
                             + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HBeginDate.ToShortDateString() + "','" + HSeOrderBillNo + "','" + HGBBarCode + "'"
                             + ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag) 
-                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "')";
+                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','"+ txtHReasonList.Text + "','"+ HRemark + "')";
                 oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);
 
                 
@@ -1367,6 +1367,7 @@
                 oQC_NoPassProdCheckBillMain.HGroupName = "";
                 oQC_NoPassProdCheckBillMain.HOrderProcNo = "";
                 oQC_NoPassProdCheckBillMain.HProcExchQty = 0;
+                oQC_NoPassProdCheckBillMain.HBarCode = HBarCode;
                 if (oWeb.set_SaveNoPassProdCheckBill_New(oQC_NoPassProdCheckBillMain, HSourceBillTypeID, txtHReasonList.Text.Trim(), ref DBUtility.ClsPub.sExeReturnInfo))
                 {
                     txtHReasonList.Text = "";
@@ -1399,10 +1400,28 @@
 
         private void cmdSaveAndDown_Click(object sender, EventArgs e)
         {
-            if (SaveBill("SaveDown"))
+            Gy_BadReasonList oGy_BadReasonList = new Gy_BadReasonList();
+            oGy_BadReasonList.ShowDialog();
+            if (oGy_BadReasonList.ISOK == 1)
             {
-                txtHKSQty.Text = txtHDQQty.Text;//缁х画瑁佸垏锛屽皢褰撳墠绫虫暟浣滀负寮�濮嬬背鏁帮紱
+                txtHReasonList.Text = "";
+                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;
+                oGy_BadReasonList = null;
+                if (SaveBill("SaveDown"))
+                {
+                    txtHKSQty.Text = txtHDQQty.Text;//缁х画瑁佸垏锛屽皢褰撳墠绫虫暟浣滀负寮�濮嬬背鏁帮紱
+                }
+                if (SaveBadReasonBill())
+                {
+                    MessageBox.Show("淇濆瓨涓嶈壇鍘熷洜鎴愬姛锛�");
+                    DisplayMain();
+                }
+                else
+                {
+                    MessageBox.Show("淇濆瓨涓嶈壇鍘熷洜澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo);
+                }
             }
+            
         }
 
         private void cmdHGroupID_Click(object sender, EventArgs e)

--
Gitblit v1.9.1