1

zrg

2026-01-27 cdcea41c825c121e634061446f7a27c0d9d6d4e6

1

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

@@ -1,3 +1,10 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
=======
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -17,6 +24,7 @@
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
=======
>>>>>>> d7c4b0ac44e3e0770e14d51059f9305135b5f26f
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -3596,7 +3596,70 @@
        }
        #endregion

        #region 采购订单编辑回显
        [Route("Cg_POOrderBill/QueryListEdit")]
        [HttpGet]
        public object QueryListEdit(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillList", 3, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Cg_POOrderBillEdit order by 单据号 desc", "h_v_Cg_POOrderBillEdit");
                }
                else
                {
                    string sql1 = "select * from  h_v_Cg_POOrderBillEdit  where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 单据号 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Cg_POOrderBillEdit");
                }


                //添加列名
                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 ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }


 WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs

@@ -424,6 +424,32 @@
                return objJsonResult;
            }
        }
        [Route("Sc_EmployeeSignInNoteBillController/Get_equipmentMes")]
        [HttpGet]
        public object Get_MouldMes(int HInterID, string HBarCode)
        {

            
            DataSet dss = oCN.RunProcReturn("select HInterID from Gy_EquipFileBillMain where HBarCode='"+ HBarCode + "'", "Gy_EquipFileBillMain");
            DataSet ds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query '" + dss.Tables[0].Rows[0]["HInterID"] + "'", "h_p_SB_HEquipHMould_Query");
            if (ds != null || ds.Tables.Count > 0)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion



 WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs

@@ -127,7 +127,7 @@
                      "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
                      ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "','" + oSub.HQCNote1_SN + "','" + oSub.HQCNote2_SN + "','" + oSub.HQCNote3_SN + "','" + oSub.HQCNote4_SN + "','" + oSub.HQCNote5_SN + "','" + oSub.HQCNote6_SN + "','" + oSub.HQCNote7_SN + "','" + oSub.HQCNote8_SN + "','" + oSub.HQCNote9_SN + "','" + oSub.HQCNote10_SN + "'" +
                       ",'" + oSub.HTargetVal + "'," + oSub.HInspectMethodID + "," + oSub.HDownLimit + "," + oSub.HUpLimit + ",'" + oSub.HAnalysisMethod + "'" +
                       ",'" + oSub.HTargetVal + "'," + oSub.HInspectMethodID + ",'" + oSub.HDownLimit + "','" + oSub.HUpLimit + "','" + oSub.HAnalysisMethod + "'" +
                       ",'" + oSub.HTargetVal2 + "','" + oSub.HTargetVal3 + "','" + oSub.HTargetVal4 + "','" + oSub.HTargetVal5 + "','" + oSub.HTargetVal6 +"'"+
                      ") ");                   
                }

 WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\gz\网站发布\MES-WEB-API</_PublishTargetUrl>
    <History>True|2025-12-29T08:07:54.9198175Z;True|2025-12-29T16:03:22.7326283+08:00;True|2025-12-29T14:48:43.2998704+08:00;True|2025-12-29T13:15:31.9190907+08:00;False|2025-12-29T13:14:50.6997009+08:00;False|2025-12-29T13:14:43.3747902+08:00;True|2025-12-29T11:23:10.8799366+08:00;True|2025-12-29T10:28:51.7449005+08:00;True|2025-12-29T10:16:49.3899978+08:00;True|2025-12-29T10:12:43.7936956+08:00;True|2025-12-29T10:11:56.0271637+08:00;True|2025-12-29T08:50:47.5622375+08:00;False|2025-12-29T08:50:28.9083964+08:00;True|2025-12-26T17:03:30.4685598+08:00;True|2025-12-26T15:03:24.1797813+08:00;True|2025-12-26T14:44:52.6944631+08:00;True|2025-12-26T14:39:46.7764533+08:00;True|2025-12-26T14:36:47.1612784+08:00;True|2025-12-26T14:32:05.2128659+08:00;True|2025-12-26T14:29:20.7607039+08:00;True|2025-12-26T08:47:33.3798643+08:00;True|2025-12-26T08:20:29.5411144+08:00;True|2025-12-26T08:16:26.6662581+08:00;False|2025-12-26T08:16:07.5700329+08:00;True|2025-12-25T17:07:24.9496892+08:00;True|2025-12-25T17:04:00.1314291+08:00;True|2025-12-25T16:53:07.6258358+08:00;True|2025-12-25T16:47:09.1816088+08:00;True|2025-12-25T11:23:19.3812293+08:00;True|2025-12-25T11:15:13.7273857+08:00;</History>
    <History>False|2026-01-13T01:46:00.8946389Z;True|2025-12-29T16:07:54.9198175+08:00;True|2025-12-29T16:03:22.7326283+08:00;True|2025-12-29T14:48:43.2998704+08:00;True|2025-12-29T13:15:31.9190907+08:00;False|2025-12-29T13:14:50.6997009+08:00;False|2025-12-29T13:14:43.3747902+08:00;True|2025-12-29T11:23:10.8799366+08:00;True|2025-12-29T10:28:51.7449005+08:00;True|2025-12-29T10:16:49.3899978+08:00;True|2025-12-29T10:12:43.7936956+08:00;True|2025-12-29T10:11:56.0271637+08:00;True|2025-12-29T08:50:47.5622375+08:00;False|2025-12-29T08:50:28.9083964+08:00;True|2025-12-26T17:03:30.4685598+08:00;True|2025-12-26T15:03:24.1797813+08:00;True|2025-12-26T14:44:52.6944631+08:00;True|2025-12-26T14:39:46.7764533+08:00;True|2025-12-26T14:36:47.1612784+08:00;True|2025-12-26T14:32:05.2128659+08:00;True|2025-12-26T14:29:20.7607039+08:00;True|2025-12-26T08:47:33.3798643+08:00;True|2025-12-26T08:20:29.5411144+08:00;True|2025-12-26T08:16:26.6662581+08:00;False|2025-12-26T08:16:07.5700329+08:00;True|2025-12-25T17:07:24.9496892+08:00;True|2025-12-25T17:04:00.1314291+08:00;True|2025-12-25T16:53:07.6258358+08:00;True|2025-12-25T16:47:09.1816088+08:00;True|2025-12-25T11:23:19.3812293+08:00;True|2025-12-25T11:15:13.7273857+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
  <ProjectExtensions>

 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

@@ -9,6 +9,8 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
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
<<<<<<< HEAD
=======
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
@@ -30,3 +32,4 @@
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
>>>>>>> dbb4487be15ef158326d46bb81b6284987e35a2c
>>>>>>> d7c4b0ac44e3e0770e14d51059f9305135b5f26f

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache

File was deleted