工序返工申请单：增加字段 HBillOperationType 审核时根据HBillOperationType进行相关反写

duhe

2024-10-31 179635da5c03219f833cc145595369d2e9b85e14

 WebAPI/Controllers/LMESController.cs

@@ -1210,7 +1210,7 @@
        #region 工艺路线分页列表
        [Route("Gy_RoutingBill/page")]
        [HttpGet]
        public json Gy_RoutingBillPage(string sWhere, string user, int page, int size)
        public object Gy_RoutingBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            json res = new json();
@@ -1256,7 +1256,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion
@@ -3559,7 +3559,23 @@
                        return objJsonResult;
                    }
                }
               

                //获取系统参数判断工艺路线是否启用多级审批禁用普通审批
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "Y") //系统参数  启用自动审核 
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "工艺路线已启用多级审批普通审核禁用";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }



                if (string.IsNullOrWhiteSpace(HInterID))
                {
@@ -3604,7 +3620,7 @@
                        if (oSystemParameter.omodel.WMS_CampanyName == "添康科技") //系统参数                      
                        {
                            //刷新默认工艺路线
                            oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);
                            oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
                        }
                    }