1

zrg

2025-10-22 88ee2155f032b18b6b8fb0d67601e3ac824f78e2

 WebAPI/Controllers/WebAPIController.cs

@@ -18364,7 +18364,7 @@

            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
           

            ListModels oListModels = new ListModels();
            try
            {
@@ -18876,7 +18876,8 @@
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            } catch (Exception e)
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
@@ -20178,6 +20179,7 @@
            }
        }

       
        /// <summary>
        /// 根据物料+工序获取检验方案
        /// </summary>
@@ -20502,6 +20504,7 @@
                }
                else
                {
                    sWhere = sWhere.Replace("\"", "''");
                    ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_BarCodeBillList");
                }

@@ -21388,7 +21391,7 @@
            {
                DataSet ds = oCN.RunProcReturn("exec [h_p_Gy_MenuDefineSet_APP_Get] " +
                    "@HMaker = N'" + HMaker + "'," +
                    "@HType = N'" + HType + "'," + 
                    "@HType = N'" + HType + "'," +
                    "@HMenuListName = N'" + HMenuListName + "'"
                    , "h_p_Gy_MenuDefineSet_APP_Get");

@@ -21443,7 +21446,7 @@
                    list.ForEach(one =>
                    {
                        string sql2 = "insert into Gy_MenuDefineSet_APP( HEntryID, HIndex, HName, HMenuName, HPicNum, HShowMode, HMaker)" +
                       "Values('" + one.HEntryID + "','" + one.HIndex + "','" + one.HName + "','" + MenuName + "','" 
                       "Values('" + one.HEntryID + "','" + one.HIndex + "','" + one.HName + "','" + MenuName + "','"
                       + one.HPicNum + "','" + one.HShowMode + "','" + user + "')";
                        oCN.RunProcReturn(sql2, "Gy_MenuDefineSet_APP");
                    });
@@ -21510,7 +21513,7 @@
                {
                    string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Gy_MenuDefineSet where HMakeName=" +
                        "(select   top 1 c.GroupName  from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId  " +
                        "left join System_UserGroup c on b.GroupId = c.GroupID  where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))";
                        "left join System_UserGroup c on b.GroupId = c.GroupID  where a.Czymc ='" + HMakeName + "' order by len(c.GroupName ))";
                    ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet");        //查询用户绑定的角色 是否设置菜单信息 取角色名称最短的一个
                    if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
                    {
@@ -21521,8 +21524,8 @@
                            sql = "Select HitemID,HNumber,HName,HPartentID,HLevel,Hurl,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain,HPicNum from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID  ";
                            ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
                        }
                            
                    }                 

                    }
                }

                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)       //将菜单的根节点保存到列表menu中
@@ -21724,7 +21727,7 @@
        {
            try
            {
               

                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();


@@ -21816,7 +21819,7 @@
                        if (HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
                        {
                            string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
                            sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "','"+ HTranslationText_English + "','" + HTranslationText_Spain + "')";
                            sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "','" + HTranslationText_English + "','" + HTranslationText_Spain + "')";
                            oCN.RunProc(sql);
                        }
                        else
@@ -21860,7 +21863,7 @@
        //快捷方式自定义菜单：获取树组件数据
        [Route("Web/Xt_UserFastMenu_Display")]
        [HttpGet]
        public object Xt_UserFastMenu_Display(string HMakeName, string HType,string HModelAtributos)
        public object Xt_UserFastMenu_Display(string HMakeName, string HType, string HModelAtributos)
        {
            try
            {
@@ -21982,7 +21985,7 @@
                            string HCaption = ds.Tables[0].Rows[0]["HName"].ToString();
                            string HType = ds.Tables[0].Rows[0]["HType"].ToString();

                            sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','"+ HModelAtributos + "')";
                            sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','" + HModelAtributos + "')";
                            oCN.RunProc(sql);
                        }
                    }
@@ -22012,7 +22015,7 @@
        //快捷方式自定义菜单：获取树组件数据
        [Route("Web/Xt_UserFastMenu_Init")]
        [HttpGet]
        public object Xt_UserFastMenu_Init(string HMakeName, string HType,string HModelAtributos)
        public object Xt_UserFastMenu_Init(string HMakeName, string HType, string HModelAtributos)
        {
            try
            {
@@ -22441,6 +22444,7 @@
            }
        }

        #region 通过单据类型、单据号查询单据信息
        /// <summary>
        /// 通过单据类型获取对应视图并通过单据号查询单据信息
        /// </summary>
@@ -22456,7 +22460,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfoByHBillTypeAndHBillNo N'" + HBillType + "',N'" + HBillNo + 
                ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfoByHBillTypeAndHBillNo N'" + HBillType + "',N'" + HBillNo +
                    "'," + HStockOrgID, "h_p_Gy_GetBillInfoByHBillTypeAndHBillNo");

                if (ds == null)
@@ -22467,7 +22471,7 @@
                    objjson.data = null;
                    return objjson;
                }
                else if((bool)ds.Tables[1].Rows[0]["returnType"] == false)
                else if ((bool)ds.Tables[1].Rows[0]["returnType"] == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;
@@ -22493,6 +22497,62 @@
                return objjson;
            }
        }
        #endregion

        #region 通过单据类型、单据内码、子内码查询单据信息
        /// <summary>
        /// 通过单据类型获取对应视图并通过单据号查询单据信息
        /// </summary>
        /// <param name="HBillNo"></param>
        /// <param name="HBillType"></param>
        /// <param name="HStoreOrgID"></param>
        /// <returns></returns>
        [Route("Web/GetBillInfo_GenerateBillCode")]
        [HttpGet]
        public object GetBillInfo_GenerateBillCode(string HBillType, string HInterID, int HEntryID)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfo_GenerateCode N'" + HBillType + "'," + HInterID +
                    "," + HEntryID, "h_p_Gy_GetBillInfo_GenerateCode");

                if (ds == null)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else if ((bool)ds.Tables[1].Rows[0]["returnType"] == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + ds.Tables[1].Rows[1]["payload"];
                    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;
            }
        }
        #endregion


        /// <summary>
@@ -22555,7 +22615,115 @@
            }
        }

        #region 小卫电器获取物料条码对应单据
        /// <summary>
        /// 小卫电器获取物料条码对应单据
        /// </summary>
        /// <param name="sWhere">自定义过滤条件</param>
        /// <param name="HBillType">单据号</param>
        /// <param name="HSourceBillType">源单号</param>
        /// <returns></returns>
        [Route("web/XiaoWeiBarCodeQuery")]
        [HttpGet]
        public object XiaoWeiBarCodeQuery(string sWhere, int HBillType, int HSourceBillType)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_XiaoWeiBarCodeQuery '" + sWhere + "'," + HBillType + "," + HSourceBillType, "h_p_XiaoWeiBarCodeQuery");

                if(ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "该物料条码无对应的单据";
                    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;
            }
        }

        #endregion


        #region 惠康 生产领料单校验 扫描源单 获取生产领料单和下游领料单未审核 单据
        [Route("web/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
        [HttpGet]
        public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
        {
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                WebSoBar = null;
                // 1. 查询金蝶云中 所有符合的生产领料单和下游领料单
                ds = oCN.RunProcReturn($@"
                    select HBillNo from h_v_Kf_MateOutBillList_K3 where HBillNo like '%{HBillNo}%'
                ", "h_v_Kf_MateOutBillList_K3");

                List<string> HBillNoList = new List<string>();
                foreach(var row in ds.Tables[0].Rows)
                {
                    HBillNoList.Add(row.ToString());
                }

                // 2. 遍历获取的生产领料单
                foreach(string HBillNoOne in HBillNoList)
                {
                    WebSoBar = oWebs.get_BillBarCode_BillCheck(HBillNo, HBillType, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);

                    if(WebSoBar != null)
                    {
                        // 3. 获取到符合条件的返回值，立即返回
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功";
                        objJsonResult.data = WebSoBar;
                        return objJsonResult;
                    }
                }

                // 3. 所有单据都被审核，或者没有符合要求的单据，返回错误信息
                if (WebSoBar == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = WebSoBar;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描单据条码失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }

}