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

zzr99

2021-11-18 ce634e1c1193b2e36df65d91acf8b969629e8c8b

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -27,7 +27,7 @@
        /// </summary>
        [Route("Gy_Material/list")]
        [HttpGet]
        public object list(string sWhere,string Organization)
        public object list(string sWhere, string Organization)
        {
            try
            {
@@ -41,22 +41,12 @@
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -231,7 +221,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                  

                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
@@ -359,7 +349,7 @@
        /// </summary>
        [Route("Gy_Mould/list1")]
        [HttpGet]
        public object list1(string sWhere,string ModRightNameSelect, string user)
        public object list1(string sWhere, string ModRightNameSelect, string user)
        {
            try
            {
@@ -373,7 +363,7 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere+ "order by 日期 desc", "h_v_Gy_MouldFileList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 日期 desc", "h_v_Gy_MouldFileList");
                }
                else
                {
@@ -425,7 +415,7 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere+ "order by 日期 desc", "h_v_Gy_CheckToolsFileMainList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere + "order by 日期 desc", "h_v_Gy_CheckToolsFileMainList");
                }
                else
                {
@@ -473,7 +463,7 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere+ "order by 日期 desc", "h_v_IF_BarCodeBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by 日期 desc", "h_v_IF_BarCodeBillList");
                }
                else
                {
@@ -601,6 +591,10 @@
                long HPrintQty = mainList[0].HPrintQty;
                string HMouldOWNER = mainList[0].HMouldOWNER;
                string HSaveLife = mainList[0].HSaveLife;
                int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID;
                int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID;



                //主表
                oCN.RunProc("Insert Into Gy_MouldFileMain   " +
@@ -612,17 +606,17 @@
                ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
                ") " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
                ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
                "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID + 
                "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
                ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + 
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER +"',"+ "','" + HSaveLife + "'," +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
                ") ");


@@ -634,7 +628,7 @@
                " values('" + HInterID + "',0,''" +
                ",0,0,'','',0,0 " +
                ") ");
             

                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
@@ -693,7 +687,7 @@
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
          

                long HInterID = mainList[0].HInterID;//递入type得到的单据ID
                string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
                DateTime HDate = mainList[0].HDate;//日期
@@ -734,7 +728,8 @@
                long HPrintQty = mainList[0].HPrintQty;
                string HMouldOWNER = mainList[0].HMouldOWNER;
                string HSaveLife = mainList[0].HSaveLife;

                int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
                int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;


                //若MAINDI重复则重新获取
@@ -769,7 +764,7 @@
                ",HSupNumber='" + HSupNumber + "'" +
                ",HPrintQty=" + HPrintQty.ToString() +
                ",HMouldStatus='" + HMouldStatus + "'" +
                ",HSaveLife='"+ HSaveLife+"'"+
                ",HSaveLife='" + HSaveLife + "'" +
                ",HWhID=" + HWHID.ToString() +
                ",HRoutingID=" + HRoutingID.ToString() +
                ",HBomID=" + HBOMID.ToString() +
@@ -780,10 +775,12 @@
                ",HUseLife=" + HUseLife.ToString() +
                ",HLeaveLife=" + HLeaveLife.ToString() +
                ",HProdQty=" + HProdQty.ToString() +
                ",HMouldOWNER='"+ HMouldOWNER+"'"+
                ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
                ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
                ",HMouldOWNER='" + HMouldOWNER + "'" +
                ",HProdWeight=" + HProdWeight.ToString() +
                " where HInterID=" + HInterID.ToString());
          

                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级
@@ -859,24 +856,24 @@
                    return objJsonResult;
                }
                if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        //写入日志
                        ClsPub.Add_Log("", "删除项目，代码：" + oBill.omodel.HMouldNo + ",名称：" + oBill.omodel.HName, ClsPub.CurUserName);
                        //更新上级为 末级
                        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;
                    }
                {
                    //写入日志
                    ClsPub.Add_Log("", "删除项目，代码：" + oBill.omodel.HMouldNo + ",名称：" + oBill.omodel.HName, ClsPub.CurUserName);
                    //更新上级为 末级
                    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;
                }
                //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID =  " + HItemID, "Gy_Department");

            }
@@ -890,6 +887,56 @@
            return objJsonResult;
        }

        /// <summary>
        /// 模具档案初始化按钮
        /// </summary>
        /// <param name="hmainid"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Gy_Material/InitializeProdInBill")]
        [HttpGet]
        public object InitializeProdInBill(long hmainid, string user)
        {
            DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
            try
            {
                string HBillNo = "";
                Int64 HInterID = 0;//显示的字段
                ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID='" + hmainid + "'", "Gy_MouldFileMain");
                DataRow dr = ds.Tables[0].Rows[0];
                HInterID = DBUtility.ClsPub.CreateBillID("3801", ref DBUtility.ClsPub.sExeReturnInfo);
                HBillNo = DBUtility.ClsPub.CreateBillCode("3801", ref DBUtility.ClsPub.sExeReturnInfo, true);
                string sql = "Insert Into Sc_MouldStockBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
                ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
                ") " +
                " values('3801','3801'," + HInterID + ",'" + HBillNo + "',' getdate()'" +
                ", '" + user + "',getdate()" +
                ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
                ", 0," + dr["HDeptID"].ToString() +  ",' ',0"  +

                ") ";
                //主表
                oCN.RunProc(sql);

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "初始化成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "初始化失败！";
                objJsonResult.data = null;
            }
            return objJsonResult;
        }

        #region [模具档案审核、反审核]
        /// <summary>