Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

llj

2025-10-13 ce58bfdb73054fa181e0731d60f4c2e74798cabb

 WarM/ÌõÂë´òÓ¡/Gy_CusBarCodeBill_KaiBei.cs

@@ -982,6 +982,8 @@
                                "," + HMinQtyCol.ToString() +
                                "," + HMaterNumberCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HCusModelNameCol.ToString() +
                                "," + HCusModelCol.ToString() +
                                "," + HUnitNumberCol.ToString() +
                                "," + HCode1Col.ToString() +
                                //"," + HCode2Col.ToString() +
@@ -1399,6 +1401,8 @@
            string sAllowCol = HQtyCol.ToString() +
                                "," + HMinQtyCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HCusModelNameCol.ToString() +
                                "," + HCusModelCol.ToString() +
                                "," + HCode1Col.ToString() +
                                //"," + HCode2Col.ToString() +
                                "," + HCode3Col.ToString() +
@@ -1647,11 +1651,21 @@
                    DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_CusMatNo " + num.ToString() + "," + HCusID.ToString() + "," + HMaterID.ToString(), "h_p_Gy_CusBarCodeBill_CusMatNo");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        grdMain.Rows[j].Cells[HCusModelNameCol].Value = "";
                        //网格下拉选择框
                        DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
                        column.Items.Add("");
                        grdMain.Rows[j].Cells[HCusModelNameCol] = column;
                        grdMain.Rows[j].Cells[HCusModelCol].Value = "";
                    }
                    else
                    {
                        //网格下拉选择框
                        DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
                        for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                        {
                            column.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HCusRelationNumber"]));
                        }
                        grdMain.Rows[j].Cells[HCusModelNameCol] = column;
                        grdMain.Rows[j].Cells[HCusModelNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationNumber"]);
                        grdMain.Rows[j].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationName"]);
                        if (num == 2)