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

zrg

2024-11-12 a0586edd1c53e6c7065fd2a90809ecb4fa293922

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

 APSM/bin/Release/APSM.dll

Binary files differ

 APSM/bin/Release/APSM.pdb

Binary files differ

 APSM/bin/Release/BLL.dll

Binary files differ

 APSM/bin/Release/BLL.pdb

Binary files differ

 APSM/bin/Release/BaseSet.dll

Binary files differ

 APSM/bin/Release/BaseSet.pdb

Binary files differ

 APSM/bin/Release/DAL.dll

Binary files differ

 APSM/bin/Release/DAL.pdb

Binary files differ

 APSM/bin/Release/DBUtility.dll

Binary files differ

 APSM/bin/Release/DBUtility.pdb

Binary files differ

 APSM/bin/Release/Model.dll

Binary files differ

 APSM/bin/Release/Model.pdb

Binary files differ

 APSM/bin/Release/PlanM.dll

Binary files differ

 APSM/bin/Release/PlanM.pdb

Binary files differ

 APSM/bin/Release/Pub_Class.dll

Binary files differ

 APSM/bin/Release/Pub_Class.pdb

Binary files differ

 APSM/bin/Release/Pub_Control.dll

Binary files differ

 APSM/bin/Release/Pub_Control.pdb

Binary files differ

 APSM/bin/Release/SQLHelper.dll

Binary files differ

 APSM/bin/Release/SQLHelper.pdb

Binary files differ

 APSM/bin/Release/WarM.dll

Binary files differ

 APSM/bin/Release/WarM.pdb

Binary files differ

 APSM/bin/Release/WorkM.dll

Binary files differ

 APSM/bin/Release/WorkM.pdb

Binary files differ

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 BaseSet/bin/Release/BLL.dll

Binary files differ

 BaseSet/bin/Release/BLL.pdb

Binary files differ

 BaseSet/bin/Release/BaseSet.dll

Binary files differ

 BaseSet/bin/Release/BaseSet.pdb

Binary files differ

 BaseSet/bin/Release/DAL.dll

Binary files differ

 BaseSet/bin/Release/DAL.pdb

Binary files differ

 BaseSet/bin/Release/DBUtility.dll

Binary files differ

 BaseSet/bin/Release/DBUtility.pdb

Binary files differ

 BaseSet/bin/Release/Model.dll

Binary files differ

 BaseSet/bin/Release/Model.pdb

Binary files differ

 BaseSet/bin/Release/Pub_Class.dll

Binary files differ

 BaseSet/bin/Release/Pub_Class.pdb

Binary files differ

 BaseSet/bin/Release/Pub_Control.dll

Binary files differ

 BaseSet/bin/Release/Pub_Control.pdb

Binary files differ

 BaseSet/bin/Release/SQLHelper.dll

Binary files differ

 BaseSet/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 PayM/bin/x86/Debug/BLL.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.pdb

Binary files differ

 PayM/bin/x86/Debug/DAL.dll

Binary files differ

 PayM/bin/x86/Debug/DAL.pdb

Binary files differ

 PayM/bin/x86/Debug/DBUtility.dll

Binary files differ

 PayM/bin/x86/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/x86/Debug/Model.dll

Binary files differ

 PayM/bin/x86/Debug/Model.pdb

Binary files differ

 PayM/bin/x86/Debug/PayM.dll

Binary files differ

 PayM/bin/x86/Debug/PayM.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache

Binary files differ

 PayM/obj/x86/Debug/PayM.dll

Binary files differ

 PayM/obj/x86/Debug/PayM.pdb

Binary files differ

 PlanM/bin/Release/BLL.dll

Binary files differ

 PlanM/bin/Release/BLL.pdb

Binary files differ

 PlanM/bin/Release/DAL.dll

Binary files differ

 PlanM/bin/Release/DAL.pdb

Binary files differ

 PlanM/bin/Release/DBUtility.dll

Binary files differ

 PlanM/bin/Release/DBUtility.pdb

Binary files differ

 PlanM/bin/Release/Model.dll

Binary files differ

 PlanM/bin/Release/Model.pdb

Binary files differ

 PlanM/bin/Release/PlanM.dll

Binary files differ

 PlanM/bin/Release/PlanM.pdb

Binary files differ

 PlanM/bin/Release/Pub_Class.dll

Binary files differ

 PlanM/bin/Release/Pub_Class.pdb

Binary files differ

 PlanM/bin/Release/Pub_Control.dll

Binary files differ

 PlanM/bin/Release/Pub_Control.pdb

Binary files differ

 PlanM/bin/Release/SQLHelper.dll

Binary files differ

 PlanM/bin/Release/SQLHelper.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

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

@@ -1,24 +1,5 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
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
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
<<<<<<< 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
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
>>>>>>> df8354d552a8658d5919d801ad307489c039eb02
>>>>>>> e15856e05e8c9f2bf787dca73c6178e0326e3d6c

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

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -1,6 +1,5 @@
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb

 SyntacticSugar/obj/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.pdb

Binary files differ

 WarM/bin/Release/BLL.dll

Binary files differ

 WarM/bin/Release/BLL.pdb

Binary files differ

 WarM/bin/Release/DAL.dll

Binary files differ

 WarM/bin/Release/DAL.pdb

Binary files differ

 WarM/bin/Release/DBUtility.dll

Binary files differ

 WarM/bin/Release/DBUtility.pdb

Binary files differ

 WarM/bin/Release/Model.dll

Binary files differ

 WarM/bin/Release/Model.pdb

Binary files differ

 WarM/bin/Release/Pub_Class.dll

Binary files differ

 WarM/bin/Release/Pub_Class.pdb

Binary files differ

 WarM/bin/Release/Pub_Control.dll

Binary files differ

 WarM/bin/Release/Pub_Control.pdb

Binary files differ

 WarM/bin/Release/SQLHelper.dll

Binary files differ

 WarM/bin/Release/SQLHelper.pdb

Binary files differ

 WarM/bin/Release/WarM.dll

Binary files differ

 WarM/bin/Release/WarM.pdb

Binary files differ

 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill_automaticallyByPLC_New.cs

@@ -1038,7 +1038,29 @@
            //拼接批号
            HBarCode_MaxNo = sYear + sPeriod + sDay + LIU;

            return HBarCode_MaxNo;
            long HBarCode_MaxNo_long = long.Parse(HBarCode_MaxNo);

            while (true)
            {
                int HCount_BarCodeBillList = 0;
                int HCount_SubBarCodeBill = 0;
                string sql_confirm = "select * from h_v_IF_BarCodeBillList where æ¡ç ç¼–号 = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and æ¡ç ç±»åž‹ = '唯一条码'" + " and CONVERT(varchar(100),条码日期, 23) = '" + HDate + "'";
                ds = oCn.RunProcReturn(sql_confirm, "h_v_IF_BarCodeBillList");
                HCount_BarCodeBillList = ds.Tables[0].Rows.Count;
                sql_confirm = "select * from Gy_BarCodeBill_SWELL_SubBarCodeBill Where HBarCode = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and HBarCodeType = '唯一条码'" + " and CONVERT(varchar(100),HMakeDate, 23) = '" + HDate + "'";
                ds = oCn.RunProcReturn(sql_confirm, "Gy_BarCodeBill_SWELL_SubBarCodeBill");
                HCount_SubBarCodeBill = ds.Tables[0].Rows.Count;
                if (HCount_BarCodeBillList + HCount_SubBarCodeBill > 0)
                {
                    HBarCode_MaxNo_long += 1;
                }
                else
                {
                    break;
                }
            }

            return HBarCode_MaxNo_long.ToString();
        }
        #endregion


 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -422,6 +422,26 @@
                        objJsonResult.Verify = "N";
                    }
                }

                //测试语句===========================================================================================================
                string msg_str = "";
                string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
                            "from Sc_ProcessExchangeBillMain as a " +
                            "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
                            "where a.HInterID = " + HProcExchInterID;
                DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
                if (ds_str.Tables[0].Rows.Count > 0)
                {
                    msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
                    for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
                    {
                        msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
                    }
                }

                oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改工序进站单据：" + HBillNo + "[工序流转卡号：" + HProcExchBillNo + "]" + msg_str + "','LMES-工序出站模块','" + DBUtility.ClsPub.IPAddress + "','新增或修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                //==============================================================================================================

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -628,6 +628,27 @@
                sw.Stop();//结束计时
                LogService.Write($"11.参数查询结束,新增结束，用时" + sw.Elapsed);
                LogService.Write("END--出站单据保存结束，出站单号：" + HBillNo);

                //测试语句===========================================================================================================
                string msg_str = "";
                string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
                            "from Sc_ProcessExchangeBillMain as a " +
                            "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
                            "where a.HInterID = " + HProcExchInterID;
                DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
                if (ds_str.Tables[0].Rows.Count > 0)
                {
                    msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
                    for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
                    {
                        msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
                    }
                }

                oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改工序出站单据：" + HBillNo + "[工序流转卡号：" + HProcExchBillNo + "]" + msg_str + "','LMES-工序出站模块','" + DBUtility.ClsPub.IPAddress + "','新增或修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                //==============================================================================================================


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -132,14 +132,50 @@
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "新增工序流转卡单据：" + oBill.omodel.HBillNo + "','LMES-工序流转卡模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);

                    //测试语句===========================================================================================================
                    string msg_str = "";
                    string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
                                "from Sc_ProcessExchangeBillMain as a " +
                                "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
                                "where a.HInterID = " + oBill.omodel.HInterID;
                    DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
                    if (ds_str.Tables[0].Rows.Count > 0)
                    {
                        msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
                        for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
                        {
                            msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
                        }
                    }
                    //==============================================================================================================


                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "新增工序流转卡单据：" + oBill.omodel.HBillNo + msg_str + "','LMES-工序流转卡模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",修改工序流转卡单据:" + oBill.omodel.HBillNo);
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);

                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "修改工序流转卡单据：" + oBill.omodel.HBillNo + "','LMES-工序流转卡模块','" + DBUtility.ClsPub.IPAddress + "','修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //测试语句===========================================================================================================
                    string msg_str = "";
                    string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
                                "from Sc_ProcessExchangeBillMain as a " +
                                "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
                                "where a.HInterID = " + oBill.omodel.HInterID;
                    DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
                    if (ds_str.Tables[0].Rows.Count > 0)
                    {
                        msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
                        for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
                        {
                            msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
                        }
                    }
                    //==============================================================================================================

                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "修改工序流转卡单据：" + oBill.omodel.HBillNo + msg_str + "','LMES-工序流转卡模块','" + DBUtility.ClsPub.IPAddress + "','修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -379,14 +379,16 @@
                }


                if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                {
                    //是否勾选默认工艺路线
                    if (HStandard)
                    {
                        //设置默认工艺路线
                        oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
                    }
                }

                //是否勾选默认工艺路线
                //if (HStandard)
                //{
                //    //设置默认工艺路线
                //    oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
                //}
             
                //判断是否重复工序号
                ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");


 WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs

@@ -145,5 +145,64 @@
            }
        }
        #endregion

        #region å‡ºåº“条码明细报表 æŸ¥è¯¢
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xs_SellOutCompareToProductReport/list")]
        [HttpGet]
        public object getXs_SellOutCompareToProductReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Xs_SellOutCompareToProductReport", 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_Xs_SellOutCompareToProductReport order by ç”Ÿäº§å•å· desc", "h_v_Xs_SellOutCompareToProductReport");
                }
                else
                {
                    string sql1 = "select * from h_v_Xs_SellOutCompareToProductReport where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by ç”Ÿäº§å•å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xs_SellOutCompareToProductReport");
                }

                //添加列名
                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/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillController.cs

@@ -101,6 +101,31 @@
            public string HContacts;
            public string HContactNumber;

            public int HSupplierID;                  //分包单位（gy_supllier）
            public int HMangerEmpID;                 //管理员（gy_Employee）
            public string HMaterPlanDate;               //材料计划 
            public int HWorkerID;                    //施工员（gy_Employee）
            public double HPlanWorkTimes;               //计划工期
            public double HRelWorkTimes;                //实际工期
            public string HTestDate;                    //试压日期
            public int HTestCheckerID;               //试压验收人（gy_Employee）
            public string HTestNote;                    //试压记录（富文本）
            public string HSewageDate;                  //排污日期
            public string HWaterSupplyDate;             //通水日期
            public string HWorkNote;                    //竣工资料（富文本）
            public string HWorkProcNote;                //施工完成情况（富文本）

            public double HYuSuanMoney;                 //预算造价
            public double HHeTongMoney;                 //合同造价
            public double HJieSuanMoney;                //结算造价
            public double HShenJiMoney;                 //审计造价
            public double HCaiLiaoMoney;                //材料费
            public double HAnZhuangMoney;               //安装费
            public double HBanZuMoney;                  //班组工费
            public double HYuShouKuanMoney;             //预收款
            public double HGongFeiMoney;                //工费结账
            public double HJieZhangMoney;                //结算结账

        }
        #endregion
        #region å·¥ç¨‹é¡¹ç›® é¡¹ç›®é˜¶æ®µè¡¨ä½“数据
@@ -254,6 +279,34 @@
                string HProjectNote = mainList[0].HProjectNote;
                string HContacts = mainList[0].HContacts;
                string HContactNumber = mainList[0].HContactNumber;


                int HSupplierID = mainList[0].HSupplierID;                      //分包单位（gy_supllier）
                int HMangerEmpID = mainList[0].HMangerEmpID;                    //管理员（gy_Employee）
                string HMaterPlanDate = mainList[0].HMaterPlanDate;             //材料计划 
                int HWorkerID = mainList[0].HWorkerID;                          //施工员（gy_Employee）
                double HPlanWorkTimes = mainList[0].HPlanWorkTimes;             //计划工期
                double HRelWorkTimes = mainList[0].HRelWorkTimes;               //实际工期
                string HTestDate = mainList[0].HTestDate;                       //试压日期
                int HTestCheckerID = mainList[0].HTestCheckerID;                //试压验收人（gy_Employee）
                string HTestNote = mainList[0].HTestNote;                       //试压记录（富文本）
                string HSewageDate = mainList[0].HSewageDate;                   //排污日期
                string HWaterSupplyDate = mainList[0].HWaterSupplyDate;         //通水日期
                string HWorkNote = mainList[0].HWorkNote;                       //竣工资料（富文本）
                string HWorkProcNote = mainList[0].HWorkProcNote;               //施工完成情况（富文本）

                double HYuSuanMoney = mainList[0].HYuSuanMoney;                 //预算造价
                double HHeTongMoney = mainList[0].HHeTongMoney;                 //合同造价
                double HJieSuanMoney = mainList[0].HJieSuanMoney;               //结算造价
                double HShenJiMoney = mainList[0].HShenJiMoney;                 //审计造价
                double HCaiLiaoMoney = mainList[0].HCaiLiaoMoney;               //材料费
                double HAnZhuangMoney = mainList[0].HAnZhuangMoney;             //安装费
                double HBanZuMoney = mainList[0].HBanZuMoney;                   //班组工费
                double HYuShouKuanMoney = mainList[0].HYuShouKuanMoney;         //预收款
                double HGongFeiMoney = mainList[0].HGongFeiMoney;               //工费结账
                double HJieZhangMoney = mainList[0].HJieZhangMoney;                //结算结账


                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -273,7 +326,8 @@
                {
                    string sql = "insert into PM_ProjectBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber) " +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber" +
                        ",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -315,7 +369,30 @@
                        "','" + HProjectNote +
                        "','" + HContacts +
                        "','" + HContactNumber +
                        "')";
                        "','" + HSupplierID + "'" + 
                        ",'" + HMangerEmpID + "'" + 
                        ",'" + HMaterPlanDate + "'" + 
                        ",'" + HWorkerID + "'" + 
                        ",'" + HPlanWorkTimes + "'" + 
                        ",'" + HRelWorkTimes + "'" + 
                        ",'" + HTestDate + "'" + 
                        ",'" + HTestCheckerID + "'" + 
                        ",'" + HTestNote + "'" + 
                        ",'" + HSewageDate + "'" + 
                        ",'" + HWaterSupplyDate + "'" + 
                        ",'" + HWorkNote + "'" + 
                        ",'" + HWorkProcNote + "'" + 
                        ",'" + HYuSuanMoney + "'" + 
                        ",'" + HHeTongMoney + "'" + 
                        ",'" + HJieSuanMoney + "'" + 
                        ",'" + HShenJiMoney + "'" + 
                        ",'" + HCaiLiaoMoney + "'" + 
                        ",'" + HAnZhuangMoney + "'" + 
                        ",'" + HBanZuMoney + "'" + 
                        ",'" + HYuShouKuanMoney + "'" + 
                        ",'" + HGongFeiMoney + "'" + 
                        ",'" + HJieZhangMoney + "'" +
                        ")";

                    //主表
                    oCN.RunProc(sql);
@@ -364,6 +441,32 @@
                        "',HProjectNote ='" + HProjectNote +
                        "',HContacts ='" + HContacts +
                        "',HContactNumber ='" + HContactNumber +

                        "',HSupplierID = '" + HSupplierID +
                        "',HMangerEmpID = '" + HMangerEmpID +
                        "',HMaterPlanDate = '" + HMaterPlanDate +
                        "',HWorkerID = '" + HWorkerID +
                        "',HPlanWorkTimes = '" + HPlanWorkTimes +
                        "',HRelWorkTimes = '" + HRelWorkTimes +
                        "',HTestDate = '" + HTestDate +
                        "',HTestCheckerID = '" + HTestCheckerID +
                        "',HTestNote = '" + HTestNote +
                        "',HSewageDate = '" + HSewageDate +
                        "',HWaterSupplyDate = '" + HWaterSupplyDate +
                        "',HWorkNote = '" + HWorkNote +
                        "',HWorkProcNote = '" + HWorkProcNote +
                        "',HYuSuanMoney = '" + HYuSuanMoney +
                        "',HHeTongMoney = '" + HHeTongMoney +
                        "',HJieSuanMoney = '" + HJieSuanMoney +
                        "',HShenJiMoney = '" + HShenJiMoney +
                        "',HCaiLiaoMoney = '" + HCaiLiaoMoney +
                        "',HAnZhuangMoney = '" + HAnZhuangMoney +
                        "',HBanZuMoney = '" + HBanZuMoney +
                        "',HYuShouKuanMoney = '" + HYuShouKuanMoney +
                        "',HGongFeiMoney = '" + HGongFeiMoney +
                        "',HJieZhangMoney = '" + HJieZhangMoney +


                        "' where HInterID = " + HInterID;

                    oCN.RunProc(sql);

 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-10-31T08:00:46.6075171Z;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
    <History>True|2024-11-11T07:03:29.1473573Z;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/31/2024 15:21:30</publishTime>
      <publishTime>11/04/2024 14:38:17</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/31/2024 15:21:30</publishTime>
      <publishTime>11/04/2024 14:38:17</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/31/2024 15:21:26</publishTime>
      <publishTime>11/04/2024 14:38:14</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/31/2024 15:21:26</publishTime>
      <publishTime>11/04/2024 14:38:14</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/25/2024 09:57:56</publishTime>
      <publishTime>11/04/2024 14:38:08</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/25/2024 09:57:56</publishTime>
      <publishTime>11/04/2024 14:38:08</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/31/2024 12:13:16</publishTime>
      <publishTime>11/04/2024 14:38:08</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/31/2024 12:13:16</publishTime>
      <publishTime>11/04/2024 14:38:08</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/25/2024 09:57:55</publishTime>
      <publishTime>11/04/2024 14:38:05</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/25/2024 09:57:55</publishTime>
      <publishTime>11/04/2024 14:38:05</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/25/2024 09:57:56</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/25/2024 09:57:56</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/25/2024 09:57:56</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/25/2024 09:57:56</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/11/2024 13:37:19</publishTime>
      <publishTime>11/04/2024 14:38:03</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/11/2024 13:37:19</publishTime>
      <publishTime>11/04/2024 14:38:03</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>10/11/2024 13:37:24</publishTime>
      <publishTime>11/04/2024 14:38:09</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/11/2024 13:37:24</publishTime>
      <publishTime>11/04/2024 14:38:09</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/31/2024 16:00:39</publishTime>
      <publishTime>11/11/2024 15:03:20</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/31/2024 16:00:39</publishTime>
      <publishTime>11/11/2024 15:03:20</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>10/31/2024 16:00:45</publishTime>
      <publishTime>11/11/2024 15:03:28</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>10/25/2024 09:58:38</publishTime>
      <publishTime>11/04/2024 13:35:46</publishTime>
    </File>
  </ItemGroup>
</Project>

 WorkM/bin/Release/BLL.dll

Binary files differ

 WorkM/bin/Release/BLL.pdb

Binary files differ

 WorkM/bin/Release/DAL.dll

Binary files differ

 WorkM/bin/Release/DAL.pdb

Binary files differ

 WorkM/bin/Release/DBUtility.dll

Binary files differ

 WorkM/bin/Release/DBUtility.pdb

Binary files differ

 WorkM/bin/Release/Model.dll

Binary files differ

 WorkM/bin/Release/Model.pdb

Binary files differ

 WorkM/bin/Release/Pub_Class.dll

Binary files differ

 WorkM/bin/Release/Pub_Class.pdb

Binary files differ

 WorkM/bin/Release/Pub_Control.dll

Binary files differ

 WorkM/bin/Release/Pub_Control.pdb

Binary files differ

 WorkM/bin/Release/SQLHelper.dll

Binary files differ

 WorkM/bin/Release/SQLHelper.pdb

Binary files differ

 WorkM/bin/Release/WarM.dll

Binary files differ

 WorkM/bin/Release/WarM.pdb

Binary files differ

 WorkM/bin/Release/WorkM.dll

Binary files differ

 WorkM/bin/Release/WorkM.pdb

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

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

@@ -1,28 +1,11 @@
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
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
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
<<<<<<< HEAD
=======
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
>>>>>>> e15856e05e8c9f2bf787dca73c6178e0326e3d6c
>>>>>>> a2bdf7e18d34fba0ef0d701faf4f277cef4f142a

 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.FileListAbsolute.txt

@@ -1,5 +1,5 @@
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ