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

yangle

2024-09-25 0f2bdefca1bcfada65aafe33234e5e4d69522ce7

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

 Model/车间管理/ClsSc_ProcessExchangeBillSub_BatchSplit.cs

@@ -20,6 +20,7 @@
        public string HBillNo;//娴佽浆鍗″彿
        public string HBatchNo;//鎵规
        public string HGroupNumber;//鐝粍        
        public Int64 HWorkShopID;//鐢熶骇杞﹂棿鍐呯爜
    }
}


 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -1587,7 +1587,7 @@
                    return objJsonResult;
                }

                string sql1 = "select top 5000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql1 = "select top 15000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");