From 175f31386e47b1ca2c751b8f87cd7a089c66e7ae Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 25 八月 2023 16:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Gy_BarCodeBill.cs |  201 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 192 insertions(+), 9 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 5d9b0ed..13cd884 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -81,6 +81,11 @@
         public const Int16 HShowDateCol = 60;
         public const Int16 HInnerBillNoCol = 61;
         public const Int16 HMakerCol = 62;
+        public const Int16 HProduceDateCol = 63;
+        public const Int16 HExpiryDateCol = 64;
+        public const Int16 HISKFPERIODCol = 65;
+        public const Int16 HEXPUNITCol = 66;
+        public const Int16 HEXPPERIODCol = 67;
 
         public Int16 HSelectCol = 0;
         public Int16 HSno2Col = 1;
@@ -142,6 +147,11 @@
         public Int16 HInnerBillNo2Col = 57; 
         public Int16 HMaker2Col = 58;
         public Int16 HEntryID2Col = 59;
+        public Int16 HProduceDate2Col = 60;
+        public Int16 HExpiryDate2Col = 61;
+        public Int16 HISKFPERIOD2Col = 62;
+        public Int16 HEXPUNIT2Col = 63;
+        public Int16 HEXPPERIOD2Col = 64;
         //
         public  string ModName = "85";
         public  string ModCaption = "鏉$爜鐢熸垚";
@@ -211,6 +221,8 @@
             cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
             cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
             cmbSourceBillType.Items.Add("濮斿璁㈠崟");
+            cmbSourceBillType.Items.Add("宸ュ簭姹囨姤鍗�");
+            cmbSourceBillType.Items.Add("宸ュ簭娴佽浆鍗�");
             cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
             cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
             cmbSourceBillType.Items.Add("鐩存帴璋冩嫧鍗�");
@@ -624,6 +636,45 @@
                     {
                         sHRemark= sHRemark+DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
                     }
+                    else
+                    {
+                        if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
+                        {
+                            DateTime HProduceDate;  //鐢熶骇鏃ユ湡
+                            string HEXPUNIT;        //淇濊川鏈熷崟浣�
+                            int HEXPPERIOD;         //淇濊川鏈�
+
+                            HProduceDate = dtpHDate.Value;
+                            HEXPUNIT = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HEXPUNIT"]);
+                            HEXPPERIOD = DBUtility.ClsPub.isInt(oDsCheck.Tables[0].Rows[0]["HEXPPERIOD"]);
+
+                            grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 1;
+                            grdMain.Rows[j].Cells[HEXPUNITCol].Value = HEXPUNIT;
+                            grdMain.Rows[j].Cells[HEXPPERIODCol].Value = HEXPPERIOD.ToString();
+                            grdMain.Rows[j].Cells[HProduceDateCol].Value = HProduceDate.ToShortDateString();
+
+                            if (HEXPUNIT == "Y")
+                            {
+                                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+                            }
+                            else if (HEXPUNIT == "M")
+                            {
+                                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+                            }
+                            else
+                            {
+                                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+                            }
+                        }
+                        else
+                        {
+                            grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 0;
+                            grdMain.Rows[j].Cells[HEXPUNITCol].Value = "";
+                            grdMain.Rows[j].Cells[HEXPPERIODCol].Value = 0;
+                            grdMain.Rows[j].Cells[HProduceDateCol].Value = "";
+                            grdMain.Rows[j].Cells[HExpiryDateCol].Value = "";
+                        }
+                    }
                 }
             }
             if(sHRemark!="")
@@ -789,6 +840,15 @@
                     {
                         TM = HOrgNumber + HNumber + HBatchNo;
                     }//鍗氭棩鐗规畩澶勭悊
+                    else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
+                    {
+                        //鏉$爜瑙勫垯锛� GX+鐗╂枡鍐呯爜+骞村勾鏈堟湀鏃ユ棩+5浣嶆祦姘村彿
+                        LSHlen = 5;
+                        //鏉$爜鍓嶇紑 = GX+鐗╂枡鍐呯爜+骞村勾鏈堟湀鏃ユ棩
+                        sTMNumber = "GX" + HNumber + sYear + sPeriod + sDay;
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                    }
                     else if(cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
                     {
                         //鐗╂枡缂栫爜+鍗曟嵁鏃ユ湡锛圷YMMDD锛�+娴佹按4浣� 
@@ -823,10 +883,10 @@
                         Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
                                                                                                                     //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                         LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
-                        LSHlen = 5;
-                        if (sTMNumber.Length != 16)
+                        LSHlen = 4;
+                        if (sTMNumber.Length != 16 && sTMNumber.Length != 15)
                         {
-                            MessageBox.Show("鏉$爜闀垮害涓嶅16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠g爜5浣�:[" + HModelName + "] + 骞存湀鏃�5浣�:["+ HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo  + "]+ 鍘嬬缉鏈�1浣�:["+ HYasuoji + "]+00 ; ");
+                            MessageBox.Show("鏉$爜闀垮害涓嶅15鎴�16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠g爜5浣�:[" + HModelName + "] + 骞存湀鏃�4鎴�5浣�:["+ HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo  + "]+ 鍘嬬缉鏈�1浣�:["+ HYasuoji + "]+00 ; ");
                             return;
                         }
                     }
@@ -839,9 +899,9 @@
                                                                                                                     //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                         LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                         LSHlen = 4;
-                        if (sTMNumber.Length != 18)
+                        if (sTMNumber.Length != 18 && sTMNumber.Length != 17)
                         {
-                            MessageBox.Show("鏉$爜闀垮害涓嶅18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:["+ HMaterNumber.Replace(".", "") + "]+骞存湀鏃�5浣�:["+ HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo  + "];");
+                            MessageBox.Show("鏉$爜闀垮害涓嶅17鎴�18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:["+ HMaterNumber.Replace(".", "") + "]+骞存湀鏃�4鎴�5浣�:["+ HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo  + "];");
                             return;
                         }
                     }
@@ -896,6 +956,11 @@
                             LSH2 = "0" + LSH2;
                         }
                         if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                        {
+                            //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                            TM = sTMNumber + LSH2;
+                        }
+                        else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
                         {
                             //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
                             TM = sTMNumber + LSH2;
@@ -977,12 +1042,24 @@
                         grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value;
                         grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value;
                         grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value;
+                        grdSub.Rows[i].Cells[HProduceDate2Col].Value = grdMain.Rows[j].Cells[HProduceDateCol].Value;
+                        grdSub.Rows[i].Cells[HExpiryDate2Col].Value = grdMain.Rows[j].Cells[HExpiryDateCol].Value;
+                        grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value = grdMain.Rows[j].Cells[HISKFPERIODCol].Value;
+                        grdSub.Rows[i].Cells[HEXPUNIT2Col].Value = grdMain.Rows[j].Cells[HEXPUNITCol].Value;
+                        grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value = grdMain.Rows[j].Cells[HEXPPERIODCol].Value;
                         //缃戞牸鎵撳嬀
+                        //鏄惁璧犲搧
                         DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
                         oCell.ThreeState = false;
                         oCell.Value = grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value;
                         oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
                         grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+                        //鏄惁鍚敤淇濊川鏈�
+                        DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+                        oCell2.ThreeState = false;
+                        oCell2.Value = grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value;
+                        oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                        grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
                         k = k + 1;
                         n = n + 1;
                         //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
@@ -1026,6 +1103,11 @@
             string HInnerBillNo = "";
             bool HGiveAwayFlag = false;
             Int64 HEntryID = 0;
+            string HProduceDate;
+            string HExpiryDate;
+            bool HISKFPERIOD = false;
+            string HEXPUNIT = "";
+            double HEXPPERIOD = 0;
             try
             {
                 oCn.BeginTran();
@@ -1071,6 +1153,25 @@
                         HSeOrderSEQ = ClsPub.isLong(grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value);
                         HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
                         HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value);
+                        if (ClsPub.isDate(grdSub.Rows[i].Cells[HProduceDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+                        {
+                            HProduceDate = "";
+                        }
+                        else
+                        {
+                            HProduceDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HProduceDate2Col].Value);
+                        }
+                        if (ClsPub.isDate(grdSub.Rows[i].Cells[HExpiryDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+                        {
+                            HExpiryDate = "";
+                        }
+                        else
+                        {
+                            HExpiryDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HExpiryDate2Col].Value);
+                        }
+                        HISKFPERIOD = ClsPub.isBool(grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value);
+                        HEXPUNIT = ClsPub.isStrNull(grdSub.Rows[i].Cells[HEXPUNIT2Col].Value);
+                        HEXPPERIOD = ClsPub.isDoule(grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value);
                         oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                                     ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                     ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1078,6 +1179,8 @@
                                     ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                     ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                     ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+                                    ",HProduceDate,HExpiryDate " +
+                                    ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD " +
                                     ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
                                     ") values ("
                                     + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
@@ -1085,8 +1188,10 @@
                                     + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
                                     + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                     + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
-                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString()
                                     + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
+                                    + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+                                    + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString()
                                     + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
 
 
@@ -1493,7 +1598,7 @@
             //
             grdMain.RowCount = 0;
             grdSub.RowCount = 0;
-            grdMain.ColumnCount = 63;                       //鎬诲垪鏁�
+            grdMain.ColumnCount = 68;                       //鎬诲垪鏁�
             DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
             grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
             grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1550,6 +1655,11 @@
             grdMain.Columns[HShowDateCol].HeaderText = "鏃ユ湡";
             grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
             grdMain.Columns[HMakerCol].HeaderText = "鍒跺崟浜�";
+            grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+            grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+            grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+            grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+            grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
             ////
             //鏍煎紡鍖� 
             grdMain.Columns[HTagCol].Visible = false;                           //闅愯棌鍒�
@@ -1597,7 +1707,12 @@
             grdMain.Columns[HSourceIDCol].Visible = false;
             grdMain.Columns[HSourceNumberCol].Visible = false;
             grdMain.Columns[HSourceNameCol].Visible = false;
-            
+            grdMain.Columns[HProduceDateCol].Visible = false;
+            grdMain.Columns[HExpiryDateCol].Visible = false;
+            grdMain.Columns[HISKFPERIODCol].Visible = false;
+            grdMain.Columns[HEXPUNITCol].Visible = false;
+            grdMain.Columns[HEXPPERIODCol].Visible = false;
+
             //璁剧疆鍙紪杈戝垪
             string sAllowCol =  HQtyCol.ToString()+
                                 "," + HMinQtyCol.ToString() +
@@ -1627,7 +1742,7 @@
             DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
             //----------------------------
 
-            grdSub.ColumnCount = 60;                       //鎬诲垪鏁�
+            grdSub.ColumnCount = 65;                       //鎬诲垪鏁�
             DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
             grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
             grdSub.Columns[HTMCol].HeaderText = "鏉$爜缂栧彿";
@@ -1687,6 +1802,11 @@
             grdSub.Columns[HInnerBillNo2Col].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
             grdSub.Columns[HMaker2Col].HeaderText = "鍒跺崟浜�";
             grdSub.Columns[HEntryID2Col].HeaderText = "琛屽彿";
+            grdSub.Columns[HProduceDate2Col].HeaderText = "鐢熶骇鏃ユ湡";
+            grdSub.Columns[HExpiryDate2Col].HeaderText = "鏈夋晥鏈熻嚦";
+            grdSub.Columns[HISKFPERIOD2Col].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+            grdSub.Columns[HEXPUNIT2Col].HeaderText = "淇濊川鏈熷崟浣�";
+            grdSub.Columns[HEXPPERIOD2Col].HeaderText = "淇濊川鏈�";
             //鏍煎紡鍖� 
             grdSub.Columns[HMaterID2Col].Visible = false;
             grdSub.Columns[HModel2Col].Visible = false;
@@ -1735,11 +1855,18 @@
             for (int i = 0; i < grdSub.Rows.Count; i++)
             {
                 //缃戞牸鎵撳嬀
+                //鏄惁璧犲搧
                 DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
                 oCell.ThreeState = false;
                 oCell.Value = 0;
                 oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
                 grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+                //鏄惁鍚敤淇濊川鏈�
+                DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+                oCell2.ThreeState = false;
+                oCell2.Value = 0;
+                oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
             }
 
             DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
@@ -2177,6 +2304,24 @@
                     FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
                 }
             }
+            else if (cmbSourceBillType.Text.Trim() == "宸ュ簭娴佽浆鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
+                if (oIF_ProcessExchangeBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "宸ュ簭姹囨姤鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_ProcessReportBillList oIF_ProcessReportBillList = new DAL.Cls_S_IF_ProcessReportBillList();
+                if (oIF_ProcessReportBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_ProcessReportBillList.oBillSelectColl);
+                }
+            }
             else
             {
 
@@ -2319,6 +2464,26 @@
                     grdMain.Rows[i].Cells[HTagCol].Value = "*";
                     //寰楀埌淇℃伅
                     Ds = oCn.RunProcReturn("select * from h_v_IF_PackageDismantleList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_PackageDismantleList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //宸ュ簭娴佽浆鍗�
+                if (oSelectRow.BillType == "3772")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessExchangeList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鐢熶骇姹囨姤鍗�
+                if (oSelectRow.BillType == "3714")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessReportList");
                     //鍐欏叆淇℃伅
                     Sub_WriteInForm1(Ds.Tables[0], i);
                 }
@@ -3432,5 +3597,23 @@
                 MessageBox.Show("鐢熸垚绠辩爜澶辫触锛�" + e1.Message );
             }
         }
+
+        private void cmbSourceBillType_TextChanged(object sender, EventArgs e)
+        {
+            if (cmbSourceBillType.Text == "宸ュ簭娴佽浆鍗�")
+            {
+                cmbHBarCodeType.Items.Clear();
+                cmbHBarCodeType.Items.Add("搴忓垪鐮�");
+                this.cmbHBarCodeType.SelectedIndex = 0;
+            }
+            else
+            {
+                cmbHBarCodeType.Items.Clear();
+                cmbHBarCodeType.Items.Add("鍞竴鏉$爜");
+                cmbHBarCodeType.Items.Add("鍝佺鏉$爜");
+                cmbHBarCodeType.Items.Add("鎵规鏉$爜");
+                this.cmbHBarCodeType.SelectedIndex = 0;
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1