1

zrg

2025-11-26 f75bc8a830e7a0b330e32106a8582d22b8aba8c9

1

 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_DotCheckItemMethod_Ctl.cs

@@ -23,7 +23,7 @@
                    ",HLevel,HEndFlag,HStopflag,HRemark" +
                    ",HMakeTime,HMakeEmp,HCREATEORGID,HUSEORGID) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" + oModel.HMakeTime + "','" + oModel.HMakeEmp + "'," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "',getdate(),'" + oModel.HMakeEmp + "'," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 WebAPI/Controllers/POStockInBillController.cs

@@ -3369,9 +3369,77 @@
        }


        #region  [通过 æºå•å•å· è¿›è¡Œ æ¥æ–™æ£€éªŒ]
        /// <summary>
        /// é€šè¿‡ æºå•å•å· è¿›è¡Œ æ¥æ–™æ£€éªŒ
        /// </summary>
        /// <param name="HBarCode">源单单号</param>
        /// <param name="HOrgID">组织ID</param>
        /// <returns></returns>
        [Route("Kf_QCStockInCheckBill_Fast/BarCode_Json_SourceBillNo")]
        [HttpGet]
        public object BarCode_Json_SourceBillNo(string HBarCode, Int64 HOrgID)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                DataSet Dss;

                // èŽ·å–金蝶云中对应的组织
                Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
                string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
                   
                // æ ¹æ®é‡‡è´­è®¢å•å·èŽ·å– æ”¶æ–™é€šçŸ¥å• å’Œ ç‰©æ–™ä¿¡æ¯
                DataSet Dss2;
                Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HBarCode + "'", "h_v_RECEIVEQuery");
                
                if(Dss2 == null || Dss2.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string HPOStockInBillNo = Dss2.Tables[0].Rows[0]["FBILLNO"].ToString();



                DataSet ds;
                ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json_SourceBill where  HSourceBillNo ='" + HPOStockInBillNo.ToString() + "'", "h_v_QCStockInCheckBill_Json");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {

                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        [Route("Kf_QCStockInCheckBill_Fast/BarCode_Json")]
        [HttpGet]

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1451,7 +1451,7 @@
                " values('7503','7503'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
                ",DATENAME(YEAR,GETDATE()),0,''," + HSupID.ToString() + "," + HMaterID.ToString() +
                ",'" + HCheckQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HKeeperID.ToString() + "'" +
                ",'" + HCheckResult.ToString() + "','', '','',''" +
                ",'" + HCheckResult.ToString() + "','', '','','','" +
                ") ");
                //生产汇报单子表
                oCN.RunProc("Insert into QC_POStockInCheckBillSub " +

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

@@ -268,7 +268,19 @@

                //若MAINDI重复则重新获取
                oCN.BeginTran();
                DataSet ds_ = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_DotCheck where HNumber = '{HNumber}' and HItemID !={HItemID}
                ", "Gy_DotCheck");

                if(ds_.Tables[0].Rows.Count > 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败 ä»£ç ä¸å¯é‡å¤ï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //保存前控制=========================================
                DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_DotCheck_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_DotCheck_BeforeSaveCtrl");
@@ -405,6 +417,19 @@

                //若MAINDI重复则重新获取
                oCN.BeginTran();
                DataSet ds_ = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_DotCheck where HNumber = '{HNumber}'
                ", "Gy_DotCheck");

                if (ds_.Tables[0].Rows.Count > 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败 ä»£ç ä¸å¯é‡å¤ï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //保存前控制=========================================
                DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_DotCheck_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_DotCheck_BeforeSaveCtrl");

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

@@ -162,7 +162,16 @@
                    }
                    
                    //查询数据中是否存在重复代码
                    ds = oCN.RunProcReturn("select * from Gy_DotCheckItemClass where HStopflag = 0 and HNumber = '" + oItem.HNumber.Trim() + "'", "Gy_DotCheckItemClass");
                    ds = oCN.RunProcReturn("select TOP 1 HItemID from Gy_DotCheckItemClass where HStopflag = 0 and HNumber = '" + oItem.HNumber.Trim() + "'and HItemID != " + HItemID, "Gy_DotCheckItemClass");

                    if(ds.Tables[0].Rows[0] != null && ds.Tables[0].Rows[0]["HItemID"] != null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！点检项目分类代码重复！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    //得到短代码
                    string sShortNumber;
@@ -378,6 +387,115 @@
        }
        #endregion

        #region ç‚¹æ£€é¡¹ç›®åˆ†ç±»ç¦ç”¨ã€åç¦ç”¨
        /// <summary>
        /// 
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsStop">禁用(0),反禁用(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Gy_DotCheckItemClass/StopGy_DotCheckItemClass")]
        [HttpGet]
        public object StopGy_DotCheckItemClass(string HInterID, int IsStop, string user)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_DotCheckItemClass_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "禁用失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                oCN.BeginTran();//开始事务

                //Type 1 åç¦ç”¨  0  ç¦ç”¨
                if (IsStop == 0)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_DotCheckItemClass where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0].Rows[0]["HStopEmp"] != null && ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已禁用!不能再次禁用！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //禁用单据
                    if (!BillOld.StopByHItemID(Int64.Parse(HInterID), user, ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "禁用失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else
                {
                    //判断单据是否已经禁用
                    DataSet ds;
                    string sql = "select * from  Gy_DotCheckItemClass where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HStopEmp"] == null || ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未禁用!不需要反禁用!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!BillOld.AbandonStopByHItemID(Int64.Parse(HInterID),user, ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反禁用失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

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

        #region ç‚¹æ£€é¡¹ç›®åˆ†ç±» æ–‡ä»¶å¯¼å…¥ä¿å­˜
        #region ç‚¹æ£€é¡¹ç›®åˆ†ç±» æ–‡ä»¶ä¸Šä¼ 
        [Route("Gy_DotCheckItemClass/Gy_DotCheckItemClass_Excel")]

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

@@ -163,7 +163,16 @@
                    }

                    //查询数据中是否存在重复代码
                    ds = oCN.RunProcReturn("select * from Gy_DotCheckItemMethod where HStopflag  =0 and HNumber = '" + oItem.HNumber.Trim() + "'", "Gy_DotCheckItemMethod");
                    ds = oCN.RunProcReturn("select top 1 HItemID from Gy_DotCheckItemMethod where HStopflag  =0 and HNumber = '" + oItem.HNumber.Trim() + "' and HItemID != " + HItemID, "Gy_DotCheckItemMethod");

                    if (ds.Tables[0].Rows[0] != null && ds.Tables[0].Rows[0]["HItemID"] != null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！点检项目分类代码重复！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    //得到短代码
                    string sShortNumber;
@@ -379,6 +388,116 @@
        }
        #endregion

        #region ç‚¹æ£€æ–¹æ³•åˆ†ç±»ç¦ç”¨ã€åç¦ç”¨
        /// <summary>
        /// 
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsStop">禁用(0),反禁用(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Gy_DotCheckItemMethod/StopGy_DotCheckItemMethod")]
        [HttpGet]
        public object StopGy_DotCheckItemMethod(string HInterID, int IsStop, string user)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_DotCheckItemMethod_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "禁用失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                oCN.BeginTran();//开始事务

                //Type 1 åç¦ç”¨  0  ç¦ç”¨
                if (IsStop == 0)
                {
                    //判断单据是否已经禁用
                    DataSet ds;
                    string sql = "select * from  Gy_DotCheckItemMethod where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0].Rows[0]["HStopEmp"] != null && ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已禁用!不能再次禁用！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //禁用单据
                    if (!BillOld.StopByHItemID(Int64.Parse(HInterID), user, ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "禁用失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else
                {
                    //判断单据是否已经禁用
                    DataSet ds;
                    string sql = "select * from  Gy_DotCheckItemMethod where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HStopEmp"] == null || ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未禁用!不需要反禁用!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!BillOld.AbandonStopByHItemID(Int64.Parse(HInterID), user, ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反禁用失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

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


        #region ç‚¹æ£€æ–¹æ³• æ–‡ä»¶å¯¼å…¥ä¿å­˜
        #region ç‚¹æ£€æ–¹æ³• æ–‡ä»¶ä¸Šä¼ 
        [Route("Gy_DotCheckItemMethod/Gy_DotCheckItemMethod_Excel")]

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

@@ -443,8 +443,8 @@
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";

                List<Models.ClsGy_Maintain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Maintain>>(msg2);

                var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Maintain>>(msg2);
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
@@ -480,6 +480,20 @@
                    return objJsonResult;
                }

                // æ–°å¢žæ—¶åˆ¤æ–­æ˜¯å¦å­˜åœ¨é‡å¤ä»£ç 
                var dsRepeatCheck = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_Maintain where HStopflag = 0 and HNumber = '{HNumber}'
                ", "Gy_Maintain");

                if(dsRepeatCheck.Tables[0].Rows.Count > 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码重复！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //若MAINDI重复则重新获取

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

@@ -328,10 +328,21 @@
                    return objJsonResult;
                }

                // ä»£ç  é™¤åŽ»è‡ªèº«å¤– ä¸èƒ½é‡å¤
                var dsHNumberCheck = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_Repair where HStopflag = 0 and HNumber = '{HNumber}' and HItemID != {HItemID}
                ", "Gy_Repair");

                if (dsHNumberCheck.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //若MAINDI重复则重新获取
                oCN.BeginTran();


                //保存前控制=========================================
                DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_Repair_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_Repair_BeforeSaveCtrl");
@@ -466,7 +477,19 @@
                    return objJsonResult;
                }

                // ä»£ç ä¸èƒ½é‡å¤
                var dsHNumberCheck = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_Repair where HStopflag = 0 and HNumber = '{HNumber}' 
                ", "Gy_Repair");

                if (dsHNumberCheck.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //若MAINDI重复则重新获取
                oCN.BeginTran();

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

@@ -347,6 +347,19 @@
                    return objJsonResult;
                }

                // ä»£ç  é™¤åŽ»è‡ªèº«å¤– ä¸èƒ½é‡å¤
                var dsHNumberCheck = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_RepairCheck where HStopflag = 0 and HNumber = '{HNumber}' and HItemID != {HItemID}
                ", "Gy_Repair");

                if (dsHNumberCheck.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //若MAINDI重复则重新获取
                oCN.BeginTran();
@@ -485,6 +498,18 @@
                    return objJsonResult;
                }

                var dsHNumberCheck = oCN.RunProcReturn($@"
                    select top 1 HItemID from Gy_RepairCheck where HStopflag = 0 and HNumber = '{HNumber}'
                ", "Gy_Repair");

                if (dsHNumberCheck.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //若MAINDI重复则重新获取

 WebAPI/Models/ClsGy_Maintain.cs

@@ -5,7 +5,7 @@

namespace WebAPI.Models
{
    public class ClsGy_Maintain : DBUtility.ClsGy_Base_Ctl
    public class ClsGy_Maintain : DBUtility.ClsGy_Base_Model
    {
        public int HItemID;
        public string HNumber;          //代码