zzr99
2021-11-17 bbc55c38eb249c4eaba8b6346c00cce72406a28d
基础资料:增加 故障原因列表
增加故障原因列表编辑
6个文件已修改
1个文件已添加
329 ■■■■■ 已修改文件
DBUtility/基础资料/ClsGy_Base_Model.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/基础资料/基础资料/ClsGy_ConkReason_Model.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_ConkReasonBillController.cs 256 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/»ù´¡×ÊÁÏ/ClsGy_Base_Model.cs
@@ -15,7 +15,7 @@
        public bool HStopflag;
        public string HRemark;
        public long HLevel;
        public long HParentID;
        public long HParentID=0;
        public string HModel;
        public long HUnitID;
        public string HUnitNumber;
Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_ConkReason_Model.cs
@@ -8,5 +8,15 @@
    {
       //
        public string HExplanation;  //描述varchar(500)
        public DateTime HMakeTime;
        public string HMakeEmp;
        public int HConkTypeID;
        public string HCheckEmp;
        public DateTime HCheckTime;
        public string HModifyEmp;
        public DateTime HModifyTime;
        public string HStopEmp;
        public DateTime HStopTime;
    }
}
WebAPI/Controllers/WebAPIController.cs
@@ -2144,21 +2144,13 @@
        /// <returns></returns>
        [Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")]
        [HttpGet]
        public object GetMouldDotCheckRuleInterList(int MouldProjectID)
        public object GetMouldDotCheckRuleInterList(string sWhere)
        {
            if (MouldProjectID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "产品器具未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList");
                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList");
                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
                ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonBillController.cs
New file
@@ -0,0 +1,256 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers.基础资料.基础资料
{
    public class Gy_ConkReasonBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态(新增,修改,浏览,更新单价,变更)
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        public Model.ClsGy_ConkReason_Model BillNew0 = new Model.ClsGy_ConkReason_Model();
        #region æ•…障原因列表
        [Route("Gy_ConkReasonBill/Get_ConkReasonBillList")]
        [HttpGet]
        public object Get_ConkReasonBillList(string sWhere)
        {
            try
            {
                ds = Sc_GetConkReasonBill(sWhere);
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常,请与管理员联系!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常,请与管理员联系!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        public static DataSet Sc_GetConkReasonBill(string sWhere)
        {
            string sql1 = string.Format(@"select * from h_v_Gy_ConkReasonList");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_ConkReasonList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hitemid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_ConkReasonList");
            }
        }
        #endregion
        #region [故障原因删除功能]
        [Route("Gy_ConkReasonBill/set_DeleteBill")]
        [HttpGet]
        public object set_DeleteBill(string HItemID)
        {
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HItemID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            ds = oCn.RunProcReturn("select * from Gy_ConkReason where HItemID=" + lngBillKey, "Gy_ConkReason");
            if (ds != null)
            {
                oCn.RunProc("Delete from Gy_ConkReason where HItemID=" + lngBillKey);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "此单据不存在,请查看是否重复删除";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region [编辑显示表头]
        [Route("Gy_ConkReasonBill/GetConkReasonByID")]
        [HttpGet]
        public object GetConkReasonByID(string HID)
        {
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            ds = oCn.RunProcReturn("select * from Gy_ConkReason where HItemID=" + lngBillKey, "Gy_ConkReason");
            if (ds != null)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "此单据不存在";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ä¿å­˜æ•…障原因
        [Route("Gy_ConkReasonBill/SaveGy_ConkReason")]
        [HttpPost]
        public object SaveGy_ConkReason([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg2 = _value.ToString();
            string[] sArray = msg2.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();//当前人
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            ListModels oListModels = new ListModels();
            try
            {
                Model.ClsGy_ConkReason_Model oBill = new Model.ClsGy_ConkReason_Model();
                List<Model.ClsGy_ConkReason_Model> lsmain = new List<Model.ClsGy_ConkReason_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_ConkReason(msg1);
                foreach (Model.ClsGy_ConkReason_Model oItem in lsmain)
                {
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!代码不能为空!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItem.HName.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!名称不能为空!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //得到短代码
                    string sShortNumber;
                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
                    if (sShortNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!短代码为空!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oBill = oItem;
                }
                //保存
                //保存完毕后处理
                if (oBill.HItemID == 0)
                {
                    oCn.RunProc("Insert into Gy_ConkReason " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HExplanation,HConkTypeID) " +
                    " Values('" + oBill.HNumber + "','" + oBill.HName + "','" + oBill.HHelpCode + "','" + oBill.HShortNumber + "'," + oBill.HParentID.ToString() +
                    "," + oBill.HLevel.ToString() + "," + Convert.ToString(oBill.HEndFlag ? 1 : 0) + "," + Convert.ToString(oBill.HStopflag ? 1 : 0) + ",'" + oBill.HRemark +
                    "','" + oBill.HUseFlag + "',getdate(),'" + msg3 + "','" + oBill.HExplanation + "',0" +
                    ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCn.RunProc("Update Gy_ConkReason set HEndflag=0 where HItemID=" + oBill.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    oCN.RunProc("UpDate Gy_ConkReason set  " +
                    " HNumber='" + oBill.HNumber + "'" +  //固定赋值===============
                    ",HName='" + oBill.HName + "'" +
                    ",HShortNumber='" + oBill.HShortNumber + "'" +
                    ",HHelpCode='" + oBill.HHelpCode + "'" +
                    ",HUseFlag='" + oBill.HUseFlag + "'" +
                    ",HRemark='" + oBill.HRemark + "'" +
                    ",HExplanation='" + oBill.HExplanation + "'" +
                    ",HModifyTime=getdate()" +
                    ",HModifyEmp='" + msg3 + "'" +
                    ",HStopflag=" + Convert.ToString(oBill.HStopflag ? 1 : 0) +
                    " where HInterID=" + oBill.HItemID.ToString());
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "修改成功!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/ListModels.cs
@@ -547,6 +547,18 @@
        }
        /// <summary>
        /// å¤„理新增故障原因表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_ConkReason_Model> getObjectByJson_Gy_ConkReason(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_ConkReason_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ConkReason_Model>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具保养记录表主表的json
        /// </summary>
        /// <param name="jsonString"></param>
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/16/2021 18:46:35</publishTime>
      <publishTime>11/17/2021 17:22:47</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/16/2021 18:46:35</publishTime>
      <publishTime>11/17/2021 17:22:47</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/16/2021 18:46:33</publishTime>
      <publishTime>11/17/2021 17:22:44</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/16/2021 18:46:33</publishTime>
      <publishTime>11/17/2021 17:22:44</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/16/2021 18:46:29</publishTime>
      <publishTime>11/17/2021 17:22:38</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/16/2021 18:46:29</publishTime>
      <publishTime>11/17/2021 17:22:38</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/16/2021 18:46:30</publishTime>
      <publishTime>11/17/2021 17:22:39</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/16/2021 18:46:30</publishTime>
      <publishTime>11/17/2021 17:22:39</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/16/2021 18:46:28</publishTime>
      <publishTime>11/17/2021 17:22:36</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/16/2021 18:46:28</publishTime>
      <publishTime>11/17/2021 17:22:36</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/16/2021 18:46:28</publishTime>
      <publishTime>11/17/2021 17:22:37</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/16/2021 18:46:28</publishTime>
      <publishTime>11/17/2021 17:22:37</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/16/2021 18:46:29</publishTime>
      <publishTime>11/17/2021 17:22:37</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/16/2021 18:46:29</publishTime>
      <publishTime>11/17/2021 17:22:37</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/16/2021 18:46:38</publishTime>
      <publishTime>11/17/2021 17:22:52</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/16/2021 18:46:38</publishTime>
      <publishTime>11/17/2021 17:22:52</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/16/2021 18:46:49</publishTime>
      <publishTime>11/17/2021 17:23:18</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -387,6 +387,7 @@
    <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
    <Compile Include="Controllers\品质管理\工序检验单\QC_ProcessCheckBillController.cs" />
    <Compile Include="Controllers\品质管理\首件检验单\QC_FirstPieceCheckBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_ConkReasonBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_DotCheckBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_MaintainBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_RepairBillController.cs" />