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

YL

2021-12-21 bc6ac881fd5cb8cd71f27b28394977d1e200da3e

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

 WebAPI/Controllers/¹¤×ʹÜÀí/Gy_GroupEmpBillController.cs

New file
@@ -0,0 +1,263 @@
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_GroupEmpBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

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


        /// <summary>
        /// è¿”回 ç­ç»„职员清单 åˆ—表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_GroupEmpBill/GetGroupEmpBill")]
        [HttpGet]
        public object GetGroupEmpBill(string sWhere)
        {
            try
            {

                ds = Sc_GetGroupEmpBill(sWhere);
                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_GetGroupEmpBill(string sWhere)
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by æ—¥æœŸ desc", "h_v_Gy_GroupEmpBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Gy_GroupEmpBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
            }

        }
       
        #region[班组职员清单单编辑时获取表头数据]
        [Route("Gy_GroupEmpBill/Gy_GroupEmpBillListCheckDetail")]
        [HttpGet]
        public ApiResult<DataSet> Gy_GroupEmpBillListCheckDetail(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_GroupEmpBillList  where hmainid= " + HID + " ", "h_v_Gy_GroupEmpBillList");
            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 };
        }
        #endregion

        #region[班组职员清单单编辑时获取表体数据]
        [Route("Gy_GroupEmpBill/Gy_GroupEmpBillListProjectDetai")]
        [HttpGet]
        public object Gy_GroupEmpBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql1 = "SELECT " +
                    "HGroupID,班组代码,班组,表头备注,制单人,制单日期" +
                    ",审核人,审核日期,修改人,修改日期,关闭人, å…³é—­æ—¥æœŸ" +
                    ",HEmpID,HEmpNumber,HEmpName ,表体备注 as HRemark FROM h_v_Gy_GroupEmpBillList where 1 = 1 ";
                string sql = sql1 + sqlWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion

        [Route("Gy_GroupEmpBill/SaveGetGroupEmpBillList")]
        [HttpPost]
       
        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        public object SaveGetGroupEmpBillList([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string refSav = sArray[2].ToString();
            //string msg4 = sArray[3].ToString();

            string UserName = "";
            string s = "";
            long mouldid;
            ListModels oListModels = new ListModels();
            try
            {
                ////编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无保存权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                DLL.ClsGy_GroupEmpBill oBill = new DLL.ClsGy_GroupEmpBill();
                List<Models.ClsGy_GroupEmpListMain> lsmain = new List<Models.ClsGy_GroupEmpListMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_GroupEmpListMain(msg2);
                foreach (Models.ClsGy_GroupEmpListMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "9876";
                    oItem.HBillSubType = "9876";
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Models.ClsGy_GroupEmpListSub> ls = new List<Models.ClsGy_GroupEmpListSub>();
                ls = oListModels.getObjectByJson_Gy_GroupEmpListSub(msg3);
                int i = 0;
                foreach (Models.ClsGy_GroupEmpListSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    oBill.DetailColl.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                   
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    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("Gy_GroupEmpBill/DeltetGroupEmpBill")]
        [HttpGet]
        public object DeltetGroupEmpBill(string HInterID)
        {
            try
            {
                oCN.BeginTran();
                oCN.RunProc("Delete From Gy_GroupEmpListMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Gy_GroupEmpListSub where HInterID = " + HInterID);
                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.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

    }
}

 WebAPI/DLL/¹¤×ʹÜÀí/ClsGy_GroupEmpBill.cs

New file
@@ -0,0 +1,106 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;

namespace WebAPI.DLL
{
    public class ClsGy_GroupEmpBill : DBUtility.ClsXt_BaseBill
    {
        public Models.ClsGy_GroupEmpListMain omodel = new Models.ClsGy_GroupEmpListMain();
        public List<Models.ClsGy_GroupEmpListSub> DetailColl = new List<Models.ClsGy_GroupEmpListSub>();

        public ClsGy_GroupEmpBill()
        {
            base.MvarItemKeySub = "Gy_GroupEmpListSub";
            base.MvarItemKeySub2 = " ";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Gy_GroupEmpListMain";
            base.MvarReportTitle = "班组职员清单";
            base.BillType = "9876";
            base.HBillSubType = "9876";

        }

        #region å›ºå®šä»£ç 

        ~ClsGy_GroupEmpBill()
        {
            DetailColl = null;
        }

        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Gy_GroupEmpListMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HGroupID=" + omodel.HGroupID.ToString() +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Gy_GroupEmpListSub (HInterID,HEntryID,HEmpID,HRemark ) values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HEmpID.ToString() + ",'" + oSub.HRemark.ToString() + "')");
                }
                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                string sql = string.Format(@"Insert Into Gy_GroupEmpListMain(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HGroupID,HMaker,HMakeDate) values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupID.ToString() + "','" + DBUtility.ClsPub.CurUserName + "',getdate())");
                oCn.RunProc(sql);
                //插入子表
                foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Gy_GroupEmpListSub (HInterID,HEntryID,HEmpID,HRemark ) values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HEmpID.ToString() + ",'" + oSub.HRemark.ToString() + "')");
                }

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }

    }

}

 WebAPI/ListModels.cs

@@ -1903,6 +1903,20 @@
            return list;
        }
        #endregion
        #region ç­ç»„职员清单
        public List<Models.ClsGy_GroupEmpListMain> getObjectByJson_Gy_GroupEmpListMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsGy_GroupEmpListMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListMain>>(jsonString);
            return list;
        }
        public List<Models.ClsGy_GroupEmpListSub> getObjectByJson_Gy_GroupEmpListSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsGy_GroupEmpListSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListSub>>(jsonString);
            return list;
        }
        #endregion

        /// <summary>
        /// æŠ¥å·¥å°å·¥åºæ±‡æŠ¥å•ä¸»è¡¨json

 WebAPI/Models/¹¤×ʹÜÀí/ClsGy_GroupEmpListMain.cs

New file
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace WebAPI.Models
{
    public class ClsGy_GroupEmpListMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HGroupID;//    int    //班组ID

    }
}

 WebAPI/Models/¹¤×ʹÜÀí/ClsGy_GroupEmpListSub.cs

New file
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace WebAPI.Models
{
    public class ClsGy_GroupEmpListSub : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HEmpID;

    }
}

 WebAPI/WebAPI.csproj

@@ -354,6 +354,7 @@
    <Compile Include="Controllers\工资管理\Pay_GroupBalBillController.cs" />
    <Compile Include="Controllers\PurchaseOrderController.cs" />
    <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
    <Compile Include="Controllers\工资管理\Gy_GroupEmpBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_WorkTimesBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_SingleBalBillController.cs" />
    <Compile Include="Controllers\ProductionOrderController.cs" />
@@ -452,6 +453,7 @@
    <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
    <Compile Include="DLL\ClsSc_PackUnionBill.cs" />
    <Compile Include="DLL\工资管理\ClsPay_GroupBalBill.cs" />
    <Compile Include="DLL\工资管理\ClsGy_GroupEmpBill.cs" />
    <Compile Include="DLL\工资管理\ClsPay_WorkTimesBill.cs" />
    <Compile Include="HttpClient.cs" />
    <Compile Include="InvokeHelper.cs" />
@@ -506,7 +508,9 @@
    <Compile Include="Models\ClsOA_InformBillSub.cs" />
    <Compile Include="Models\工资管理\ClsPay_OtherBalBillMain.cs" />
    <Compile Include="Models\工资管理\ClsPay_OtherBalBillSub.cs" />
    <Compile Include="Models\工资管理\ClsGy_GroupEmpListMain.cs" />
    <Compile Include="Models\工资管理\ClsPay_SingleBalBillMain.cs" />
    <Compile Include="Models\工资管理\ClsGy_GroupEmpListSub.cs" />
    <Compile Include="Models\工资管理\ClsPay_SingleBalBillSub.cs" />
    <Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
    <Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />