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

yxj

2024-09-20 f34c6a21dc58bc0d40a011d6d7366c5eb3f15f15

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -869,7 +869,29 @@
                }
                //保存子表
                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";
@@ -3058,6 +3080,64 @@
            }
        }
        #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
    }

}