1

wtt

22 小时以前 1ae6d87bb3fde2c10b4da671705ddc8977bc30b9

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -25,7 +25,83 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

    /// <summary>
        #region 采购订单分页列表
        [Route("Cg_POOrderBill/page")]
        [HttpGet]
        public object Cg_POOrderBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            json res = new json();
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillList", 3, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sErr = "";
                if (oSystemParameter.ShowBill(ref sErr))
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                    {

                    }
                    else
                    {
                        //判断是否有采购经理权限（安瑞）
                        bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
                        if (!isCgjl)
                        {
                            sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0  )";
                        }
                    }
                }
                


                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_IF_POOrderBillList " + page + "," + size + ",''", "h_p_IF_POOrderBillList");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_IF_POOrderBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_POOrderBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                res.code = CodeConstant.SUCCEED;
                res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                res.Message = "Sucess！";
                res.list = columnNameList;
                res.data = ds.Tables[0];
                return res;
            }
            catch (Exception e)
            {
                res.code = CodeConstant.FAIL;
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return res;
            }
        }
        #endregion

        /// <summary>
        /// 返回采购订单列表
        ///参数：string sql。
        ///返回值：object。
@@ -682,6 +758,7 @@
                var _value = sMainSub["sMainSub"].ToString();
                string msg1 = _value.ToString();
                oCN.BeginTran();
               
                //保存主表
                objJsonResult = AddBillMain(msg1);
                if (objJsonResult.code == "0")
@@ -694,6 +771,16 @@
                    return objJsonResult;
                }
                oCN.Commit();
                #region 生成金蝶单据（先保存到mes本地，通过本地调用生成金蝶单据）
                if (!jindieCloud(msg1))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回金蝶单据失败";  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                #endregion
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "单据保存成功！";
@@ -711,7 +798,238 @@
                return objJsonResult;
            }
        }
        public bool jindieCloud(string msg1)
        {
            WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
            //WebS.ClsCg_POInStockBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString(); //主表数据
            string msg3 = sArray[1].ToString(); //子表数据
            int OperationType = int.Parse(sArray[2].ToString()); // 数据类型 1添加 3修改
            string user = sArray[3].ToString();
            string msg_allVal = sArray[4].ToString(); //主表+子表所有数据
            msg2 = "[" + msg2.ToString() + "]";
            List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
            websLsmain.HInterID = mainList[0].HInterID;
            websLsmain.HDate = mainList[0].HDate;
            websLsmain.HBillNo = mainList[0].HBillNo;
            websLsmain.HSupID = mainList[0].HSupID;
            websLsmain.HEmpID = mainList[0].HEmpID;
            websLsmain.HSTOCKORGID = mainList[0].HUSEORGID;
            websLsmain.HBillType = mainList[0].HBillType;
            if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回金蝶单据失败";  //成功！
                objJsonResult.data = null;
                return false;
            }
            objJsonResult = AddBillMould(msg1);
            if (objJsonResult.code == "0")
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = objJsonResult.Message;
                objJsonResult.data = null;
                return false;
            }
            return true;
        }
        public json AddBillMould(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            try
            {
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
                List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
                string BillType = "3899";
                //得到mainid
                long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
                DateTime HDate = mainList[0].HDate;//日期
                int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
                double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                string HMouldNo = HInterID+"xxx";
                string HBarCode = HBillNo+"xxx";
                string HName = mainList[0].HName??"测试模具";
                string HModel = mainList[0].HModel?? "测试";
                string HModel2 = mainList[0].HModel2 ?? "测试";
                string HDiameter = mainList[0].HDiameter ?? "测试";
                string HSubjoin = mainList[0].HSubjoin ?? "测试";
                string HSubjoin2 = mainList[0].HSubjoin2 ?? "测试";
                string HPICNo = mainList[0].HPICNo ?? "测试";
                string HWorkMaterModel = mainList[0].HWorkMaterModel ?? "测试";
                long HMaterID = mainList1[0].HMaterID;
                long HMouleTypeID = 1;
                long HUnitID = mainList1[0].HUnitID;
                DateTime HOutComDate = DateTime.Now;
                string HOutComNo = mainList[0].HOutComNo ?? "测试";
                long HDeptID = 0;
                long HSupID = mainList[0].HSupID;
                string HMouldStatus = "0";
                long HWHID = 0;
                long HRoutingID = 0;
                long HBOMID = 0;
                string HVersion = "测试";
                long HSPGroupID = 0;
                long HSPID = 0;
                Double HDesignLife = 0;
                Double HUseLife = 0;
                Double HInitLife = 0;//上线初始化寿命
                Double HLeaveLife =0;
                Double HProdQty = 0;
                Double HProdWeight = 0;
                string HRemark = "测试";
                string HMaker = "admin";
                string HMaterNumber = "admin";
                string HSupNumber = "test";
                long HPrintQty =1;
                string HMouldOWNER = "test";
                string HSaveLife = "0";
                int HCaveQty = 0;
                int HMouldDotCheckRuleInterID =0;
                int HMouldMaintainRuleInterID = 0;
                int HNowSupID = 0;
                int HNowSupTypeID = 0;
                int HMadeSupID =0;
                string HMouldClass = "test";
                int HNowWHID = 0;
                int HNowSPID = 0;
                string HMouldUseStatus = "test";
                int HCREATEORGID = mainList[0].HCREATEORGID;
                int HUSEORGID = mainList[0].HUSEORGID;
                bool HTransPackFlag = false;     //周转容器标记
                bool HSendPackFlag = false;       //发货容器标记
                int HMouldLength =0;          //长
                int HMouldWidth = 0;            //宽
                int HMouldHeight = 0;          //高
                int HMouldFoldHeight =0;  //折叠高度

                int HUserID = 0;  // 使用人（Gy_Employee）
                string HBrand = "测试";  // 品牌
                string HCalibrationType = "测试";  // 校准类型 (内/外校)
                string HLocation = "测试";  // 位置
                DateTime HCalibrationDate =DateTime.Now;  // 校准日期
                string HCalibrationCycle = "测试";  // 校准周期
                string HProductDesignSize = "测试";  // 产品设计尺寸
                string HGaugeDesignSize = "测试";  // 检具设计尺寸
                int HProductQTY = 1;  // 产品数量

                //保存前控制=========================================
                string HBillNote = "";
                ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //=========================================================


                //主表
                oCN.RunProc("Insert Into Gy_MouldFileMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HMouldNo,HName,HModel,HModel2,HDiameter" +
                ",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
                ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
                ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
                 ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag," +
                 "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY ) " +

               " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
                ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
                "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
                ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
                "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + "," +
                "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "') ");

                //子表
                oCN.RunProc("Insert into Gy_MouldFileSub " +
                    " (HInterID,HEntryID,HRemark" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                    ") " +
                " values('" + HInterID + "',0,''" +
                ",0,0,'','',0,0 " +
                ") ");

                //objJsonResult = AddBillSub(msg5, msg6, msg7, HInterID, HBillNo);

                //保存后控制=========================================
                ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_AfterSaveCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                //=========================================================


                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.HInterID = HInterID.ToString();
                objJsonResult.Message = null;
                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;
            }
        }
        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -720,12 +1038,11 @@
            int OperationType = int.Parse(sArray[2].ToString()); // 数据类型 1添加 3修改
            string user = sArray[3].ToString();
            string msg_allVal = sArray[4].ToString(); //主表+子表所有数据

            
            try
            {
                msg2 = "[" + msg2.ToString() + "]";
                List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);

                long HInterID = mainList[0].HInterID;//递入type得到的单据ID
                string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
                long HPRDORGID = mainList[0].HPRDORGID;//组织
@@ -746,7 +1063,8 @@
                string HInnerBillNo = mainList[0].HInnerBillNo;//内部单据号 
                long HWHID = mainList[0].HWHID;//仓库 
                long HProjectID = mainList[0].HProjectID;//仓库 

                string HLinkMan = mainList[0].HLinkMan;//联系人
                string HLinkPhone = mainList[0].HLinkPhone;//联系人电话
                List<ClsCg_POOrderBillMain> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
                DateTime dt = DateTime.Now;
                long HPURCHASEORGID = mainList2[0].HOrgID;
@@ -827,20 +1145,20 @@
                       ,HMaker,HMakeDate
                       ,HERPInterID,HERPBillType,HPURCHASEORGID
                        ,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID
                        ,HWHID,HProjectID)
                        ,HWHID,HProjectID,HLinkMan,HLinkPhone)
                        values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" +
                    1102 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
                    "'," + HSSID + ",'" + HSSDate + "'," + HPSStyleID + "," + HSupID + "," + HCurID +
                    "," + HExRate + "," + HEmpID + "," + HManagerID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark + "','" + HInnerBillNo + "','" + HMaker + "',getdate()" + "," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + "," + HPURCHASERGROUPID + ","
                    + HPROVIDERID + "," + HSETTLEID + "," + HCHARGEID + ",'" + HBUSINESSTYPE + "','" + HPROVIDERADDRESS + "',"
                    + HCORRESPONDORGID + "," + HPROVIDERCONTACTID + ","
                    + HWHID+","+ HProjectID + ")");
                    + HWHID+","+ HProjectID +",'"+HLinkMan+"','"+HLinkPhone+"'"+")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改

                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_IF_POOrderBillList");
                    dss = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID, "h_v_IF_POOrderBillList");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["审核人"].ToString() != "" && dss.Tables[0].Rows[0]["审核人"] != null)
                    {
@@ -859,17 +1177,39 @@
                        return objJsonResult;
                    }
                    oCN.RunProc("update Cg_POOrderBillMain  set " +
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HBillNo='" +HBillNo +"'"+ 
                                 ",HSSID=" + HSSID + ",HPSStyleID=" + HPSStyleID + ",HSupID=" + HSupID + ",HCurID=" + HCurID
                                 + ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID
                                 + ",HAddress='" + HAddress + "',HSSDate='" + HSSDate + "',HWHID="+ HWHID + ",HProjectID="+ HProjectID + " where HInterID=" + HInterID);
                                 + ",HAddress='" + HAddress + "',HSSDate='" + HSSDate + "',HWHID="+ HWHID + ",HProjectID="+ HProjectID +",HLinkMan = '"+HLinkMan+"',HLinkPhone = '"+HLinkPhone+ "' where HInterID=" + HInterID);

                    //删除子表
                    oCN.RunProc("delete from Cg_POOrderBillSub where HInterID='" + HInterID + "'");
                }
                //保存子表
                objJsonResult = AddBillSub(msg3, HInterID, OperationType);

                //自动审核设置
                if ((OperationType == 1 || OperationType == 2))
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Cg_POOrderBill_AutoCheck == "Y") //系统参数  自动审核 
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (OperationType == 3)
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
@@ -956,14 +1296,14 @@
                long HBUYERWITHHOLDING = DetailColl2[i].HBUYERWITHHOLDING;//买方代扣代缴
                string HMATERIALDESC = DetailColl2[i].HMATERIALDESC == null ? "''" : DetailColl2[i].HMATERIALDESC; //物料说明
                i++;
                if (oSub.HQty <= 0 || oSub.HQty == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "第" + i + "行，数量不能为0或者小于0";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (oSub.HQty <= 0 || oSub.HQty == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "第" + i + "行，数量不能为0或者小于0";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (oSub.HMaterID == 0)
                {
@@ -1126,6 +1466,8 @@
        }
        #endregion

        public WebS.WebService1 oWebs = new WebS.WebService1();
        
        /// <summary>
        ///删除功能
        /// </summary>
@@ -1252,7 +1594,7 @@
            try
            {
                
                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillEdit where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -1288,9 +1630,11 @@
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
            string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName,a.HWHID,w.HName 默认仓库,a.HPOUnitID,u.HName HPOUnitName " +
                " from Gy_Material AS a " +
                " LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
                " left outer join Gy_Warehouse as w on a.HWHID = w.HItemID " +
                " left outer join Gy_Unit As u on a.HPOUnitID = u.HItemID" +
                " where a.HItemID =" + HMaterID;

            var dataSet = oCN.RunProcReturn(sql, "Gy_Material");
@@ -3031,7 +3375,7 @@
                }
                string sql = "select * from h_v_Cg_POOrderBillQuerySub where hmainid =  "+ hmainid;

                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POOrderBillQuerySub");
                ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Cg_POOrderBillQuerySub");
                

                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -3058,6 +3402,181 @@
            }
        }
        #endregion

        #region 采购订单下推查询列表
        [Route("Cg_POOrderBill/PushList")]
        [HttpGet]
        public object PushList(string HBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_IF_POOrderBillList where 单据号 = '" + HBillNo + "' and 状态 = '已审核' and 未关联数量 > 0";


                ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");

                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "找不到符合条件单据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 出库汇总 查询
        [Route("Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList")]
        [HttpGet]
        public object Xs_SeOrderOutStockSumReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn($"exec h_p_Xs_SeOrderOutStockSumReport " + sWhere + "", "h_p_Xs_SeOrderOutStockSumReport");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 入库汇总 查询
        [Route("Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList")]
        [HttpGet]
        public object Cg_PoOrderInStockSumReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn($"exec h_p_Cg_PoOrderInStockSumReport " + sWhere + "", "h_p_Cg_PoOrderInStockSumReport");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region 采购订单 根据用户获取用户关联供应商过滤条件
        [Route("Cg_POOrderBill/getSupIDListByUser")]
        [HttpGet]
        public object getSupIDListByUser(string CurUserID, string CurUserName)
        {
            string sWhere = "";
            string ModRightNameCheck = "Gy_UserLookAllSup";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //权限判断：是否可以查看所有供应商
                if (DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    sWhere = "";
                }
                else
                {
                    sWhere = " and HSupID in (select HSupID from Gy_UserSupplierRelation Where HUserID = '" + CurUserID + "')";
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = sWhere;
                return objJsonResult;
            }
            catch (Exception e)
            {
                sWhere = " and 1=0 ";

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = sWhere;
                return objJsonResult;
            }
        }
        #endregion



    }

}