合并分支

chenhaozhe

2026-03-27 9d4fdc8ef43bfcafdb4a0f3e0e3d59cef1812b15

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2803,6 +2803,13 @@
                    {
                        omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
      
                    //=========返修条码
                    //生成物料条码时，机型码不允许为空
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_BarCodeBill_Rework_Ctrl")
                    {
                        omodel.Gy_BarCodeBill_Rework_Ctrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功！";
                return true;