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

yusijie

2024-10-10 7d36d5caca5d2b565c978d6aac040a22c265b26f

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -450,7 +450,7 @@
                    //计价方式不为计时，则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
                    {
                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);                  
                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = 0 where HInterID = " + HInterID + " and HEntryID = " + i);                  
                    }

                    if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
@@ -494,7 +494,7 @@
                    //计价方式不为计时，则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
                    {
                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);
                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = 0 where HInterID = " + HInterID + " and HEntryID = " + i);
                    }

                    if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)