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

zzr99

2022-06-27 20f0478d39110034363d852d6d0594cea325617f

 WebAPI/Controllers/WebAPIController.cs

@@ -25,6 +25,7 @@
        public DataSet ds = new DataSet();
        private json objjson = new json();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        //public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
        //  private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
        /// <summary>
@@ -127,7 +128,7 @@

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "登录异常！"+e.Message;
                objjson.Message = "登录异常！" + e.Message;
                objjson.data = null;
                return objjson; ;
            }
@@ -208,7 +209,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！"; 
                    objJsonResult.Message = "删除失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -340,6 +341,159 @@
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        //根据拖条码返回条码档案表唯一码信息
        [Route("GroupOrder/GetBillEntry_TmpListGroupOrder")]
        [HttpGet]
        public object GetBillEntry_TmpListGroupOrder(string HBarCode)
        {
            try
            {
                ds = webserver.GetBarCode(HBarCode);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {

                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        //根据网格选中记录去修改条码档案、组托单子表记录并重新生成组托单sum表
        [Route("GroupOrderBill/Edit")]
        [HttpGet]
        public object Edit(string HBarCode1, Int64 HQty)
        {

            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                oCN.RunProc("update Gy_BarCodeBill set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
                oCN.RunProc("update Sc_PackUnionBillSub set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
                DataSet ds = oCN.RunProcReturn("exec h_p_DisPlayBarCode '" + HBarCode1 + "'", "h_p_DisPlayBarCode");

                long HInterIDTTM = 0;
                long HInterID = 0;
                string HBarCode_Pack = "";
                string HBarCode = "";
                string HUser = "";
                HInterIDTTM = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID_TTM"]);
                HBarCode_Pack = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_Pack"]);
                HUser = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMaker"]);
                HInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
                oCN.RunProc("exec  h_p_WMS_PackUnionBill_SumSubBill  " + HInterIDTTM.ToString() + ",'" + HBarCode_Pack + "','3783','" + HUser + "'," + HInterID.ToString()); //根据箱条码，写入 SUM表，SUM条码档案
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            //DataSet DS1 = webserver.GetBarCode(HBarCode);                                                                                                                                                                            //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);

            //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


            //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
            //    {
            //        objjson.code = "0";
            //        objjson.count = 0;
            //        objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
            //        objjson.data = null;
            //        return objjson;
            //    }
            //    else
            //    {
            //        objjson.code = "0";
            //        objjson.count = 1;
            //        objjson.Message = "获取成功!";
            //        objjson.data = DS1.Tables[0];
            //        return objjson;
            //    }
            //}
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        //根据网格选中记录的唯一码  去删除条码档案  组托单子表   组托单sum表的唯一码数据
        [Route("GroupOrderBill/Delete")]
        [HttpGet]
        public object Delete(string HBarCode1)
        {

            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                oCN.RunProc("delete from  Gy_BarCodeBill  where HBarCode = '" + HBarCode1 + "'");
                oCN.RunProc("delete from Sc_PackUnionBillSub  where HBarCode = '" + HBarCode1 + "'");
                oCN.RunProc("delete from Sc_PackUnionBillSub_Sum  where HBarCode = '" + HBarCode1 + "'");                                                                               //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


            //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
            //    {
            //        objjson.code = "0";
            //        objjson.count = 0;
            //        objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
            //        objjson.data = null;
            //        return objjson;
            //    }
            //    else
            //    {
            //        objjson.code = "0";
            //        objjson.count = 1;
            //        objjson.Message = "获取成功!";
            //        objjson.data = DS1.Tables[0];
            //        return objjson;
            //    }
            //}
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "删除失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

@@ -575,7 +729,7 @@
        /// <returns></returns>
        [Route("Web/GetStockPlaceList_Json_NEW")]
        [HttpGet]
        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
        {
            WebS.WebService1 oWeb = new WebS.WebService1();
            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
@@ -678,23 +832,26 @@
            }
        }


        /// <summary>
        /// 获取供应商列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetSupplierList_Json")]
        [HttpGet]
        public object GetSupplierList_Json(string Supplier)
        public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
        {
            sWhere = " Where HStopFlag=0  and HEndFlag=1";
            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Supplier != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
                sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
            }
            try
            {
                ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                WebS.WebService1 oWeb = new WebS.WebService1();
                ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                //ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -798,7 +955,7 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select HItemID,HNumber 班组代码,HName 班组 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
                ds = oCN.RunProcReturn("Select HItemID,班组代码 班组代码,班组名称 班组 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -1077,7 +1234,7 @@
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (sWhere != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
                sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
            }
            try
            {
@@ -1480,7 +1637,7 @@
        /// <returns></returns>
        [Route("DeltetGy_BadReason")]
        [HttpGet]
        public object DeltetGy_BadReason(string HItemID,string user)
        public object DeltetGy_BadReason(string HItemID, string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
@@ -1937,6 +2094,207 @@
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        [Route("Web/GetClassTimePrjGroupBillList_Json")]
        [HttpGet]
        public object GetClassTimePrjGroupBillList_Json(string sWhere, string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有查看权限";
                objJsonResult.data = null;
                return objJsonResult;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "Select a.HItemID ,HNumber 核算方式组代码,HName 核算方式组名称,HDeptID,b.部门名称 部门 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                }
                else
                {
                    sql = sql + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                }

                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 核算方式组编辑
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Web/GetClassTimePrjGroupBillEdit_Json")]
        [HttpGet]
        public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
        {
            //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "没有查看权限";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 仓库名称 from  Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
                ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }


        #region 删除核算方式组
        /// <summary>
        /// 核算方式列表删除按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Web/DeleteClassTimePrjGroupBillList")]
        [HttpGet]
        public object DeleteClassTimePrjGroupBillList(long HItemID, string User)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj_Delete", 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有删除权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();
                string sql = "delete from Gy_ClassTimePrjGroup where HItemID =" + HItemID;
                oCN.RunProc(sql);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        /// <summary>
        /// 保存获取核算方式组
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Web/SaveGetClassTimePrjGroupList")]
        [HttpGet]
        public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem)
        {

            try
            {
                int HItemID = int.Parse(HItem);
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_ClassTimePrj", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "";
                if (refSav == "Add")
                {
                    sql = "Insert Into Gy_ClassTimePrjGroup   " +
                  "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
                  ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
                  ") " +
                  " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'未使用'" + ") ";
                }
                else
                {
                    sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID;
                }
                oCN.RunProc(sql);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }

@@ -2407,7 +2765,7 @@
        [HttpGet]
        public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
        {
            

            if (MouldProjectID <= 0)
            {
                objjson.code = "0";
@@ -2519,7 +2877,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
                ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -2547,7 +2905,7 @@
            }
        }

         /// <summary>
        /// <summary>
        /// 根据设备显示设备保养规程项目
        /// </summary>
        /// <returns></returns>
@@ -2625,7 +2983,7 @@
                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=" + EquipProjectID );
                                                where a.HInterID=" + EquipProjectID);
                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                                    left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
@@ -2757,8 +3115,8 @@
                return objjson;
            }
        }
        
        


        /// <summary>
        /// 获取维修项目列表
        /// </summary>
@@ -2983,7 +3341,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
                ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";