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

yangle

2023-04-24 f9a5863dd719d6036e28391b0d4f39b2d349f3e9

 DAL/公用/frmBillQueryCondition_New.cs

@@ -28,7 +28,7 @@
            DAL.ClsIF_Group_View oGroup = new DAL.ClsIF_Group_View();
            DAL.ClsIF_Process_View oProc = new DAL.ClsIF_Process_View();
            DAL.ClsIF_Supplier_View oSup = new DAL.ClsIF_Supplier_View();
            DAL.ClsIF_Warehouse_View oWare = new DAL.ClsIF_Warehouse_View(); 
            DAL.ClsIF_Warehouse_View oWare = new DAL.ClsIF_Warehouse_View();
            int FieldNameCol = 2;
            int ConditionCol = 4;
            if (sCol != ConditionCol)