合并冲突 2025-5-29 9:20

chenhaozhe

2025-05-29 21dad2a2c73262cd6787bf78b4806de0b8b20bac

 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)
                {