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

yangle

2023-06-09 45d47a14cbab96fb4e293acb5128e43e89ddd562

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -343,6 +343,8 @@
            foreach (Gy_RoutingBillSub oSub in DetailColl)
            {
                i++;
                if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配")
                {
                if (oSub.HWorkQty <= 0)
                {
                    objJsonResult.code = "0";
@@ -351,6 +353,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                }
                
                //如果工价为0，则工价字段不做为必填字段
                if (oSub.HProcPrice == 0 && oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")