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

yangle

2023-03-23 152a02e90a7da2d431d2ea75499c1d07ef495e1b

 WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs

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

                ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " and 制单人='"+user+"'  order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList");

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