增加斯莫尔质量报表增加过滤条件查询,质量月度目标单增加 字段 HProcTarGetVal money --各工序目标值,

zrg

2024-10-09 e1cbefad8e411d8305c6730c2e1e0221a7525c9d

 WebAPI/Controllers/XSGL/Xs_OutDoorCheckBillController.cs

@@ -126,6 +126,18 @@
                            return objJsonResult;
                        }
                    }

                    //进行 会计期间 结账 的判断和控制
                    string s = "";
                    int sYear = 0;
                    int sPeriod = 0;
                    DateTime HDate = DateTime.Now;
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                    {
                        objJsonResult.Message = s;
                        return objJsonResult;
                    }

                    //删除单据（包含删除后控制、写入日志）
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_OutDoorCheckBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
                    {
@@ -239,6 +251,18 @@
                                return objJsonResult;
                            }
                        }

                        //进行 会计期间 结账 的判断和控制
                        string s = "";
                        int sYear = 0;
                        int sPeriod = 0;
                        DateTime HDate = DateTime.Now;
                        if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                        {
                            objJsonResult.Message = s;
                            return objJsonResult;
                        }

                        //审核单据
                        if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Xs_OutDoorCheckBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
                        {
@@ -287,6 +311,17 @@
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }

                        //进行 会计期间 结账 的判断和控制
                        string s = "";
                        int sYear = 0;
                        int sPeriod = 0;
                        DateTime HDate = DateTime.Now;
                        if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                        {
                            objJsonResult.Message = s;
                            return objJsonResult;
                        }

                        //反审核单据
@@ -590,7 +625,45 @@
        #endregion



        //---------------------------------------------------------------PDA模块调用
        #region 出门确认单列表
        /// <summary>
        /// 获取出门确认单列表信息
        /// </summary>
        /// <returns></returns>
        [Route("Xs_OutDoorCheckBillController/GetXs_OutDoorCheckBillList_PDA_Json")]
        [HttpGet]
        public object GetXs_OutDoorCheckBillList_PDA_Json(string sWhere)
        {
            try
            {
                //返回列表信息
                ds = oCn.RunProcReturn("exec h_p_Xs_OutDoorCheckBillList_PDA '" + sWhere + "'", "h_p_Xs_OutDoorCheckBillList_PDA");
                List<object> columnNameList = new List<object>();
                //添加列名
                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 = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}