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

zrg

2024-12-11 6b4e4aef421cc4fc69d3f021694782f937074cb1

 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;