合并分支 20260225 1627

chenhaozhe

2026-02-25 ed299767c89cd657b2a5373cb3546de9950382bd

合并分支 20260225 1627

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

@@ -11,6 +11,7 @@
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string HOldNumber;
        public Model.ClsGy_CostAverageType_Model oModel = new Model.ClsGy_CostAverageType_Model();
        public List<Model.ClsGy_CostAverageTypeSub_Model> DetailColl = new List<Model.ClsGy_CostAverageTypeSub_Model>();
        //新增
        public override bool AddNew(ref string sReturn)
        {
@@ -31,6 +32,34 @@
                ", ref sReturn);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref sReturn);
                DataSet dss= oCn.RunProcReturn("select MAX(HItemID) as HInterID  from Gy_CostAverageType", "Gy_CostAverageType");
                int HInterID = Convert.ToInt32(dss.Tables[0].Rows[0]["HInterID"]); 
                oCn.RunProc("Delete From " + "Gy_CostAverageTypeSub" + "  where HInterID=" + HInterID);

                //插入子表
                if (DetailColl != null && DetailColl.Count > 0)
                {
                    foreach (Model.ClsGy_CostAverageTypeSub_Model oSub in DetailColl)
                    {
                        if (oSub == null)
                            continue;

                        string subSql = "insert into Gy_CostAverageTypeSub" +
                               "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                               ",HWeight,HMaterTypeID" + ")" +
                               " values(" +
                               HInterID + "," +
                               (oSub.HEntryID != null ? oSub.HEntryID.ToString() : "0") + "," +
                               (oSub.HSourceInterID != null && oSub.HSourceInterID != 0 ? oSub.HSourceInterID.ToString() : "0") + "," +
                               (oSub.HSourceEntryID != null && oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
                               (oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
                               (oSub.HWeight != null && oSub.HWeight != 0 ? oSub.HWeight.ToString() : "0") + "," +
                               (oSub.HMaterTypeID != null && oSub.HMaterTypeID != 0 ? oSub.HMaterTypeID.ToString() : "0") +
                               ")";

                        oCn.RunProc(subSql);
                    }
                }
                oCn.Commit();
                return true;
            }
@@ -71,6 +100,32 @@
                //将上级 ä¸ºéžæœ«çº§
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref sReturn);
                //

                oCn.RunProc("Delete From " + "Gy_CostAverageTypeSub" + "  where HInterID=" + oModel.HItemID);
                //插入子表
                if (DetailColl != null && DetailColl.Count > 0)
                {
                    foreach (Model.ClsGy_CostAverageTypeSub_Model oSub in DetailColl)
                    {
                        if (oSub == null)
                            continue;

                        string subSql = "insert into Gy_CostAverageTypeSub" +
                               "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                               ",HWeight,HMaterTypeID" + ")" +
                               " values(" +
                               oModel.HItemID + "," +
                               (oSub.HEntryID != null ? oSub.HEntryID.ToString() : "0") + "," +
                               (oSub.HSourceInterID != null && oSub.HSourceInterID != 0 ? oSub.HSourceInterID.ToString() : "0") + "," +
                               (oSub.HSourceEntryID != null && oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
                               (oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
                               (oSub.HWeight != null && oSub.HWeight != 0 ? oSub.HWeight.ToString() : "0") + "," +
                               (oSub.HMaterTypeID != null && oSub.HMaterTypeID != 0 ? oSub.HMaterTypeID.ToString() : "0") + 
                               ")";

                        oCn.RunProc(subSql);
                    }
                }
                oCn.Commit();
                return true;
            }

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

@@ -101,7 +101,7 @@
        //构造函数
        public ClsGy_CostCenter_Ctl_2()
        {
            MvarItemKey = "Gy_CostCenter_1";
            MvarItemKey = "Gy_CostCenter";
            MvarReportTitle = "成本中心设置";
            oModel = new Model.ClsGy_CostCenter_Model_2();
        }

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

@@ -108,7 +108,7 @@
        //构造函数
        public ClsGy_CostItemAverageType_Ctl_2()
        {
            MvarItemKey = "Gy_CostItemAverageType_1";
            MvarItemKey = "Gy_CostItemAverageType";
            MvarReportTitle = "成本项目分配标准";
            oModel = new Model.ClsGy_Gy_CostItemAverageType_Model_2();
        }

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

@@ -105,7 +105,7 @@
        //构造函数
        public ClsGy_CostItem_Ctl_2()
        {
            MvarItemKey = "Gy_CostItem_1";
            MvarItemKey = "Gy_CostItem";
            MvarReportTitle = "成本项目设置";
            oModel = new Model.ClsGy_CostItem_Model_2();
        }

 DAL/³É±¾¹ÜÀí/ClsCB_ItemMoneyBillMain  .cs

@@ -79,7 +79,7 @@
                        string subSql = "insert into CB_ItemMoneyBillSub" +
                               "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                               ",HMoney,HRemark" +
                               ",HCostItemID,HDeptID,HQty,HPrice,HMaterID,HWaster,HDate,HBeginBalance,HEndBalance,HTimes) " +
                               ",HCostItemID,HDeptID,HQty,HPrice,HMaterID,HWaster,HDate,HBeginBalance,HEndBalance,HTimes,HProcID) " +
                               " values(" +
                               lngBillKey.ToString() + "," +
                               (oSub.HEntryID != null ? oSub.HEntryID.ToString() : "0") + "," +
@@ -96,7 +96,8 @@
                               (oSub.HDate != null && oSub.HDate != DateTime.MinValue ? oSub.HDate.ToString() : DateTime.Now.ToString()) + "'," +
                               (oSub.HBeginBalance != null && oSub.HBeginBalance != 0 ? oSub.HBeginBalance.ToString() : "0") + "," +
                               (oSub.HEndBalance != null && oSub.HEndBalance != 0 ? oSub.HEndBalance.ToString() : "0") + "," +
                               (oSub.HTimes != null && oSub.HTimes != 0 ? oSub.HTimes.ToString() : "0") +
                               (oSub.HTimes != null && oSub.HTimes != 0 ? oSub.HTimes.ToString() : "0") + "," +
                               (oSub.HProcID != null && oSub.HProcID != 0 ? oSub.HProcID.ToString() : "0") +
                               ")";

                        oCn.RunProc(subSql);
@@ -155,7 +156,7 @@
                        string subSql = "insert into CB_ItemMoneyBillSub" +
                                "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                                ",HMoney,HRemark" +
                                ",HCostItemID,HDeptID,HQty,HPrice,HMaterID,HWaster,HDate,HBeginBalance,HEndBalance,HTimes) " +
                                ",HCostItemID,HDeptID,HQty,HPrice,HMaterID,HWaster,HDate,HBeginBalance,HEndBalance,HTimes,HProcID) " +
                                " values(" +
                                omodel.HInterID.ToString() + "," +
                                (oSub.HEntryID != null ? oSub.HEntryID.ToString() : "0") + "," +
@@ -172,7 +173,8 @@
                                (oSub.HDate != null && oSub.HDate != DateTime.MinValue ? oSub.HDate.ToString() : DateTime.Now.ToString()) + "'," +
                                (oSub.HBeginBalance != null && oSub.HBeginBalance != 0 ? oSub.HBeginBalance.ToString() : "0") + "," +
                                (oSub.HEndBalance != null && oSub.HEndBalance != 0 ? oSub.HEndBalance.ToString() : "0") + "," +
                                (oSub.HTimes != null && oSub.HTimes != 0 ? oSub.HTimes.ToString() : "0") +
                                (oSub.HTimes != null && oSub.HTimes != 0 ? oSub.HTimes.ToString() : "0")  +","+
                                (oSub.HProcID != null && oSub.HProcID != 0 ? oSub.HProcID.ToString() : "0") +
                                ")";

                        oCn.RunProc(subSql);

 Model/Model.csproj

@@ -106,6 +106,7 @@
    <Compile Include="仓库管理\ClsKf_TrolleyPositionBillSub.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_PurPrice_Model.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_MatePrice_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CostAverageTypeSub_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_Gy_CostItemAverageType_Model_2.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CostItemFixRate_Model_2.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CostCenter_Model_2.cs" />

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_CostAverageTypeSub_Model.cs

New file
@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsGy_CostAverageTypeSub_Model : DBUtility.ClsXt_BaseBillSub
    {
        public int HWeight;       //quanzhong
        public int HMaterTypeID;       //物料类型

    }
}

 Model/³É±¾¹ÜÀí/ClsCB_ItemMoneyBillSub_1.cs

@@ -12,6 +12,7 @@
        public double HPrice;           // å•ä»·
        public double HMoney;           // é‡‘额
        public int HMaterID;            // ç‰©æ–™å†…码
        public int HProcID;            // ç‰©æ–™å†…码
        public double HWaster;          // æŸè€—
        public DateTime HDate;          // æ—¥æœŸ
        public decimal HBeginBalance;   // å¼€å§‹æ•°å€¼

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

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

@@ -24,4 +24,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
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> 28e8091a515d24a9cf82251f383f055a2ab0cff9

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/QC_ManagementController.cs

@@ -297,13 +297,13 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where  å…³é—­äºº='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillMainList where  å…³é—­äºº='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillMainList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where å…³é—­äºº='' ";
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillMainList where å…³é—­äºº='' ";
                    string sql = sql1 + sqlWhere+ " order by åˆ¶å•æ—¥æœŸ desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillMainList");
                }
            }
            catch (Exception e)

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

@@ -171,7 +171,8 @@
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            string msg2 = sArray[2].ToString();
            string msg4 = sArray[1].ToString();//子表

            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_Edit", 1, false, msg2))
@@ -190,10 +191,16 @@
            {
                DAL.ClsGy_CostAverageType_Ctl oBill = new DAL.ClsGy_CostAverageType_Ctl();
                List<Model.ClsGy_CostAverageType_Model> lsmain = new List<Model.ClsGy_CostAverageType_Model>();
                List<Model.ClsGy_CostAverageTypeSub_Model> lssub = new List<Model.ClsGy_CostAverageTypeSub_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                msg1 = "[" + msg1.ToString() + "]";
                msg4 = msg4.Substring(1, msg4.Length - 2);
                msg4 = msg4.Replace("\\", "");
                msg4 = msg4.Replace("\n", "");  //\n
                msg4 = "[" + msg4.ToString() + "]";
                lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostAverageType_Model>>(msg1);
                lssub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostAverageTypeSub_Model>>(msg4);
                foreach (Model.ClsGy_CostAverageType_Model oItem in lsmain)
                {
                    if (oItem.HNumber.Trim() == "")
@@ -308,7 +315,19 @@
                    oItem.HMakeEmp = msg2;//创建人
                    oBill.oModel = oItem;
                }
                int i = 0;
                foreach (Model.ClsGy_CostAverageTypeSub_Model oItemSub in lssub)
                {
                    i++;
                    oItemSub.HEntryID = i;


                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);

                }
                //保存
                //保存完毕后处理
                bool bResult;
@@ -838,7 +857,7 @@
                    oCN.RollBack();//回滚事务
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "数据已删除无法再次删除！";
                    objJsonResult.Message = "数据已被禁用无法再次删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

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

@@ -45,9 +45,9 @@
                    return objJsonResult;
                }

                string sql1 = "SELECT * from h_v_Gy_CostCenter_1 where 1 = 1";
                string sql1 = "SELECT * from h_v_Gy_CostCenterList where 1 = 1";
                string sql = sql1 + sWhere + " order by æˆæœ¬ä¸­å¿ƒä»£ç  ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CostCenter_1");
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CostCenterList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -97,7 +97,7 @@
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + HInterID, "Gy_CostCenter_1");
                var ds = oCN.RunProcReturn("select * from Gy_CostCenter where HItemID=" + HInterID, "Gy_CostCenter");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
@@ -160,7 +160,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostCenter_1 set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostCenter set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);

                    //审核后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostCenter_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -218,7 +218,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostCenter_1 set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostCenter set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);

                    //反审核后控制========================h_p_Gy_CostCenter_AfterUnCheckCtrl=================      
                    string sql2 = "exec h_p_Gy_CostCenter_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -296,7 +296,7 @@
                }
                oCN.BeginTran();//开始事务

                ds = oCN.RunProcReturn("select * from Gy_CostCenter_1  where HItemID=" + HItemID, "Gy_CostCenter_1 ");
                ds = oCN.RunProcReturn("select * from Gy_CostCenter  where HItemID=" + HItemID, "Gy_CostCenter ");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
@@ -351,7 +351,7 @@
                //================================================================================== 


                oCN.RunProc("delete Gy_CostCenter_1  where HItemID=" + HItemID);
                oCN.RunProc("delete Gy_CostCenter  where HItemID=" + HItemID);


                //删除后控制=========================================      
@@ -422,7 +422,7 @@
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + HInterID, "Gy_CostCenter_1");
                var ds = oCN.RunProcReturn("select * from Gy_CostCenter where HItemID=" + HInterID, "Gy_CostCenter");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsStop == 0)  //禁用判断
@@ -486,7 +486,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostCenter_1 set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostCenter set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);

                    //禁用后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostCenter_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -544,7 +544,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostCenter_1 set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostCenter set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);

                    //反禁用后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostCenter_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -649,7 +649,7 @@
                    }
                    //查询数据中是否存在重复代码

                    ds = oCN.RunProcReturn("select * from  Gy_CostCenter_1 where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostCenter_1");
                    ds = oCN.RunProcReturn("select * from  Gy_CostCenter where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostCenter");
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
@@ -700,7 +700,7 @@
                    {
                        //已审核不允许修改
                        DataSet dss;
                        dss = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + oItem.HItemID, "Gy_CostCenter_1");
                        dss = oCN.RunProcReturn("select * from Gy_CostCenter where HItemID=" + oItem.HItemID, "Gy_CostCenter");
                        //判断是否可编辑
                        if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                        {
@@ -803,8 +803,8 @@
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = $@"select * from h_v_Gy_CostCenter_1 where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostCenter_1");
                string sql1 = $@"select * from h_v_Gy_CostCenterList where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostCenterList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {

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

@@ -45,9 +45,9 @@
                    return objJsonResult;
                }

                string sql1 = "SELECT * from h_v_Gy_CostItemAverageType_1 where 1 = 1";
                string sql1 = "SELECT * from h_v_Gy_CostItemAverageTypeList where 1 = 1";
                string sql = sql1 + sWhere + " order by æˆæœ¬é¡¹ç›®åˆ†é…æ ‡å‡†ä»£ç ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CostItemAverageType_1");
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CostItemAverageTypeList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -98,7 +98,7 @@
                }


                var ds = oCN.RunProcReturn("select * from Gy_CostItemAverageType_1 where HItemID=" + HInterID, "Gy_CostItemAverageType_1");
                var ds = oCN.RunProcReturn("select * from Gy_CostItemAverageType where HItemID=" + HInterID, "Gy_CostItemAverageType");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
@@ -161,7 +161,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItemAverageType_1 set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItemAverageType set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);

                    //审核后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItemAverageType_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -219,7 +219,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItemAverageType_1 set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItemAverageType set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);

                    //反审核后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItemAverageType_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -297,7 +297,7 @@
                }
                oCN.BeginTran();//开始事务

                ds = oCN.RunProcReturn("select * from Gy_CostItemAverageType_1  where HItemID=" + HItemID, "Gy_CostItemAverageType_1");
                ds = oCN.RunProcReturn("select * from Gy_CostItemAverageType  where HItemID=" + HItemID, "Gy_CostItemAverageType");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
@@ -352,7 +352,7 @@
                //================================================================================== 


                oCN.RunProc("delete Gy_CostItemAverageType_1  where HItemID=" + HItemID);
                oCN.RunProc("delete Gy_CostItemAverageType  where HItemID=" + HItemID);


                //删除后控制=========================================      
@@ -423,7 +423,7 @@
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_CostItemAverageType_1 where HItemID=" + HInterID, "Gy_CostItemAverageType_1");
                var ds = oCN.RunProcReturn("select * from Gy_CostItemAverageType where HItemID=" + HInterID, "Gy_CostItemAverageType");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsStop == 0)  //禁用判断
@@ -487,7 +487,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItemAverageType_1 set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItemAverageType set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);

                    //禁用后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItemAverageType_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -545,7 +545,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItemAverageType_1 set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItemAverageType set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);

                    //反禁用后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItemAverageType_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -650,7 +650,7 @@
                    }
                    //查询数据中是否存在重复代码

                    ds = oCN.RunProcReturn("select * from  Gy_CostItemAverageType_1 where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostItemAverageType_1");
                    ds = oCN.RunProcReturn("select * from  Gy_CostItemAverageType where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostItemAverageType");
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
@@ -701,7 +701,7 @@
                    {
                        //已审核不允许修改
                        DataSet dss;
                        dss = oCN.RunProcReturn("select * from Gy_CostItemAverageType_1 where HItemID=" + oItem.HItemID, "Gy_CostItemAverageType_1");
                        dss = oCN.RunProcReturn("select * from Gy_CostItemAverageType where HItemID=" + oItem.HItemID, "Gy_CostItemAverageType");
                        //判断是否可编辑
                        if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                        {
@@ -804,8 +804,8 @@
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = $@"select * from h_v_Gy_CostItemAverageType_1 where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostItemAverageType_1");
                string sql1 = $@"select * from h_v_Gy_CostItemAverageTypeList where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostItemAverageTypeList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {

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

@@ -45,9 +45,9 @@
                    return objJsonResult;
                }

                string sql1 = "SELECT * from h_v_Gy_CostItem_1 where 1 = 1";
                string sql1 = "SELECT * from h_v_Gy_CostItemList where 1 = 1";
                string sql = sql1 + sWhere + " order by æˆæœ¬é¡¹ç›®ä»£ç  ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CostItem_1");
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CostItemList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -98,7 +98,7 @@
                }
                

             var ds = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + HInterID, "Gy_CostItem_1");
             var ds = oCN.RunProcReturn("select * from Gy_CostItem where HItemID=" + HInterID, "Gy_CostItem");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
@@ -161,7 +161,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItem_1 set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItem set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);

                    //审核后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItem_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -219,7 +219,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItem_1 set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItem set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);

                    //反审核后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItem_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -297,7 +297,7 @@
                 }
                 oCN.BeginTran();//开始事务

                 ds = oCN.RunProcReturn("select * from Gy_CostItem_1  where HItemID=" + HItemID, "Gy_CostItem_1 ");
                 ds = oCN.RunProcReturn("select * from Gy_CostItem  where HItemID=" + HItemID, "Gy_CostItem ");
                 if (ds.Tables[0].Rows.Count > 0)
                 {
                     if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
@@ -352,7 +352,7 @@
                 //================================================================================== 


                 oCN.RunProc("delete Gy_CostItem_1  where HItemID=" + HItemID);
                 oCN.RunProc("delete Gy_CostItem  where HItemID=" + HItemID);


                 //删除后控制=========================================      
@@ -423,7 +423,7 @@
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + HInterID, "Gy_CostItem_1");
                var ds = oCN.RunProcReturn("select * from Gy_CostItem where HItemID=" + HInterID, "Gy_CostItem");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsStop == 0)  //禁用判断
@@ -487,7 +487,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItem_1 set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItem set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);

                    //禁用后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItem_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -545,7 +545,7 @@
                    }
                    //================================================================================== 

                    oCN.RunProc("update Gy_CostItem_1 set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
                    oCN.RunProc("update Gy_CostItem set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);

                    //反禁用后控制=========================================      
                    string sql2 = "exec h_p_Gy_CostItem_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
@@ -650,7 +650,7 @@
                    }
                    //查询数据中是否存在重复代码

                    ds = oCN.RunProcReturn("select * from  Gy_CostItem_1 where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostItem_1");
                    ds = oCN.RunProcReturn("select * from  Gy_CostItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostItem");
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
@@ -701,7 +701,7 @@
                    {
                        //已审核不允许修改
                        DataSet dss;
                        dss = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + oItem.HItemID, "Gy_CostItem_1");
                        dss = oCN.RunProcReturn("select * from Gy_CostItem where HItemID=" + oItem.HItemID, "Gy_CostItem");
                        //判断是否可编辑
                        if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                        {
@@ -804,8 +804,8 @@
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = $@"select * from h_v_Gy_CostItem_1 where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostItem_1");
                string sql1 = $@"select * from h_v_Gy_CostItemList where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostItemList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {

 WebAPI/Controllers/³É±¾¹ÜÀí/CB_ItemMoneyBillController.cs

@@ -1020,14 +1020,15 @@
                    string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["职员"].ToString());

                    string HICMOBillNo = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["生产订单号"].ToString());
                    string HProc = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["工序"].ToString());

                    string HCostItemNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["成本项目代码"].ToString());
                    string HCostItemName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["成本项目"].ToString());

                    //string HEntryID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子表内码"].ToString());

                    string HDepNumber_sub = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子部门代码"].ToString());
                    string HDepName_sub = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子部门"].ToString());
                    //string HDepNumber_sub = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子部门代码"].ToString());
                    //string HDepName_sub = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子部门"].ToString());

                    string HMaterNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["物料编码"].ToString());
                    string HMaterName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["物料名称"].ToString());
@@ -1110,10 +1111,11 @@

                // 1. æ”¶é›†æ‰€æœ‰éœ€è¦æŸ¥è¯¢çš„数据
                var HBillnos = list.Select(x => x["单据号"].ToString()).Distinct().ToList();
                var HDeptNames = list.Select(x => x["部门"].ToString()).Distinct().ToList();
                var HDeptNumbers = list.Select(x => x["部门代码"].ToString()).Distinct().ToList();
                var HDeptNames_sub = list.Select(x => x["子部门"].ToString()).Distinct().ToList();
                var HDeptNumbers_sub = list.Select(x => x["子部门代码"].ToString()).Distinct().ToList();
                var HProc = list.Select(x => x["工序"].ToString()).Distinct().ToList();
                //var HDeptNames = list.Select(x => x["部门"].ToString()).Distinct().ToList();
                //var HDeptNumbers = list.Select(x => x["部门代码"].ToString()).Distinct().ToList();
                var HDeptNames_sub = list.Select(x => x["部门"].ToString()).Distinct().ToList();
                var HDeptNumbers_sub = list.Select(x => x["部门代码"].ToString()).Distinct().ToList();
                var materialNumbers = list.Select(x => x["物料编码"].ToString()).Distinct().ToList();
                var materialNames = list.Select(x => x["物料名称"].ToString()).Distinct().ToList();
                var EmpNumbers = list.Select(x => x["职员代码"].ToString()).Distinct().ToList();
@@ -1131,14 +1133,14 @@
                    ICMODict[row["HBillNo"].ToString()] = (int)row["HInterID"];
                }

                // 2. æ‰¹é‡æŸ¥è¯¢ä¸»å­è¡¨éƒ¨é—¨ä¿¡æ¯
                string supplierQuery = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames.Select(s => $"'{s.Replace("'", "''")}'"))})";
                DataSet supData = oCN.RunProcReturn(supplierQuery, "Gy_Department");
                Dictionary<string, int> supplierDict = new Dictionary<string, int>();
                foreach (DataRow row in supData.Tables[0].Rows)
                {
                    supplierDict[row["HName"].ToString()] = (int)row["HItemID"];
                }
                //// 2. æ‰¹é‡æŸ¥è¯¢ä¸»å­è¡¨éƒ¨é—¨ä¿¡æ¯
                //string supplierQuery = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames.Select(s => $"'{s.Replace("'", "''")}'"))})";
                //DataSet supData = oCN.RunProcReturn(supplierQuery, "Gy_Department");
                //Dictionary<string, int> supplierDict = new Dictionary<string, int>();
                //foreach (DataRow row in supData.Tables[0].Rows)
                //{
                //    supplierDict[row["HName"].ToString()] = (int)row["HItemID"];
                //}

                // 2.1 æ‰¹é‡æŸ¥è¯¢ä¸»å­è¡¨éƒ¨é—¨ä¿¡æ¯
                string supplierQuery_sub = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames_sub.Select(s => $"'{s.Replace("'", "''")}'"))})";
@@ -1180,7 +1182,15 @@
                    string key = $"{row["HName"].ToString()}";
                    CostDict[key] = (int)row["HItemID"];
                }

                // 3.1 æ‰¹é‡æŸ¥è¯¢å·¥åºä¿¡æ¯
                string ProcessQuery = $"SELECT HItemID, HNumber, HName FROM Gy_Process WHERE  HName IN ({string.Join(",", HProc.Select(m => $"'{m.Replace("'", "''")}'"))})";
                DataSet ProcData = oCN.RunProcReturn(ProcessQuery, "Gy_Process");
                Dictionary<string, int> ProcDict = new Dictionary<string, int>();
                foreach (DataRow row in ProcData.Tables[0].Rows)
                {
                    string key = $"{row["HName"].ToString()}";
                    ProcDict[key] = (int)row["HItemID"];
                }
                // 4. æŸ¥è¯¢ç”¨æˆ·ä¿¡æ¯
                DataSet emp = oCN.RunProcReturn($"SELECT Czybm FROM Gy_Czygl WHERE Czymc = '{user.Replace("'", "''")}'", "Gy_Czygl");
                if (emp.Tables[0].Rows.Count == 0)
@@ -1210,7 +1220,7 @@
                    string materialKey = $"{materialNumber}_{materialName}";

                    // æ£€æŸ¥ä¾›åº”商
                    if (!supplierDict.ContainsKey(supplier))
                    if (!supplierDict_sub.ContainsKey(supplier))
                    {
                        missingSupplierMessages.Add($"第{lineNumber}行的部门【{supplier}】");
                    }
@@ -1317,9 +1327,10 @@
                        {
                            int HMaterID = materialDict[$"{item["物料编码"]}_{item["物料名称"]}"];
                            int HCostID = CostDict[item["成本项目"]];
                            int HProcID = ProcDict[item["工序"]];

                            insertSql_sub.AppendLine($"INSERT INTO [CB_ItemMoneyBillSub] ([HInterID], [HEntryID], [HCloseMan], [HEntryCloseDate], [HCloseType], [HRemark],[HSourceInterID], [HSourceEntryID], [HSourceBillNo], [HSourceBillType],[HRelationQty], [HRelationMoney], [HBillNo_bak], [HCostItemID],[HDeptID], [HQty], [HPrice], [HMoney],[HMaterID], [HWaster], [HDate], [HBeginBalance], [HEndBalance], [HTimes]) VALUES (");
                            insertSql_sub.AppendLine($"'{HInterID}', '{HEntryID}', '{""}', '{DateTime.Now}', '{"0"}', '{"excel导入"}','{"0"}', '{"0"}',  '{"0"}', '{"0"}','{"0"}', '{"0"}', '{""}', '{HCostID}', '{HSupplierID}', '{item["数量"]}', '{item["单价"]}', '{item["金额"]}','{HMaterID}', '{item["损耗量"] ?? "0"}', '{DateTime.Now}', '{"0"}', '{"0"}', '{"0"}');");
                            insertSql_sub.AppendLine($"INSERT INTO [CB_ItemMoneyBillSub] ([HInterID], [HEntryID], [HCloseMan], [HEntryCloseDate], [HCloseType], [HRemark],[HSourceInterID], [HSourceEntryID], [HSourceBillNo], [HSourceBillType],[HRelationQty], [HRelationMoney], [HBillNo_bak], [HCostItemID],[HDeptID], [HQty], [HPrice], [HMoney],[HMaterID], [HWaster], [HDate], [HBeginBalance], [HEndBalance], [HTimes],[HProcID]) VALUES (");
                            insertSql_sub.AppendLine($"'{HInterID}', '{HEntryID}', '{""}', '{DateTime.Now}', '{"0"}', '{"excel导入"}','{"0"}', '{"0"}',  '{"0"}', '{"0"}','{"0"}', '{"0"}', '{""}', '{HCostID}', '{HSupplierID}', '{item["数量"]}', '{item["单价"]}', '{item["金额"]}','{HMaterID}', '{item["损耗量"] ?? "0"}', '{DateTime.Now}', '{"0"}', '{"0"}', '{"0"}', '{HProcID}');");
                            HEntryID++;
                        }
                    }

 WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\API</_PublishTargetUrl>
    <History>True|2026-01-23T08:43:00.5233443Z;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>
    <History>True|2026-02-24T05:26:35.7198126Z;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+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>01/23/2026 15:18:20</publishTime>
      <publishTime>02/24/2026 13:26:24</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>01/23/2026 15:18:20</publishTime>
      <publishTime>02/24/2026 13:26:24</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/23/2026 15:18:17</publishTime>
      <publishTime>02/24/2026 13:26:17</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>01/23/2026 15:18:17</publishTime>
      <publishTime>02/24/2026 13:26:17</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/23/2026 08:08:34</publishTime>
      <publishTime>02/09/2026 09:02:43</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>01/23/2026 08:08:34</publishTime>
      <publishTime>02/09/2026 09:02:43</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -113,20 +113,35 @@
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.SignalR.Core.dll">
      <publishTime>05/04/2017 10:25:34</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.SignalR.SystemWeb.dll">
      <publishTime>05/04/2017 10:25:40</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/19/2015 01:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.dll">
      <publishTime>01/19/2019 04:50:30</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.Host.SystemWeb.dll">
      <publishTime>01/19/2019 04:50:50</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.Security.dll">
      <publishTime>01/19/2019 04:51:10</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/23/2026 13:57:29</publishTime>
      <publishTime>02/24/2026 13:17:31</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>01/23/2026 13:57:29</publishTime>
      <publishTime>02/24/2026 13:17:31</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/18/2025 16:11:18</publishTime>
@@ -158,35 +173,38 @@
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Owin.dll">
      <publishTime>11/13/2012 20:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>01/23/2026 08:08:32</publishTime>
      <publishTime>02/09/2026 09:02:39</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>01/23/2026 08:08:32</publishTime>
      <publishTime>02/09/2026 09:02:39</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/23/2026 08:08:33</publishTime>
      <publishTime>02/09/2026 09:02:41</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>01/23/2026 08:08:33</publishTime>
      <publishTime>02/09/2026 09:02:41</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/23/2026 08:08:33</publishTime>
      <publishTime>02/09/2026 09:02:41</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>01/23/2026 08:08:33</publishTime>
      <publishTime>02/09/2026 09:02:41</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>01/21/2026 13:43:10</publishTime>
      <publishTime>02/09/2026 08:59:39</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/21/2026 13:43:10</publishTime>
      <publishTime>02/09/2026 08:59:39</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -297,22 +315,37 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/21/2026 13:43:13</publishTime>
      <publishTime>02/24/2026 13:24:07</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/21/2026 13:43:13</publishTime>
      <publishTime>02/24/2026 13:24:07</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>01/23/2026 16:42:59</publishTime>
      <publishTime>02/24/2026 13:26:33</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>01/23/2026 16:42:59</publishTime>
      <publishTime>02/24/2026 13:26:33</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.Core.resources.dll">
      <publishTime>05/04/2017 10:34:10</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.SystemWeb.resources.dll">
      <publishTime>05/04/2017 10:34:16</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.Owin.Host.SystemWeb.resources.dll">
      <publishTime>01/18/2019 20:59:56</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.Owin.resources.dll">
      <publishTime>01/18/2019 20:59:58</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.Owin.Security.resources.dll">
      <publishTime>01/18/2019 21:00:00</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 21:26:02</publishTime>
@@ -399,10 +432,16 @@
      <publishTime>08/18/2025 16:11:18</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/19/2026 14:06:44</publishTime>
      <publishTime>02/06/2026 14:36:49</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/08/2025 10:29:30</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.js">
      <publishTime>02/06/2026 14:36:49</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.min.js">
      <publishTime>02/06/2026 14:36:49</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>09/12/2025 10:51:38</publishTime>
@@ -513,7 +552,7 @@
      <publishTime>10/27/2025 08:51:29</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>01/23/2026 08:08:47</publishTime>
      <publishTime>02/09/2026 09:03:01</publishTime>
    </File>
  </ItemGroup>
</Project>

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

@@ -26,3 +26,5 @@
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
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\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