检验仪器增加字段

zrg

2024-12-30 3f785c0b30a6172b828c93dd234b7c3d983fe7f0

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs

@@ -72,6 +72,59 @@
        }
        #endregion

        #region å·¡æ£€å•åˆ†é¡µåˆ—表
        [Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillListPage")]
        [HttpGet]
        public object QC_PatrolProcCheckOtherBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("QC_PatrolProcCheckOtherBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_QC_PatrolProcCheckOtherBillListPage" + page + "," + size + ",''", "h_p_QC_PatrolProcCheckOtherBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_QC_PatrolProcCheckOtherBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_QC_PatrolProcCheckOtherBillListPage");
                }

                //添加列名
                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 = "1";
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¡æ£€å•ç¼–辑回显
        [Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_Edit")]
        [HttpGet]
@@ -177,6 +230,7 @@
                BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
                BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
                BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
                BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
                BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
                BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
                BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
@@ -230,10 +284,10 @@
                        oSub.HInspectValB = DBUtility.ClsPub.isLong(mainList[0].HInspectValB == null ? 0 : mainList[0].HInspectValB);
                        oSub.HTargetValB = DBUtility.ClsPub.isLong(mainList[0].HTargetValB == null ? 0 : mainList[0].HTargetValB);

                        oSub.HInspectVal= DBUtility.ClsPub.isStrNull(mainList[0].HInspectVal);
                        oSub.HTargetVal= DBUtility.ClsPub.isStrNull(mainList[0].HTargetVal);
                        oSub.HUpLimit= DBUtility.ClsPub.isStrNull(mainList[0].HUpLimit);
                        oSub.HDownLimit= DBUtility.ClsPub.isStrNull(mainList[0].HDownLimit);
                        oSub.HInspectVal= DBUtility.ClsPub.isStrNull(subList[i].HInspectVal);
                        oSub.HTargetVal= DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
                        oSub.HUpLimit= DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
                        oSub.HDownLimit= DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
                        //*
                        oSub.HUpOffSet= DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
                        oSub.HDownOffSet= DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
@@ -964,7 +1018,7 @@
        #region åº“å­˜/工序 æ£€éªŒå•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为工序流转卡
        [Route("QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill")]
        [HttpGet]
        public object get_ProcessExchangeBill(string HInterID, string user)
        public object get_ProcessExchangeBill(string HInterID, string HEntryID, string user)
        {
            try
            {
@@ -977,13 +1031,13 @@
                    switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "','" + HEntryID + "'";
                            break;
                    }