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

yxj

2021-11-01 6c1b31728b0dbafeab9b1cce19dac145b972b1b5

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

 DAL/¼Æ»®¹ÜÀí/ClsGy_RoutingBill.cs

@@ -143,6 +143,7 @@
        {
            try
            {
                string orgid = DBUtility.ClsPub.HOrgID.ToString();
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
@@ -201,14 +202,14 @@
                ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
                ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum,HOrgID" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum" +
                ") " +
                " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
                ",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
                "," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
                "," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HPRDORGID.ToString() + "','" + omodel.HVerNum.ToString() + "'," + DBUtility.ClsPub.HOrgID +
                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + DBUtility.ClsPub.HOrgID + "','" + omodel.HVerNum.ToString() + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -332,7 +333,7 @@
                omodel.HMaterTexture = Ds.Tables[0].Rows[0]["HMaterTexture"].ToString().Trim();
                omodel.HProductNum = Ds.Tables[0].Rows[0]["HProductNum"].ToString().Trim();
                omodel.HVerNum = Ds.Tables[0].Rows[0]["HVerNum"].ToString().Trim();

                omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"].ToString());
                //循环
                DataSet DsSub ;
                DsSub = oCn.RunProcReturn("Select * from Gy_RoutingBillSub Where HInterID=" + lngBillKey.ToString() + " Order by HEntryID ", "Gy_RoutingBillSub");

 LMES/bin/x86/Debug.zip

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -39,22 +39,22 @@
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "false！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                //}
            }
            catch (Exception e)
            {

 WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs

New file
@@ -0,0 +1,366 @@
using Model;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class Gy_WorkPayTypeController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        /// <summary>
        /// è¿”回工作中心列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkPayType/list")]
        [HttpGet]
        public object list(string sWhere)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList " + sWhere, "h_v_Gy_WorkPayTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    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;
            }
        }

        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkPayType/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList where HitemID=" + HInterID, "h_v_Gy_WorkPayTypeList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    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;
            }
        }


        ///// <summary>
        ///// æ–°å¢žå•æ®-保存按钮
        /////参数：string sql。
        /////返回值：object。
        ///// </summary>
        //[Route("Gy_WorkType/AddBill")]
        //[HttpPost]
        //public object AddBill([FromBody] JObject oMain)
        //{
        //    try
        //    {
        //        var _value = oMain["oMain"].ToString();
        //        string msg1 = _value.ToString();
        //        //反序列化
        //        msg1 = "[" + msg1.ToString() + "]";
        //        DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
        //        DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
        //        List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg1);
        //        long HItemID = list[0].HItemID ;
        //        string HNumber = list[0].HNumber;
        //        string HName = list[0].HName;   
        //        string HShortNumber = list[0].HShortNumber;
        //        long HParentID = list[0].HParentID;
        //        string HHelpCode = list[0].HHelpCode;
        //        string HRemark = list[0].HRemark;
        //        bool HStopflag = list[0].HStopflag;
        //        string HForEmp = list[0].HForEmp;
        //        //string HUseFlag = list[0].HUseFlag;
        //        var HPayMoney = list[0].HPayMoney;
        //        var HDayMoney = list[0].HDayMoney; 
        //        var HEndFlag = 0;
        //        var HLevel = "";
        //        if (!DBUtility.ClsPub.AllowNumber(HNumber))
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        //若MAINDI重复则重新获取
        //        oCN.BeginTran();
        //        //主表
        //        string sql = "Insert into Gy_WorkType " +
        //            " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
        //            ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
        //            " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
        //            "," + HLevel.ToString() + "," + HEndFlag + "," + HStopflag + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")";
        //            oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
        //        //修改上级为非末级代码
        //        if (list[0].HItemID.ToString() != "")
        //        {
        //            oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
        //        }
        //        oCN.Commit();
        //        objJsonResult.code = "1";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = "新增成功！";
        //        //objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //    catch (Exception e)
        //    {
        //        oCN.RollBack();
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "Exception！" + e.Message;
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}
        /// <summary>
        /// ä¿å­˜æŒ‰é’®
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkPayType/ModifyByID")]
        [HttpPost]
        public object ModifyByID([FromBody] JObject oMain)
        {
            try
            {
                DAL.ClsGy_WorkPayType_Ctl oDept = new DAL.ClsGy_WorkPayType_Ctl();
                DAL.ClsGy_WorkPayType_View oDeptHlp = new DAL.ClsGy_WorkPayType_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                //string msg3 = sArray[1].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_WorkPayType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkPayType>>(msg2);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                string HShortNumber = "0";
                long HParentID = list[0].HParentID;
                var HLevel = list[0].HLevel;
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                bool HEndFlag = list[0].HEndFlag;
                string HUseFlag = list[0].HUseFlag;



                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_WorkPayType " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update  Gy_WorkPayType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    oCN.RunProc("Update Gy_WorkPayType set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HShortNumber='" + HShortNumber + "'" +
                    ",HHelpCode='" + HHelpCode + "'" +
                    ",HLevel=" + HLevel.ToString() +
                    ",HParentID=" + HParentID.ToString() +
                    ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
                    ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_WorkPayType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

                    oCN.Commit();
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// åˆ é™¤åŠŸèƒ½
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_WorkPayType")]
        [HttpGet]
        public object DeltetGy_WorkPayType(string HItemID)
        {
            DataSet ds;
            DataSet ds1;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                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 Gy_WorkPayType where HItemID=" + HItemID, "Gy_WorkPayType");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                //if (HStopflag)
                //{
                //    oCN.RollBack();//回滚事务
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "数据已删除无法再次删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                ds1 = oCN.RunProcReturn("Select HItemID from  Gy_WorkPayType  Where HParentID='" + HItemID + "'", " Gy_WorkPayType");
                if (ds1.Tables[0].Rows.Count != 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目存在子项目，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
                if (HUseFlag == "已使用")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目已使用，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.RunProc("delete from Gy_WorkPayType  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;
            }
        }

    }
}

 WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs

New file
@@ -0,0 +1,371 @@
using Model;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class Gy_WorkTypeController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        /// <summary>
        /// è¿”回工作中心列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkType/list")]
        [HttpGet]
        public object list(string sWhere)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList " + sWhere, "h_v_Gy_WorkTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_WorkTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkTypeList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    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;
            }
        }

        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkType/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList where HitemID=" + HInterID, "h_v_Gy_WorkTypeList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    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;
            }
        }


        ///// <summary>
        ///// æ–°å¢žå•æ®-保存按钮
        /////参数：string sql。
        /////返回值：object。
        ///// </summary>
        //[Route("Gy_WorkType/AddBill")]
        //[HttpPost]
        //public object AddBill([FromBody] JObject oMain)
        //{
        //    try
        //    {
        //        var _value = oMain["oMain"].ToString();
        //        string msg1 = _value.ToString();
        //        //反序列化
        //        msg1 = "[" + msg1.ToString() + "]";
        //        DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
        //        DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();
        //        List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg1);
        //        long HItemID = list[0].HItemID ;
        //        string HNumber = list[0].HNumber;
        //        string HName = list[0].HName;   
        //        string HShortNumber = list[0].HShortNumber;
        //        long HParentID = list[0].HParentID;
        //        string HHelpCode = list[0].HHelpCode;
        //        string HRemark = list[0].HRemark;
        //        bool HStopflag = list[0].HStopflag;
        //        string HForEmp = list[0].HForEmp;
        //        //string HUseFlag = list[0].HUseFlag;
        //        var HPayMoney = list[0].HPayMoney;
        //        var HDayMoney = list[0].HDayMoney; 
        //        var HEndFlag = 0;
        //        var HLevel = "";
        //        if (!DBUtility.ClsPub.AllowNumber(HNumber))
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        //若MAINDI重复则重新获取
        //        oCN.BeginTran();
        //        //主表
        //        string sql = "Insert into Gy_WorkType " +
        //            " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
        //            ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
        //            " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
        //            "," + HLevel.ToString() + "," + HEndFlag + "," + HStopflag + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")";
        //            oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
        //        //修改上级为非末级代码
        //        if (list[0].HItemID.ToString() != "")
        //        {
        //            oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
        //        }
        //        oCN.Commit();
        //        objJsonResult.code = "1";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = "新增成功！";
        //        //objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //    catch (Exception e)
        //    {
        //        oCN.RollBack();
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "Exception！" + e.Message;
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}
        /// <summary>
        /// ä¿å­˜æŒ‰é’®
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkType/ModifyByID")]
        [HttpPost]
        public object ModifyByID([FromBody] JObject oMain)
        {
            try
            {
                DAL.ClsGy_WorkType_Ctl oDept = new DAL.ClsGy_WorkType_Ctl();
                DAL.ClsGy_WorkType_View oDeptHlp = new DAL.ClsGy_WorkType_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                //string msg3 = sArray[1].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_WorkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkType>>(msg2);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                string HShortNumber = "0";
                long HParentID = list[0].HParentID;
                var HLevel = list[0].HLevel;
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                bool HEndFlag = list[0].HEndFlag;
                string HUseFlag = list[0].HUseFlag;
                var HDayMoney = list[0].HDayMoney;
                var HPayMoney = list[0].HPayMoney;
                string HForEmp = list[0].HForEmp;


                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_WorkType " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HForEmp" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HPayMoney,HDayMoney) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + ",'" + HForEmp + "'" +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HPayMoney.ToString() + "," + HDayMoney.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update  Gy_WorkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    oCN.RunProc("Update Gy_WorkType set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HShortNumber='" + HShortNumber + "'" +
                    ",HForEmp='" + HForEmp + "'" +
                    ",HHelpCode='" + HHelpCode + "'" +
                    ",HLevel=" + HLevel.ToString() +
                    ",HParentID=" + HParentID.ToString() +
                    ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
                    ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                    ",HPayMoney=" + HPayMoney.ToString() +
                    ",HDayMoney=" + HDayMoney.ToString() +
                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_WorkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

                    oCN.Commit();
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// åˆ é™¤åŠŸèƒ½
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_WorkType")]
        [HttpGet]
        public object DeltetGy_WorkType(string HItemID)
        {
            DataSet ds;
            DataSet ds1;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                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 Gy_WorkType where HItemID=" + HItemID, "Gy_WorkType");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                //if (HStopflag)
                //{
                //    oCN.RollBack();//回滚事务
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "数据已删除无法再次删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                ds1 = oCN.RunProcReturn("Select HItemID from  Gy_WorkType  Where HParentID='" + HItemID + "'", " Gy_WorkType");
                if (ds1.Tables[0].Rows.Count != 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目存在子项目，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
                if (HUseFlag == "已使用")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目已使用，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.RunProc("delete from Gy_WorkType  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;
            }
        }

    }
}

 WebAPI/Models/Gy_OrderBackInfo.cs

@@ -1,8 +1,16 @@
<<<<<<< HEAD
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
 
>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
namespace WebAPI.Models
{
    public class Gy_OrderBackInfo
@@ -14,6 +22,17 @@
        public long HParentID { get; set; }      //父级ID
        public long HLevel { get; set; }      //层级
        public long HEndFlag { get; set; }      //
<<<<<<< HEAD

        public string HHelpCode { get; set; }   // åŠ©è®°ç 

        public string HRemark { get; set; }    //备注

        public bool HStopflag { get; set; }  //禁用标志

        public bool HUseFlag { get; set; }   //使用状态

=======
 
        public string HHelpCode { get; set; }   // åŠ©è®°ç 
 
@@ -23,5 +42,6 @@
 
        public bool HUseFlag { get; set; }   //使用状态
 
>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
    }
}

 WebAPI/Models/Gy_OrderLevList.cs

@@ -1,28 +1,52 @@
<<<<<<< HEAD
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
 
>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
namespace WebAPI.Models
{
    public class Gy_OrderLevList
    {
        public long HItemID { get; set; }     ID
        public string HNumber { get; set; }   ä»£ç 
        public string HName { get; set; }     åç§°
        public string HShortNumber { get; set; }  çŸ­ä»£ç 
        public long HParentID { get; set; }      çˆ¶çº§ID
        public long HLevel { get; set; }      å±‚级
        public long HItemID { get; set; }     //ID
        public string HNumber { get; set; }   //代码
        public string HName { get; set; }     //名称
<<<<<<< HEAD
        public string HShortNumber { get; set; }  //短代码
        public long HParentID { get; set; }      //父级ID
        public long HLevel { get; set; }      //层级
        public long HEndFlag { get; set; }      //

        public string HHelpCode { get; set; }   // åŠ©è®°ç 

        public string HRemark { get; set; }    //备注

        public bool HStopflag { get; set; }  //禁用标志

        public bool HUseFlag { get; set; }   //使用状态

=======
        public string HShortNumber { get; set; } // çŸ­ä»£ç 
        public long HParentID { get; set; }      //父级ID
        public long HLevel { get; set; }      //层级
        public long HEndFlag { get; set; }      
 
        public string HHelpCode { get; set; }    åŠ©è®°ç 
        public string HHelpCode { get; set; }   // åŠ©è®°ç 
 
        public string HRemark { get; set; }    å¤‡æ³¨
        public string HRemark { get; set; }   // å¤‡æ³¨
 
        public bool HStopflag { get; set; }  ç¦ç”¨æ ‡å¿—
        public bool HStopflag { get; set; }  //禁用标志
 
        public bool HUseFlag { get; set; }   ä½¿ç”¨çŠ¶æ€
        public bool HUseFlag { get; set; }   //使用状态
 
        public string HYX { get; set; }优先级
>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
        public string HYX { get; set; }//优先级
    }
}

 WebAPI/Models/Gy_WorkPayType.cs

New file
@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class Gy_WorkPayType
    {
        public long HItemID { get; set; }
        public string HNumber { get; set; }       // ä»£ç 
        public string HName { get; set; }         //  
        public string HHelpCode { get; set; }      //助记码
        public string HShortNumber { get; set; }   //短代码
        public long HParentID { get; set; }      //父级ID
        public long HLevel { get; set; }
        public bool HEndFlag { get; set; }      //末级标志
        public bool HStopflag { get; set; }     //禁用标志
<<<<<<< HEAD
      
        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志
       

       
=======

        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志



>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
    }
}

 WebAPI/Models/Gy_WorkType.cs

New file
@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class Gy_WorkType
    {
        public long HItemID { get; set; }
        public string HNumber { get; set; }       // ä»£ç 
        public string HName { get; set; }         //  
        public string HHelpCode { get; set; }      //助记码
        public string HShortNumber { get; set; }   //短代码
        public long HParentID { get; set; }      //父级ID
        public long HLevel { get; set; }
        public bool HEndFlag { get; set; }      //末级标志
        public bool HStopflag { get; set; }     //禁用标志
        public long HPayMoney { get; set; }
        public long HDayMoney { get; set; }
        public string HForEmp { get; set; }   //短代码
        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志
<<<<<<< HEAD
       

       
=======



>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
    }
}

 WebAPI/WebAPI.csproj

@@ -281,8 +281,9 @@
    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
@@ -306,6 +307,7 @@
    <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
    <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
    <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -452,13 +454,13 @@
    <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
    <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
    <Compile Include="Models\ClsGy_ProcPrice.cs" />
    <Compile Include="Models\Gy_WorkType.cs" />
    <Compile Include="Models\Gy_WorkPayType.cs" />
    <Compile Include="Models\Xt_DataDictionary_Proc.cs" />
    <Compile Include="Models\Xt_DataDictionary_View.cs" />
    <Compile Include="Models\Xt_DataDictionary_Table.cs" />
    <Compile Include="Models\Gy_User.cs" />
    <Compile Include="Models\Gy_UserSupper.cs" />
    <Compile Include="Models\Gy_WorkPayType.cs" />
    <Compile Include="Models\Gy_WorkType.cs" />
    <Compile Include="Models\Menu.cs" />
    <Compile Include="Models\ModelConvertHelper.cs" />
    <Compile Include="Models\Pay_OtherBalBill.cs" />

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />