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

zzr99

2021-12-15 7c9837e90ff7ae572de650cabab8a71262247c24

 WebAPI/ListModels.cs

@@ -583,6 +583,18 @@
        }

        /// <summary>
        /// 处理新盘点方案表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsGy_StockCheckItemBill> getObjectByJson_Gy_StockCheckItem(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsGy_StockCheckItemBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_StockCheckItemBill>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具保养记录表主表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -1653,7 +1665,19 @@
            List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString);
            return list;
        }
    

        /// <summary>
        /// 报工平台返工单主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_ProcessPlanMain> getObjectByJson_Gy_MESReturnWorkFrom(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcessPlanMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessPlanMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 报工平台产量汇报主表json
        /// </summary>
@@ -1864,5 +1888,20 @@
            return list;
        }
        #endregion

        #region 考勤汇报单
        public List<Models.ClsPay_WorkTimesBillMain> getObjectByJson_Pay_WorkTimesBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsPay_WorkTimesBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_WorkTimesBillMain>>(jsonString);
            return list;
        }
        public List<Models.ClsPay_WorkTimesBillSub> getObjectByJson_Pay_WorkTimesBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsPay_WorkTimesBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_WorkTimesBillSub>>(jsonString);
            return list;
        }
        #endregion
    }
}