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

chenhaozhe

2026-03-07 291fdb29daf239a13fcfb3f5e08a2f5bf9167534

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_WorkStationBillController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -23,6 +24,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkStation_Query", 1, false, user))
                {
@@ -37,11 +39,19 @@

                ds = oCN.RunProcReturn(sql1 + sWhere + " order by å·¥ä½ä»£ç  ", "h_v_Gy_WorkStationList");

                //添加列名
                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)
@@ -69,11 +79,14 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg3 = sArray[2].ToString();
                string msg4 = sArray[1].ToString();//子表

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<WorkStation> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkStation>>(msg2);
                List<WorkStationSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkStationSub>>(msg4);


                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
@@ -88,56 +101,114 @@
                long HUSEORGID = list[0].HUSEORGID;
                long HCREATEORGID = list[0].HCREATEORGID;

                

                #region [注释代码]
                ////判断权限
                //if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                    #region [注释代码]
                    ////判断权限
                    //if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "没有找到该功能模块！";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}

                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                #endregion
                    //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}

                //保存
                //保存完毕后处理
                if (HItemID == 0)
                    //if (oDept.HavSameNumber(HItemID, HNumber))
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "代码重复！";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}
                    #endregion

                    //保存
                    //保存完毕后处理
                    if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_WorkStation  " +
                    //判断代码是否重复
                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from Gy_WorkStation where HNumber='" + HNumber + "'", "Gy_WorkStation");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows.Count != 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据代码重复不允许新增";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    DataSet ds = oCN.RunProcReturn("Insert into Gy_WorkStation  " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark," +
                        "HUSEORGID,HCREATEORGID) " +
                        "HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime) output inserted.HItemID" +//获取刚才插入的自增ID
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',"  + HUSEORGID + ",'" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',"  + HUSEORGID + ",'" + HCREATEORGID + "','" + msg3 + "',getdate())", "Gy_WorkStation");
                    int HInterID = Convert.ToInt32(ds.Tables[0].Rows[0]["HItemID"]);//自增ID
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //删除子表
                    oCN.RunProc("Delete From " + "Gy_WorkStationSub" + "  where HInterID=" + HInterID);

                    //插入子表
                    if (subList != null && subList.Count > 0)
                    {
                        int i = 0;
                        foreach (Models.WorkStationSub oSub in subList)
                        {

                            if (oSub == null)
                                continue;
                            i++;
                            string subSql = "insert into Gy_WorkStationSub" +
                                   "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                                   ",HMaterID" + ")" +
                                   " values(" +
                                   HInterID + "," +
                                   (i) + "," +
                                   (oSub.HSourceInterID != 0 ? oSub.HSourceInterID.ToString() : "0") + "," +
                                   ( oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
                                   (oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
                                   (oSub.HMaterID != 0 ? oSub.HMaterID.ToString() : "0") +
                                   ")";

                            oCN.RunProc(subSql);
                        }
                    }



                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    //已审核不允许修改
                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from Gy_WorkStation where HItemID=" + HItemID, "Gy_WorkStation");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据状态已经审核，不允许修改！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //主表
                    oCN.RunProc("Update Gy_WorkStation set " +
                        " HNumber='" + HNumber + "'" +
@@ -154,6 +225,37 @@
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    //删除子表
                    oCN.RunProc("Delete From " + "Gy_WorkStationSub" + "  where HInterID=" + HItemID);

                    //插入子表
                    if (subList != null && subList.Count > 0)
                    {
                        int i = 0;
                        foreach (Models.WorkStationSub oSub in subList)
                        {

                            if (oSub == null)
                                continue;
                            i++;
                            string subSql = "insert into Gy_WorkStationSub" +
                                   "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                                   ",HMaterID" + ")" +
                                   " values(" +
                                   HItemID + "," +
                                   (i) + "," +
                                   (oSub.HSourceInterID != 0 ? oSub.HSourceInterID.ToString() : "0") + "," +
                                   (oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
                                   (oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
                                   (oSub.HMaterID != 0 ? oSub.HMaterID.ToString() : "0") +
                                   ")";

                            oCN.RunProc(subSql);
                        }
                    }



                    oCN.Commit();
                }
                objJsonResult.code = "0";
@@ -175,6 +277,200 @@
        }
        #endregion

        #region å·¥ä½åˆ—表审核、反审核
        /// <summary>
        /// 
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Gy_WorkStation/AuditGy_WorkStation")]
        [HttpGet]
        public object AuditGy_WorkStation(int HInterID, int IsAudit, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkStation_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Gy_WorkStation where HItemID=" + HInterID, "Gy_WorkStation");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
                    {
                        DataTable t1 = ds.Tables[0];
                        DataRow t2 = t1.Rows[0];
                        bool t3 = ds.Tables[0].Rows[0]["HCheckEmp"] == null;
                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反审核判断
                    {
                        if (ds.Tables[0].Rows[0]["HCheckEmp"].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.BeginTran();

                if (IsAudit == 0)  //审核判断
                {
                    oCN.RunProc("update Gy_WorkStation set HCheckEmp='" + CurUserName + "',HCheckDate=getdate() where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功";
                    objJsonResult.data = null;
                }
                if (IsAudit == 1) //反审核判断
                {
                    oCN.RunProc("update Gy_WorkStation set HCheckEmp='',HCheckDate=null where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反审核成功";
                    objJsonResult.data = null;
                }
                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ä½åˆ—表禁用、反禁用
        /// <summary>
        /// 
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsStop">禁用(0),反禁用(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Gy_WorkStation/StopGy_WorkStation")]
        [HttpGet]
        public object StopGy_WorkStation(int HInterID, int IsStop, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkStation_Stop", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "禁用失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_WorkStation where HItemID=" + HInterID, "Gy_WorkStation");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsStop == 0)  //禁用判断
                    {
                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已禁用!不能再次禁用！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsStop == 1) //反禁用判断
                    {
                        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.BeginTran();

                if (IsStop == 0)  //禁用判断
                {
                    oCN.RunProc("update Gy_WorkStation set HStopEmp='" + CurUserName + "',HStopDate=getdate(),HStopflag=1 where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "禁用成功";
                    objJsonResult.data = null;
                }
                if (IsStop == 1) //反禁用判断
                {
                    oCN.RunProc("update Gy_WorkStation set HStopEmp='',HStopDate=null,HStopflag=0 where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反禁用成功";
                    objJsonResult.data = null;
                }
                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "禁用失败或者反禁用失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        [Route("Gy_WorkStationBill/cx")]
        [HttpGet]
@@ -183,7 +479,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkStationList where HitemID=" + HInterID, "h_v_Gy_WorkStationList");
                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkStationEdit where HitemID=" + HInterID, "h_v_Gy_WorkStationList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";