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

yangle

2023-03-03 c2a9a460e38c7c196fe98a94e29e6330eac3626f

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -231,25 +231,25 @@
                    return objJsonResult;
                }

                //string sErrMsg = "";
                //if (oSystemParameter.ShowBill(ref sErrMsg))
                //{
                //    if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
                //    {
                //        if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
                //        {
                //            //设置转工序
                //            oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
                //        }
                //    }
                //}

                if (IsProNo == 1 && OperationType == 1)
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg))
                {
                    //设置转工序
                    oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
                    if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
                    {
                        if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
                        {
                            //设置转工序
                            oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
                        }
                    }
                    else if (IsProNo == 1 && OperationType == 1)
                    {
                        //设置转工序
                        oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
                    }
                }


                //是否勾选默认工艺路线
                if (HStandard)
                {