duhe
2024-11-15 9c52280d2d6ab6266d3a12282ccdcac5e58a8063
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -292,7 +292,7 @@
                        DataSet dss;
                        dss = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Gy_RoutingBillMain");
                        //判断是否可编辑
                        if ((dss.Tables[0].Rows[0]["HChecker"].ToString() != "" && dss.Tables[0].Rows[0]["HChecker"] != null) || (dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "1" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "0"))
                        if ((dss.Tables[0].Rows[0]["HChecker"].ToString() != "" && dss.Tables[0].Rows[0]["HChecker"] != null) || (dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "1" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "0" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "5"))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -379,14 +379,16 @@
                }
                if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                {
                    //是否勾选默认工艺路线
                    if (HStandard)
                    {
                        //设置默认工艺路线
                        oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
                    }
                }
                //是否勾选默认工艺路线
                //if (HStandard)
                //{
                //    //设置默认工艺路线
                //    oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
                //}
                //判断是否重复工序号
                ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
@@ -2046,6 +2048,17 @@
                            objJsonResult.count = CountConstant.SUCCEED;
                            objJsonResult.Message = "审核成功";
                            objJsonResult.data = null;
                            //获取系统参数
                            string Ret = "";
                            if (oSystemParameter.ShowBill(ref Ret))
                            {
                                //判断客户
                                if (oSystemParameter.omodel.WMS_CampanyName == "添康科技") //系统参数
                                {
                                    //刷新默认工艺路线
                                    oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + CurUserName + "'");
                                }
                            }
                        }
                        else
                        {