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

yangle

2024-11-01 330444dff55dce750136971f64a967ba243151f8

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

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -14,5 +14,8 @@
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
<<<<<<< HEAD
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> df8354d552a8658d5919d801ad307489c039eb02

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -322,7 +322,8 @@
                           ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                           ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                           ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
                            ",HICNumber='" + lsmain[0].HICNumber + "'" +
                           ",HICNumber='" + lsmain[0].HICNumber + "'" +
                           ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
                           "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                    }


 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -20,14 +20,14 @@
        DataSet ds;
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region ç”Ÿäº§è®¢å•å…¨ç¨‹è·Ÿè¸ªæŠ¥è¡¨ æŸ¥è¯¢å…¨éƒ¨é”€å”®è®¢å•å·
        #region ç”Ÿäº§è®¢å•å…¨ç¨‹è·Ÿè¸ªæŠ¥è¡¨ æŸ¥è¯¢å…¨éƒ¨é”€å”®è®¢å•å·æ ¹æ®ç”Ÿäº§è®¢å•çš„销售订单号
        [Route("Mes_OrderProcFlowAllReport/getHSeOrderBillNo")]
        [HttpGet]
        public object getHSeOrderBillNo()
        {
            try
            {
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillMain ", "Sc_ICMOBillMain");
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillSub ", "Sc_ICMOBillSub");

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs

@@ -1616,6 +1616,14 @@
                string HInterId = dic["HInterId"].ToString();             

                ds = oCN.RunProcReturn("exec h_p_DotCheckDayList '" + Type + "','" + HInterId + "'", "h_p_DotCheckDayList");
                if (ds.Tables.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -1567,7 +1567,7 @@
                    " LEFT JOIN Gy_RoutingBillMain as po ON a.hmainid = po.HInterID" +
                    " LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
                    " LEFT JOIN Xt_CheckUserRight as cr ON cr.HCheckItemID = i.HItemID and cr.HCheckFlowInterID = m.HInterID" +
                    " where po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID  and cr.HUserID = '" + userid + "'";
                    " where å·¥åºä»£ç  != '9999' and a.HBillSubType<>'SUB' and po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID  and cr.HUserID = '" + userid + "'";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
@@ -1617,7 +1617,7 @@
                string sql = "  select DISTINCT a.*,c.HItemID as HCheckFlowStatusID,m.HName as å®¡æ‰¹æµ,c.HCheckFlowID,i.HName as å®¡æ‰¹é¡¹ç›®åç§°,c.HCheckItemID,c.HChecker as é¡¹ç›®å®¡æ ¸äºº,c.HCheckNote as å®¡æ‰¹æµå®¡æ ¸å»ºè®®,c.HCheckDate å®¡æ‰¹æµå®¡æ ¸æ—¥æœŸ   from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.单据类型 = c.HBillTypeID" +
                    " LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +
                    " LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
                    " where c.HCheckDate is  not NUll and c.HChecker = '" + user + "'";
                    " where å·¥åºä»£ç  != '9999' and a.HBillSubType<>'SUB' and c.HCheckDate is  not NUll and c.HChecker = '" + user + "'";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
@@ -2320,5 +2320,56 @@
        }

        #endregion

        #region å·¥è‰ºè·¯çº¿(集体) æ‰¹é‡å¤šçº§å®¡æ ¸
        [Route("Gy_Routing/CheckAllFlow")]
        [HttpGet]
        public object CheckAll(string HInterIDS, int IsAudit, string CurUserName, string CurUserID)
        {
            try
            {
                //处理字符串
                if (!string.IsNullOrEmpty(HInterIDS))
                {
                    int[] idArray = Array.ConvertAll(HInterIDS.Split(','), int.Parse);
                    // å¤„理idArray...
                    for (int i = 0; i < idArray.Length; i++)
                    {
                        objJsonResult = (json)AuditGy_Routing_Flow(idArray[i], IsAudit, CurUserName, CurUserID);//审核执行
                        if (objJsonResult.count == 0)
                        {
                            oCN.RollBack();
                            objJsonResult.Message += "第" + (i + 1) + "行出现问题无法继续完成";
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择正确行";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                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

    }
}

 WebAPI/Controllers/POStockInBillController.cs

@@ -5318,21 +5318,21 @@
        }

        [Route("POStockInBillList/AuditPOInStockBillPost_TianKang")]
        [HttpPost]
        public object AuditPOInStockBill_TianKang([FromBody] JObject msg)
        [HttpGet]
        public object AuditPOInStockBill_TianKang(long FID,string user)
        {
            try
            {
                string _msg = msg["msg"].ToString();
                _msg = _msg.Replace("\\", "");
                _msg = _msg.Replace("\n", "");
                List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                var hinterID = list[0].HInterID;
                var FID = list[0].FID;
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//客户名称               
                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
                string sql = string.Empty;
                //string _msg = msg["msg"].ToString();
                //_msg = _msg.Replace("\\", "");
                //_msg = _msg.Replace("\n", "");
                //List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
                //DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                //var hinterID = list[0].HInterID;
                //var FID = list[0].FID;
                //string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//客户名称               
                //var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
                //string sql = string.Empty;
                                              
                var json = new
                {
@@ -5340,7 +5340,7 @@
                };
                //LogService.Write(json);
                //登录
                var loginRet = InvokeHelper.Login();
                var loginRet = InvokeHelper.LoginUser(user);
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess <= 0)
                {

 WebAPI/Controllers/Pay_ReportController.cs

@@ -594,5 +594,50 @@
            return objJsonResult;
        }
        #endregion

        #region [系统计件报表]
        [Route("Pay_PaymentEntryReport/list")]
        [HttpGet]
        public object Pay_PaymentEntryReport(string sWhere, string user)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Pay_PaymentEntryReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("exec h_p_Pay_PaymentEntryReport" + sWhere, "h_p_Pay_PaymentEntryReport");
                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)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }
        #endregion
    }
}

 WebAPI/Controllers/SBGL/Sb_EquipReportController.cs

@@ -357,5 +357,70 @@

        #endregion

        #region è®¾å¤‡å·¥è‰ºå‚数报表

        [Route("Sb_EquipReportController/Get_SB_EquipICMOTechParamList")]
        [HttpGet]
        public object Get_SB_EquipICMOTechParamList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string HEquipNumber = dic["HEquipNumber"].ToString();//设备编码
                string HEquipName = dic["HEquipName"].ToString();//设备名称
                string HMaterNumber = dic["HMaterNumber"].ToString();//物料编码
                string HMaterName = dic["HMaterName"].ToString();//物料名称
                string HMouldID = dic["HMouldID"].ToString();//模具
                string HDate = dic["HDate"].ToString();//开始日期
                string HDate1 = dic["HDate1"].ToString();//结束日期

                ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamReport '" + HEquipNumber + "','" + HEquipName + "','" + HMaterNumber + "','" + HMaterName + "','" + HMouldID + "','" + HDate + "','" + HDate1 + "'", "h_p_SB_EquipICMOTechParamReport");

                if (ds.Tables.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //添加列名
                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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


    }
}

 WebAPI/Controllers/WebAPIController.cs

@@ -14983,7 +14983,7 @@
                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.count = 0;
                    objjson.Message = "该设备有多个计划单或点检规程,手动选着" ;
                    objjson.data = null;
                    return objjson;

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs

@@ -965,7 +965,7 @@
        #region åº“å­˜/工序 æ£€éªŒå•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为工序流转卡
        [Route("QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill")]
        [HttpGet]
        public object get_ProcessExchangeBill(string HInterID, string user)
        public object get_ProcessExchangeBill(string HInterID, string HEntryID, string user)
        {
            try
            {
@@ -978,13 +978,13 @@
                    switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "','" + HEntryID + "'";
                            break;
                    }


 WebAPI/Controllers/Æ·ÖʹÜÀí/³µ¼ä×Լ쵥/QC_WorkSelfCheckBillController.cs

@@ -924,7 +924,7 @@
        #region è½¦é—´æ£€éªŒå•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为工序流转卡
        [Route("QC_WorkSelfCheckBill/get_ProcessExchangeBill")]
        [HttpGet]
        public object get_ProcessExchangeBill(string HInterID, string user)
        public object get_ProcessExchangeBill(string HInterID, string HEntryID, string user)
        {
            try
            {
@@ -937,13 +937,13 @@
                    switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "','" + HEntryID + "'";
                            break;
                    }


 WebAPI/Controllers/Æ·ÖʹÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillController.cs

@@ -1124,7 +1124,7 @@
        #region é¦–件/工序 æ£€éªŒå•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为工序流转卡
        [Route("CheckBill/get_ProcessExchangeBill")]
        [HttpGet]
        public object get_ProcessExchangeBill(string HInterID, string user)
        public object get_ProcessExchangeBill(string HInterID, string HEntryID, string user)
        {
            try
            {
@@ -1137,13 +1137,13 @@
                    switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工序','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'物料','" + HInterID + "','" + HEntryID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "'";
                            sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'工艺路线','" + HInterID + "','" + HEntryID + "'";
                            break;
                    }


 WebAPI/InvokeHelper.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -40,6 +41,39 @@
            return httpClient.SyncRequest();
        }

        public static string LoginUser(string user)
        {
            //从C盘配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
            Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo);
            var useName = Pub_Class.ClsPub.sCLOUDUseName;
            var pwd = Pub_Class.ClsPub.sCLOUDPsd;
            var dbId = Pub_Class.ClsPub.sCLOUDAcc;
            CloudUrl = Pub_Class.ClsPub.sCLOUDUrl;

            //获取用户绑定金蝶账号
            DataSet ds;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            ds = oCN.RunProcReturn("exec h_p_API_GetCloudUserByLoginUser '" + user.ToString() + "'", "h_p_API_GetCloudUserByLoginUser");

            if (ds != null && ds.Tables[0].Rows.Count != 0)
            {
                useName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCloudUserName"]);
                pwd = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCloudUserPsd"]);
            }

            HttpClient httpClient = new HttpClient();
            httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");

            List<object> Parameters = new List<object>();
            Parameters.Add(dbId);//账套标示
            Parameters.Add(useName);//用户名
            Parameters.Add(pwd);//密码
            Parameters.Add(2052);//2052代表中文
            httpClient.Content = JsonConvert.SerializeObject(Parameters);

            return httpClient.SyncRequest();
        }

        public static async Task<string> LoginAsync()
        {
            HttpClient httpClient = new HttpClient();

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/28/2024 16:06:19</publishTime>
      <publishTime>10/31/2024 10:55:13</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/28/2024 16:06:19</publishTime>
      <publishTime>10/31/2024 10:55:13</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/28/2024 16:06:16</publishTime>
      <publishTime>10/31/2024 10:55:09</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/28/2024 16:06:16</publishTime>
      <publishTime>10/31/2024 10:55:09</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/28/2024 16:06:11</publishTime>
      <publishTime>10/31/2024 10:55:03</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/28/2024 16:06:11</publishTime>
      <publishTime>10/31/2024 10:55:03</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>10/28/2024 16:06:12</publishTime>
      <publishTime>10/31/2024 10:55:05</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/28/2024 16:06:12</publishTime>
      <publishTime>10/31/2024 10:55:05</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/28/2024 16:06:09</publishTime>
      <publishTime>10/31/2024 10:55:00</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/28/2024 16:06:09</publishTime>
      <publishTime>10/31/2024 10:55:00</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/28/2024 16:06:10</publishTime>
      <publishTime>10/31/2024 10:55:01</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/28/2024 16:06:10</publishTime>
      <publishTime>10/31/2024 10:55:01</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/28/2024 16:06:10</publishTime>
      <publishTime>10/31/2024 10:55:02</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/28/2024 16:06:10</publishTime>
      <publishTime>10/31/2024 10:55:02</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/28/2024 16:03:08</publishTime>
      <publishTime>10/30/2024 16:45:07</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/28/2024 16:03:08</publishTime>
      <publishTime>10/30/2024 16:45:07</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>10/28/2024 16:03:14</publishTime>
      <publishTime>10/31/2024 10:51:26</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/28/2024 16:03:14</publishTime>
      <publishTime>10/31/2024 10:51:26</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/28/2024 16:06:59</publishTime>
      <publishTime>10/31/2024 10:55:50</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/28/2024 16:06:59</publishTime>
      <publishTime>10/31/2024 10:55:50</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>

 WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-10-28T09:51:26.7156861Z;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
    <History>True|2024-10-30T10:42:11.0523067Z;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/28/2024 17:51:08</publishTime>
      <publishTime>10/30/2024 18:41:56</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/28/2024 17:51:08</publishTime>
      <publishTime>10/30/2024 18:41:56</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/28/2024 17:51:06</publishTime>
      <publishTime>10/30/2024 18:41:54</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/28/2024 17:51:06</publishTime>
      <publishTime>10/30/2024 18:41:54</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/28/2024 17:51:03</publishTime>
      <publishTime>10/30/2024 18:41:51</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/28/2024 17:51:03</publishTime>
      <publishTime>10/30/2024 18:41:51</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>10/28/2024 17:51:04</publishTime>
      <publishTime>10/30/2024 18:41:52</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/28/2024 17:51:04</publishTime>
      <publishTime>10/30/2024 18:41:52</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/28/2024 17:51:01</publishTime>
      <publishTime>10/30/2024 18:41:50</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/28/2024 17:51:01</publishTime>
      <publishTime>10/30/2024 18:41:50</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/28/2024 17:51:02</publishTime>
      <publishTime>10/30/2024 18:41:50</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/28/2024 17:51:02</publishTime>
      <publishTime>10/30/2024 18:41:50</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/28/2024 17:51:02</publishTime>
      <publishTime>10/30/2024 18:41:51</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/28/2024 17:51:02</publishTime>
      <publishTime>10/30/2024 18:41:51</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/28/2024 17:50:07</publishTime>
      <publishTime>10/30/2024 18:40:51</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/28/2024 17:50:07</publishTime>
      <publishTime>10/30/2024 18:40:51</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>10/28/2024 17:50:10</publishTime>
      <publishTime>10/30/2024 18:40:54</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/28/2024 17:50:10</publishTime>
      <publishTime>10/30/2024 18:40:54</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/28/2024 17:50:33</publishTime>
      <publishTime>10/30/2024 18:41:15</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/28/2024 17:50:33</publishTime>
      <publishTime>10/30/2024 18:41:15</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>10/24/2024 20:39:05</publishTime>
      <publishTime>10/29/2024 11:21:00</publishTime>
    </File>
  </ItemGroup>
</Project>

 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>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -20,5 +20,5 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ