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

zzr99

2022-01-21 d1ff6d3f77431b15feb72688a280f80b89fb68d6

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

 WebAPI/Controllers/LMESController.cs

@@ -180,6 +180,9 @@
            return GetObjectJson(ds);
        }

        #region 工艺路线

        #region 工艺路线列表
        /// <summary>
        /// 返回工艺路线列表
        ///参数：string sql。
@@ -214,6 +217,10 @@
            }
            return GetObjectJson(ds);
        }

        #endregion

        #region 工艺路线  删除
        /// <summary>
        /// 工艺路线删除功能
        /// </summary>
@@ -292,6 +299,9 @@
                return objJsonResult;
            }
        }
        #endregion

        #endregion

        /// <summary>
        /// 返回生产任务单列表

 WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs

@@ -46,11 +46,11 @@
                    ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sb_EquipRepairSendWorkBillList");
                }

                if (ds.Tables[0].Rows.Count == 0||ds==null)
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message ="无记录";
                    objJsonResult.Message = "无记录";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -64,7 +64,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception"+e.ToString();
                objJsonResult.Message = "Exception" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -207,7 +207,7 @@
                       ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                       ",HRepairID,HManagerID,HRepairExplanation" +
                       ") values("
                       + omodel.HInterID.ToString() + "," + (hentryid==-1?i: hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                       + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                       "," + oSub.HRepairID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairExplanation + "'" +
                       ") ");
@@ -240,30 +240,6 @@
                }
                oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);

                if (oBill.omodel.HBillStatus > 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "单据当前处于不能删除的状态";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oBill.omodel.HCloseMan != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "单据当前已关闭,不能删除";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oBill.omodel.HDeleteMan != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "单据当前已作废,不能删除";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oBill.omodel.HChecker != "")
                {
                    objJsonResult.code = "0";
@@ -299,5 +275,187 @@
            }
        }
        #endregion

        #region 设备维修派工单  审核/反审核
        [Route("Sb_EquipRepairSendWorkBill/EquipAuditBill")]
        [HttpGet]
        public object EquipAuditBill(int HInterID, int IsAudit, string CurUserName)
        {
            //    string ModRightNameCheck = ""; 该模块的审核功能
            DBUtility.ClsPub.CurUserName = CurUserName;//存储用户名
            try
            {
                ////判断是否有审核权限
                //    if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "ID小于0";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);//数据转换

                //查询审核的数据
                ds = oCN.RunProcReturn("select * from Sb_EquipRepairSendWorkBillMain where HInterID='" + HInterID + "'", "Sb_EquipRepairSendWorkBillMain");

                if (ds.Tables[0].Rows.Count > 0)
                {
                    var hcloseman = ds.Tables[0].Rows[0]["hcloseman"].ToString();//关闭人
                    var hdeleteman = ds.Tables[0].Rows[0]["hdeleteman"].ToString();//作废人
                    var hchecker = ds.Tables[0].Rows[0]["hchecker"].ToString();//审核人

                    if (hcloseman != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "当前单据已关闭,无法审核!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    if (hdeleteman != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "当前单据已作废,无法审核!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //IsAudit==0 审核
                    if (IsAudit == 0)
                    {
                        if (hchecker != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "当前单据已审核,无法再次审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    //IsAudit==1 反审核
                    if (IsAudit == 1)
                    {
                        if (hchecker == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "当前单据未审核,无法反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在;原因:" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //审核提交
                if (IsAudit == 0)
                {
                    if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                //反审核提交
                if (IsAudit == 1)
                {
                    if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核成功!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核失败!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或反审核失败" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //审核
        public bool CheckBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                string Hchecker = DBUtility.ClsPub.CurUserName;
                
                oCN.BeginTran();//打开事务
                oCN.RunProc("update Sb_EquipRepairSendWorkBillMain set HBillStatus=2,hchecker='"+Hchecker+ "',hcheckdate='"+DateTime.Now+ "' where HInterID='"+ lngBillKey + "'");
                oCN.Commit();//关闭事务
                sReturn = "审核成功!";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
        //反审核
        public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                string Hchecker = DBUtility.ClsPub.CurUserName;

                oCN.BeginTran();//打开事务
                oCN.RunProc("update Sb_EquipRepairSendWorkBillMain set HBillStatus=1,hchecker='',hcheckdate=null where HInterID='" + lngBillKey + "'");
                oCN.Commit();//关闭事务
                sReturn = "反审核单据成功!";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw(e);
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs

@@ -258,23 +258,15 @@
                }
                oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);

                if (oBill.omodel.HBillStatus > 1)
                if (oBill.omodel.HChecker != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "单据当前处于不能删除的状态";
                    objJsonResult.Message = "单据已经审核,不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //不需要
                //if (oBill.omodel.HChecker != "")
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 1;
                //    objJsonResult.Message = "单据当前已审核";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    objJsonResult.code = "1";

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -265,7 +265,7 @@
        }
        #endregion

        #region 保存/编辑
        #region 工序计划单 保存/编辑
        //工序计划单  保存/编辑
        [Route("Sc_ProcessMangement/AddBill")]
        [HttpPost]
@@ -421,7 +421,7 @@
        }
        #endregion

        #region 审核/反审核
        #region 工序计划单 审核/反审核
        [Route("Sc_ProcessMangement/CheckDeOAuditBill")]
        [HttpGet]
        public object CheckDeOAuditBill(int HInterID, int IsAudit, string CurUserName)
@@ -603,7 +603,7 @@
        }
        #endregion

        #region 删除
        #region 工序计划单 删除
        [Route("Sc_ProcessMangement/DeleteProcessBill")]
        [HttpGet]
        public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
@@ -621,23 +621,15 @@
                //}
                oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);

                if (oBill.omodel.HBillStatus > 1)
                if (oBill.omodel.HChecker != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "单据当前处于不能删除的状态";
                    objJsonResult.Message = "单据当前处于审核状态,不能删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //不需要
                //if (oBill.omodel.HChecker != "")
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 1;
                //    objJsonResult.Message = "单据当前已审核";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
              
                if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    objJsonResult.code = "1";
@@ -667,6 +659,7 @@
        #endregion

        #endregion

        /// <summary>
        /// 返回生产工序派工单列表
        /// </summary>

 WebAPI/DLL/ClsSc_MESEndWorkBill.cs

@@ -458,7 +458,7 @@
                string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
                oCn.BeginTran();
                oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
                //根据开工单内码 设置 生产状态表 开工状态(先把 本资源全部工单 设置为非开工状态，再设置本单对应得源单 为开工状态)
                //根据开工单内码 取到生产状态临时表主内码，然后更新生产状态临时表状态为：待生产  任务单状态(0待生产，1生产中，2挂起，3已完工)
                oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='完工'");
                oCn.Commit();
                

 WebAPI/DLL/ClsSc_ProcessReport.cs

@@ -179,11 +179,11 @@
                  ") ");
                }
                //更新关联数量
                AddNewRelation(ref sReturn, omodel.HInterID);
                //AddNewRelation(ref sReturn, omodel.HInterID);
                //更新关联数量
                //oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
                 oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
                //回填 生产状态表  日计划  为 已完工 状态
                oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
                //oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
                //默认变为 申请检验状态
                oCn.RunProc("exec h_p_Sc_UpDateProcessReportStatus " + omodel.HInterID.ToString() + ",15");
                //