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

yangle

7 天以前 bdd7d792753f71cfe31a33d0b0cf703e0b502385

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -27,7 +27,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillMain ", "Sc_ICMOBillMain");
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillSub ", "Sc_ICMOBillSub");

                objJsonResult.code = "1";
                objJsonResult.count = 1;