yangle
2025-04-09 37da233a7ed8212982acdad3d6dbd09338678b4b
设备节拍基础资料
2个文件已添加
6个文件已修改
339 ■■■■■ 已修改文件
Model/Model.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/基础资料/基础资料/ClsEqiupMaterWorkTimes_Model.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsEqiupMaterWorkTimes_Ctl.cs 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Service/LuBaoSevice.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj
@@ -99,6 +99,7 @@
    <Compile Include="基础资料\基础资料\ClsGy_MaintainClass_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_PiPeMaterial_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_PiPe_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsEqiupMaterWorkTimes_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_ProjectMoneyClass_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_RepairClass_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_RepairCheckClass_Model.cs" />
Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsEqiupMaterWorkTimes_Model.cs
New file
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsEqiupMaterWorkTimes_Model : DBUtility.ClsGy_Base_Model
    {
        public string HEquipNumber { get; set; }
        public string HMaterNumber { get; set; }
        public string HWorkTimes { get; set; }
    }
}
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -12399,7 +12399,55 @@
            }
        }
        #endregion
        #region  è®¾å¤‡èŠ‚æ‹ç»´æŠ¤  æŸ¥è¯¢,审核,反审核,禁用,反禁用
        /// <summary>
        /// è®¾å¤‡èŠ‚æ‹ç»´æŠ¤  æŸ¥è¯¢
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Gy_BadReason/Sb_EqiupMaterWorkTimeList")]
        [HttpGet]
        public object Sb_EqiupMaterWorkTimeList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from  h_v_Sb_EqiupMaterWorkTimes where 1 = 1";
                string sql = sql1 + sWhere + " order by è®¾å¤‡ä»£ç  ";
                ds = oCN.RunProcReturn(sql, "h_v_Sb_EqiupMaterWorkTimes");
                //添加列名
                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 = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/WebAPIController.cs
@@ -17888,6 +17888,173 @@
        }
        #endregion
        #region  è®¾å¤‡èŠ‚æ‹ç»´æŠ¤  è®¾ç½®åˆ—表/保存/编辑/删除方法
        /// <summary>
        ///  é¡¹ç›®è´¹ç”¨åˆ†ç±» ä¿å­˜
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("SaveSb_EqiupMaterWorkTime")]
        [HttpPost]
        public object SaveSb_EqiupMaterWorkTime([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //获取最大ID值赋值
            DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from EqiupMaterWorkTimes ", "EqiupMaterWorkTimes");
            if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
            {
                //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
                var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
                maxid += 1;
                HItemID = maxid;
            }
            ListModels oListModels = new ListModels();
            try
            {
                WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl oBill = new WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl();
                List<Model.ClsEqiupMaterWorkTimes_Model> lsmain = new List<Model.ClsEqiupMaterWorkTimes_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");
                lsmain = oListModels.getObjectByJson_EqiupMaterWorkTimes(msg1);
                foreach (ClsEqiupMaterWorkTimes_Model item in lsmain)
                {
                    oBill.oModel = item;
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.oModel.HItemID == 0)
                {
                    bResult = oBill.AddNew();
                }
                else
                {
                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        /// <summary>
        /// è®¾å¤‡èŠ‚æ‹ç»´æŠ¤ èŽ·å–ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [Route("GetEqiupMaterWorkTimeDetail")]
        [HttpGet]
        public ApiResult<DataSet> GetEqiupMaterWorkTimeDetail(string HID)
        {
            var model = LuBaoSevice.GetEqiupMaterWorkTimeDetail(HID);
            return model;
        }
        /// <summary>
        /// è®¾å¤‡èŠ‚æ‹ç»´æŠ¤ åˆ é™¤åŠŸèƒ½
        /// </summary>
        /// <returns></returns>
        [Route("DeltetEqiupMaterWorkTime")]
        [HttpGet]
        public object DeltetEqiupMaterWorkTime(string HItemID, string user)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HItemID为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from EqiupMaterWorkTimes where HItemID=" + HItemID, "EqiupMaterWorkTimes");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核!不能进行删除!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已禁用!不能进行删除!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("delete from EqiupMaterWorkTimes where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "数据删除成功!";
                objJsonResult.data = null;
                return objJsonResult; ;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        /// <summary>
        /// ç”¨å…³è”工序获取信息
WebAPI/DLL/ClsEqiupMaterWorkTimes_Ctl.cs
New file
@@ -0,0 +1,75 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
namespace WebAPI.DLL
{
    public class ClsEqiupMaterWorkTimes_Ctl : DBUtility.ClsGy_Base_Ctl
    {
           SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string HOldNumber;
        public Model.ClsEqiupMaterWorkTimes_Model oModel = new Model.ClsEqiupMaterWorkTimes_Model();
        //新增
        public  override bool AddNew()
        {
            try
            {
                oCn.BeginTran();
                oCn.RunProc("Insert into " + MvarItemKey + " " +
                    " (HEquipFileNo,HMaterNumber,HWorkTimes" +
                    ",HMakeTime,HMakeEmp" +
                    ") " +
                    " Values('" + oModel.HEquipNumber + "','" + oModel.HMaterNumber + "'," + oModel.HWorkTimes + ",'" + oModel.HMakeTime + "','" + oModel.HMakeEmp + "'" +
                    ")", ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }
        //修改
        public override bool ModifyByID(Int64 sItemID)
        {
            try
            {
                oCn.BeginTran();
                oCn.RunProc("Update " + MvarItemKey + " set " +
                    " HEquipFileNo='" + oModel.HEquipNumber + "'" +
                    ",HMaterNumber='" + oModel.HMaterNumber + "'" +
                    ",HWorkTimes='" + oModel.HWorkTimes + "'" +
                    ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
                    ",HModifyTime=getdate() Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }
        //构造函数
        public ClsEqiupMaterWorkTimes_Ctl()
        {
            MvarItemKey = "EqiupMaterWorkTimes";
            MvarReportTitle = "设备节拍设置";
            oModel = new Model.ClsEqiupMaterWorkTimes_Model();
        }
    }
}
WebAPI/ListModels.cs
@@ -1174,6 +1174,18 @@
        }
        /// <summary>  
        /// å¤„理新增设备节拍表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsEqiupMaterWorkTimes_Model> getObjectByJson_EqiupMaterWorkTimes(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsEqiupMaterWorkTimes_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsEqiupMaterWorkTimes_Model>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增管径表的json
        /// </summary>
        /// <param name="jsonString"></param>
WebAPI/Service/LuBaoSevice.cs
@@ -663,6 +663,25 @@
        /// <summary>
        /// è®¾å¤‡èŠ‚æ‹æ ¹æ®id获取信息
        /// </summary>
        public static ApiResult<DataSet> GetEqiupMaterWorkTimeDetail(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            var dataSet = GetEqiupMaterWorkTimeDb(HID);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在设备节拍数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        public static DataSet GetEqiupMaterWorkTimeDb(string HID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EqiupMaterWorkTimes  where HItemID= " + HID + " ", "h_v_Sb_EqiupMaterWorkTimes");
            return dataSet;
        }
        /// <summary>
        /// ç®¡å¾„根据id获取信息
        /// </summary>
        public static ApiResult<DataSet> GetGy_PiPeDetail(string HID)
WebAPI/WebAPI.csproj
@@ -752,6 +752,7 @@
    <Compile Include="DLL\ClsGy_EnvironmentTestItem_Ctl.cs" />
    <Compile Include="DLL\ClsGy_PiPe_Ctl.cs" />
    <Compile Include="DLL\ClsGy_PiPeMaterial_Ctl.cs" />
    <Compile Include="DLL\ClsEqiupMaterWorkTimes_Ctl.cs" />
    <Compile Include="DLL\ClsGy_ProjectMoneyClass_Ctl.cs" />
    <Compile Include="DLL\ClsGy_RoutingGroup_Ctl.cs" />
    <Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />