批量修改ClsCN；添康科技生成条码时设置为批次码；

yusijie

2024-09-12 c05f1964fc49bebb9ea64e189400337f8d4f0c42

批量修改ClsCN；添康科技生成条码时设置为批次码；

 WebAPI/BLL/WebServer.cs

@@ -11,7 +11,7 @@
{
    public class WebServer
    {
        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        #region  基础资料
        /// <summary>

 WebAPI/Controllers/BarCodeController.cs

@@ -23,7 +23,7 @@
    {
        private JsonResult objJsonResult = new JsonResult();
        private json objjson = new json();
        public new ClsCNSRM oCn = new ClsCNSRM();
        public new ClsCN oCn = new ClsCN();
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public T ScriptDeserialize<T>(string strJson)
@@ -47,7 +47,7 @@
            string msg1 = _value.ToString();
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                oCn.RunProc("exec H_p_SRM_BarCodeBill_PrintQty '" + msg1 + "'");
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -132,7 +132,7 @@
                string WeiShu = ""; //尾数
                //string sKFDate = DateTime.Now.ToString("yyyy-MM-dd");
                DataSet Ds;
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
                {
                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
@@ -339,7 +339,7 @@
                string WeiShu = ""; //尾数
                //string sKFDate = DateTime.Now.ToString("yyyy-MM-dd");
                DataSet Ds;
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
@@ -551,7 +551,7 @@
                string sDay = "";            //日
                string WeiShu = ""; //尾数
                DataSet Ds;
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
@@ -604,6 +604,13 @@
                                }
                                HMinQty = HSumQty;
                            }

                            if (FCusName.Contains("添康科技"))
                            {
                                //外箱批次条码规则：SRMB+组织+料号+批次+；+数量
                                TM = "SRMB" + "100" + oItemSub.HMaterNumber + oItemSub.HBatchNo + "；" + HMinQty;
                            }

                            Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
                            bar.HBarCode = TM;
                            bar.HMaterID = oItemSub.HMaterID;
@@ -632,6 +639,7 @@
                            bar.HSupBatchNo = oItemSub.HSupBatchNo;
                            bar.HSupMaterNumber = oItemSub.HSupMaterNumber;
                            bar.HISKFPERIOD = oItemSub.HISKFPERIOD;
                            bar.HMaterNumber = oItemSub.HMaterNumber;
                            ls2.Add(bar);
                        }
                    }
@@ -697,8 +705,19 @@
                            {
                                TM2 = "0" + TM2;
                            }
                            bar2.HMaterID = oItemSub2.HMaterID;

                            if (FCusName.Contains("添康科技"))
                            {
                                //内箱批次条码规则：SRM+组织+料号+批次+；+数量
                                TM2 = "SRM" + "100" + oItemSub2.HMaterNumber + oItemSub2.HBatchNo + "；" + HWXQty;
                                bar2.HBarCode = TM2;
                            }
                            else
                            {
                            bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
                            }

                            bar2.HMaterID = oItemSub2.HMaterID;                           
                            bar2.HUnitID = oItemSub2.HUnitID;
                            bar2.HQty = HWXQty;
                            bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
@@ -779,6 +798,12 @@
                            HBarCode = $"{oItemSub.HMaterID}";
                            HBarCodeType = "品种码_外箱";
                        }

                        if (FCusName.Contains("添康科技"))
                        {
                            //HBarCodeType = "批次条码";
                        }

                        string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO,HSupBatchNo,HSupMaterNumber,HProduceDate,HExpiryDate,HISKFPERIOD " +
@@ -823,6 +848,12 @@
                            HBarCode = $"{oItemSub.HMaterID}";
                            HBarCodeType = "品种码";
                        }

                        if (FCusName.Contains("添康科技"))
                        {
                            //HBarCodeType = "批次条码";
                        }

                        string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO ,HSupBatchNo,HSupMaterNumber,HProduceDate,HExpiryDate,HISKFPERIOD" +
@@ -927,7 +958,7 @@
                string sPeriod = "";        //月
                string sDay = "";            //日
                DataSet Ds;
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
@@ -1375,7 +1406,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;

@@ -1395,7 +1426,7 @@
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.Message = "无相关条码信息！";
                    objjson.data = null;
                    return objjson;
                }
@@ -1596,7 +1627,7 @@
                string sDay = "";            //日
                string WeiShu = ""; //尾数
                DataSet Ds;
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                oCn.BeginTran();
                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
@@ -1873,6 +1904,7 @@
                                        + "','" + HBatchNo + "','" + SubModel.Count + "','" + count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                        + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','"
                                        + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
                            LogService.Write("生成外箱条码： " + sql);
                            oCn.RunProc(sql);
                            oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
                            count++;
@@ -1919,6 +1951,7 @@
                                      + "','" + HBatchNo + "','" + SubModel.Count + "','" + _count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                      + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','" 
                                      + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
                            LogService.Write("生成内箱条码： "+ sql);
                            oCn.RunProc(sql);
                            _count++;
                        }
@@ -1951,6 +1984,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("生成条码发生错误： " + e);
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "" + e.Message + DBUtility.ClsPub.sExeReturnInfo;
@@ -2106,12 +2140,21 @@
                        //反写打印数量到委外订单
                        if (dr["HBarCodeType"].ToString() == "箱号内条码" && dr["HSourceBillType"].ToString() == "1601")
                            oCN.RunProc($"update WW_EntrustOrderBillSub set HBarcodeCount -= {dr["HQty"]} where  HInterID ={dr["HSourceInterID"]} and  HEntryID ={dr["HSourceEntryID"]}");
                        if (FCusName.Contains("添康科技"))
                        {
                            _HBarCodeType = "箱号内条码";
                            if (dr["HSourceBillType"].ToString() == "1103" && dr["HBarCodeType"].ToString() == _HBarCodeType)
                                oCN.RunProc($"update Cg_POInStockBillSub set HRelationBarCodeQty -= {dr["HQty"]} where  HInterID ={dr["HSourceInterID"]} and  HEntryID ={dr["HSourceEntryID"]}");
                        }
                        else
                        {
                        //反写打印数量到送货单 （不需要反写 送货单直接是关联查询取的数量 没有在源单上做保存）
                        if (dr["HSourceBillType"].ToString() == "1103")
                            oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + dr["HItemID"] + ") ");
                        //oCN.RunProc($"update WW_EntrustOrderBillSub set HBarcodeCount -= {dr["HQty"]} where  HInterID ={dr["HSourceInterID"]} and  HEntryID ={dr["HSourceEntryID"]}");
                    }
                }
                }
                oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ") ");
                oCN.Commit();
                objJsonResult.code = "1";

 WebAPI/Controllers/EntrustOrderController.cs

@@ -18,7 +18,7 @@
    {
        private JsonResult objJsonResult = new JsonResult();
        private json objjson = new json();
        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        /// <summary>
        /// 采购单列表
@@ -36,7 +36,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)

 WebAPI/Controllers/PODemandPlanController.cs

@@ -36,7 +36,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
               string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;

 WebAPI/Controllers/POInStockBackController.cs

@@ -36,7 +36,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;
@@ -95,7 +95,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                //转换特殊字符

 WebAPI/Controllers/POInStockController.cs

@@ -37,7 +37,7 @@
        {
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //写入 System_Log 操作日志表
                WebAPIController.Add_Log("送货单打印", CurUserName, "送货单打印");
                oCn.RunProc("exec H_p_SRM_POInStockBill_PrintQty " + msg.ToString());
@@ -256,7 +256,7 @@
            try
            {
                string sql = $"update　Cg_POInStockBillMain　 set  HDeliveryNo ='{HDeliveryNo}' where HInterID in ({HmainId})";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                oCn.RunProc(sql);

                objJsonResult.code = "1";
@@ -283,7 +283,7 @@
        [HttpPost]
        public object SaverPOInStock([FromBody] JObject msg)
        {
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -482,7 +482,7 @@
                sw.Start();//开始计时
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
@@ -639,7 +639,7 @@
        public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
        {
            json objjson = new json();
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            try
            {                
                //采购订单 生成送货单列表
@@ -1195,6 +1195,7 @@
                                //LogService.Write(result);
                                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                                {
                                    LogService.Write("SRM-收料通知单审核失败JSON：" + jsonRoot.ToString());
                                    //更新送货单 主表 ERP单据号 以及 ERP主内玛
                                    string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                                    string FID = JObject.Parse(result)["Result"]["Id"].ToString();
@@ -1212,6 +1213,8 @@
                                }
                                else
                                {
                                    LogService.Write("SRM-收料通知单审核失败JSON：" + jsonRoot.ToString() );

                                    objjson.code = "0";
                                    objjson.count = 0;
                                    objjson.Message = result;
@@ -1303,7 +1306,7 @@
        }
        public int GetHinterIDByBillNo(string HBillNo, string type)
        {
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            int HInterID = 0;
            string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
            //if (type == "Print")
@@ -1321,7 +1324,7 @@
            try
            {
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //获取客户名称
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                //夏宝需要先在金蝶删除收料通知单后才能在供应商协同平台删除送货单
@@ -1526,7 +1529,7 @@
        {
            List<string> mylist = new List<string>(ids.Split(','));//.Distinct()
            List<string> entryList = new List<string>(entryids.Split(','));//.Distinct()
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
            if (FCusName == "夏宝电器" && mylist.Count > 1)
            {
@@ -1562,6 +1565,7 @@

                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        LogService.Write("送货数量同步进入回滚");
                        oCn.RollBack(); //回滚事物
                        objjson.code = "0";
                        objjson.count = 0;
@@ -1576,12 +1580,13 @@
                    //更新关联数量
                    var HinterID = mylist[i].ToString();
                    var HEntryID = entryList[i].ToString();
                    LogService.Write("送货数量同步： exec h_p_SRM_UpDatePPBomRelationQty" + HinterID + "," + HEntryID);
                    oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID},{HEntryID},{i+1}");
                }

                //判断未关联数量是否为0
                //安瑞：AIS20220914133941   瑞与琪：AIS20220308151944  本地：AIS20210811135644  夏宝：AIS20211130140219  凯贝：AIS20210820164804
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 剩余收料数量,T1.hrelationqty as 已发货数量,T1.hqty as 订单数量,单据号,物料编码 from H_v_SRM_POOrderBillList t1 left join AIS20210820164804..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
                //安瑞：AIS20220914133941   瑞与琪：AIS20220308151944  本地：AIS20210811135644  夏宝：AIS20211130140219  凯贝：AIS20210820164804 添康：AIS20240809105013
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 剩余收料数量,T1.hrelationqty as 已发货数量,T1.hqty as 订单数量,单据号,物料编码 from H_v_SRM_POOrderBillList t1 left join AIS20240809105013..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
                DataTable dt = ds.Tables[0];
                if (dt.Rows.Count > 0)
                {
@@ -1621,7 +1626,7 @@
        /// <returns></returns>
        public JsonResult TestPOOrder(string entryids)
        {
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            try
            {
                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
@@ -1717,7 +1722,7 @@
        {
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
@@ -1750,7 +1755,7 @@
            string s = "";
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillSub_ForWeb '" + lngBillKey2 + "','" + HBillType + "'", "h_p_SRM_POInStockBillSub_ForWeb");

 WebAPI/Controllers/POOrderBillExcelController.cs

@@ -14,7 +14,7 @@
    public class POOrderBillExcelController : ApiController
    {
        private JsonResult objJsonResult = new JsonResult();
        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        #region 采购订单 查询
        [Route("POOrderBillExcel/POOrderBillExcelList")]

 WebAPI/Controllers/POOrderController.cs

@@ -19,7 +19,7 @@
    {
        private JsonResult objJsonResult = new JsonResult();
        private json objjson = new json();
        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        /// <summary>
        /// 采购单列表
@@ -39,7 +39,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                //转换特殊字符

 WebAPI/Controllers/POStockInBillController.cs

@@ -45,7 +45,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                if (HSupNo != "Admin")
                {

 WebAPI/Controllers/POStockOutBillController.cs

@@ -45,7 +45,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                if (HSupNo != "Admin")
                {

 WebAPI/Controllers/ReportController.cs

@@ -39,7 +39,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
@@ -107,7 +107,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
@@ -177,7 +177,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")

 WebAPI/Controllers/WebAPIController.cs

@@ -52,7 +52,7 @@
            string ComputerName;
            IPAddress = DBUtility.ClsPub.IPAddress;
            ComputerName = DBUtility.ClsPub.ComputerName;
            ClsCNSRM oCnLoc = new ClsCNSRM();
            ClsCN oCnLoc = new ClsCN();
            try
            {
                oCnLoc.RunProc("Insert into  System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
@@ -85,7 +85,7 @@
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
@@ -183,7 +183,7 @@
            try
            {
                DataSet ds = null;
                ClsCNSRM oCnLoc = new ClsCNSRM();
                ClsCN oCnLoc = new ClsCN();
                DAL.ClsUser oUser = new DAL.ClsUser();
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                //LogService.Write("测试1："+ DBUtility.ClsPub.sExeReturnInfo);
@@ -229,7 +229,7 @@
            DataSet DS;
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
                if (DS.Tables[0].Rows.Count == 0)
                    return null;
@@ -245,7 +245,7 @@
        }
        public DataSet CheckCzymc(string sUser, string sPsd)
        {
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            SqlParameter[] prams ={oCn.MakeInParam("@Czymc",SqlDbType.VarChar,100,sUser ),
                                    oCn.MakeInParam("@Czmm",SqlDbType.VarChar ,100,sPsd ),
            };
@@ -264,7 +264,7 @@
        {
            try
            {
                ClsCNSRM oCn = new ClsCNSRM();
                ClsCN oCn = new ClsCN();
                DataSet oDs = new DataSet();
                //==========
                if (PassWord.Trim() != Repassword.Trim())
@@ -408,7 +408,7 @@
        [HttpGet]
        public object SaveOpenTmp(string HNumber, string HName)
        {
            ClsCNSRM oCn = new ClsCNSRM();
            ClsCN oCn = new ClsCN();
            try
            {

@@ -445,7 +445,7 @@
        [HttpGet]
        public object DelOpenTmp(string HItemID)
        {
            ClsCNSRM oCn = new ClsCNSRM();
            ClsCN oCn = new ClsCN();
            try
            {
                //oCn.BeginTran();
@@ -792,7 +792,7 @@
        [HttpPost]
        public object MsgCount()
        {
            ClsCNSRM oCn = new ClsCNSRM();
            ClsCN oCn = new ClsCN();
            DataSet oDs = new DataSet();
            oDs = oCn.RunProcReturn("select * from  Gy_Message", "Gy_Message");
            objJsonResult.code = "0";
@@ -808,7 +808,7 @@
        [HttpGet]
        public object MsgData(string sWhere)
        {
            ClsCNSRM oCn = new ClsCNSRM();
            ClsCN oCn = new ClsCN();
            DataSet oDs = new DataSet();
            var sql = "select A.HInterID,b.HEntryID,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '未阅' when B.HReadFlag=1 then '已阅' end HReadFlag,A.HDate" +
                " from OA_InformBillMain A inner join  OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere;
@@ -836,7 +836,7 @@
        [HttpGet]
        public object UpdateMessage(string UserName, string HInterID, string HEntryID)
        {
            ClsCNSRM oCn = new ClsCNSRM();
            ClsCN oCn = new ClsCN();
            oCn.BeginTran();
            oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='" + UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
            oCn.Commit();
@@ -857,7 +857,7 @@
            var postMesseege = _linterid + ";" + _huserName;
            //HttpHelper.PostData("http://localhost:8082/ZYMES/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege);
            HttpHelper.PostData("http://60.191.21.115:9090/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege);
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            string sql = $"Update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0) + 1  where HItemID in ({_linterid})";
            oCn.RunProc(sql);
            objJsonResult.code = "0";

 WebAPI/DLL/DAL.dll

Binary files differ

 WebAPI/DLL/Model.dll

Binary files differ

 WebAPI/MyHub.cs

@@ -11,7 +11,7 @@
    [HubName("chatHub")]
    public class MyHub : Hub
    {
        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        public void Send(string title, string message)
        {
            this.InsertMsg(title, message);