1

duhe

2024-11-05 9a75f7db9431032c0f1ecc64be4966a25c74bafa

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -282,28 +282,37 @@
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改

                    //修改
                    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() != "5" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "0"))
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据状态未在创建或退回，不允许修改！";
                        objJsonResult.data = 1;
                        return objJsonResult;

                    }
                    dss = oCN.RunProcReturn("select COUNT(*) as number from Sc_ProcessExchangeBillMain where HRoutingBillID = " + HInterID, "Gy_RoutingBillMain");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["number"].ToString() != "0")
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据已经被引用，不允许修改！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                        //修改
                        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"))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据状态未在创建，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }

                        dss = oCN.RunProcReturn("select COUNT(*) as number from Sc_ProcessExchangeBillMain where HRoutingBillID = " + HInterID, "Gy_RoutingBillMain");
                        //判断是否可编辑
                        if (dss.Tables[0].Rows[0]["number"].ToString() != "0")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据已经被引用，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }
                    
                    
                    oCN.RunProc("update Gy_RoutingBillMain  set " +
                       "HDate='" + HDate +
@@ -1567,7 +1576,7 @@
                    " LEFT JOIN Gy_RoutingBillMain as po ON a.hmainid = po.HInterID" +
                    " LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
                    " LEFT JOIN Xt_CheckUserRight as cr ON cr.HCheckItemID = i.HItemID and cr.HCheckFlowInterID = m.HInterID" +
                    " where po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID  and cr.HUserID = '" + userid + "'";
                    " where 工序代码 != '9999' and a.HBillSubType<>'SUB' and po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID  and cr.HUserID = '" + userid + "'";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
@@ -1617,7 +1626,7 @@
                string sql = "  select DISTINCT a.*,c.HItemID as HCheckFlowStatusID,m.HName as 审批流,c.HCheckFlowID,i.HName as 审批项目名称,c.HCheckItemID,c.HChecker as 项目审核人,c.HCheckNote as 审批流审核建议,c.HCheckDate 审批流审核日期   from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.单据类型 = c.HBillTypeID" +
                    " LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +
                    " LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
                    " where c.HCheckDate is  not NUll and c.HChecker = '" + user + "'";
                    " where 工序代码 != '9999' and a.HBillSubType<>'SUB' and c.HCheckDate is  not NUll and c.HChecker = '" + user + "'";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
@@ -2338,7 +2347,6 @@
                        objJsonResult = (json)AuditGy_Routing_Flow(idArray[i], IsAudit, CurUserName, CurUserID);//审核执行
                        if (objJsonResult.count == 0)
                        {
                            oCN.RollBack();
                            objJsonResult.Message += "第" + (i + 1) + "行出现问题无法继续完成";
                            return objJsonResult;
                        }