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

yusijie

2023-08-16 d9d0587b8ae82785a97b874a4d2b0fff9d3e0882

 WebAPI/Controllers/Sc_PckSplitBillController.cs

@@ -374,7 +374,7 @@
        {
            try
            {
                string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere);
                string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where 1=1 " + sWhere);
                 DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList");
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                {