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

wtt

2025-07-01 e7ef7f02094dbfc44950cb5bb363b95f0c77c57a

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

 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

 DAL/DAL.csproj

@@ -80,6 +80,7 @@
  <ItemGroup>
    <Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
    <Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
    <Compile Include="仓库管理\小车锁定\ClsKf_TrolleyPositionBill.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_PatrolCheckItemMethod_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_PatrolCheckItemClass_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_MaintainClass_Ctl.cs" />

 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/²Ö¿â¹ÜÀí/С³µËø¶¨/ClsKf_TrolleyPositionBill.cs

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

namespace DAL
{
    public class ClsKf_TrolleyPositionBill : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsKf_TrolleyPositionBillMain omodel = new Model.ClsKf_TrolleyPositionBillMain();
        public List<Model.ClsKf_TrolleyPositionBillSub> DetailColl = new List<Model.ClsKf_TrolleyPositionBillSub>();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        public ClsKf_TrolleyPositionBill()
        {
            base.MvarItemKeySub = "Kf_TrolleyPositionBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Kf_TrolleyPositionBillMain";
            base.MvarReportTitle = "小车锁定";
            base.BillType = "10004";
            base.HBillSubType = "10004";

        }

        #region å›ºå®šä»£ç 

        ~ClsKf_TrolleyPositionBill()
        {
            DetailColl = null;
        }

        #endregion   è‡ªå®šä¹‰æ–¹æ³•
           
        
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            string sErr = "";
            try
            {
                //得到mainid
                if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
                {
                    omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                }             

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_TrolleyPositionBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_TrolleyPositionBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================


                oCn.BeginTran();
                //插入主表
                oCn.RunProc("Insert Into Kf_TrolleyPositionBillMain   " +
                "(HInterID,HBillNo,HBillType,HBillSubType,HDate,HRemark" +
                ",HYear,HPeriod,HMaker,HMakeDate,HStockOrgID" +
                ",HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
                ",HWHID,HSPID,HSCWHID,HSCSPID" +
                ") " +
                " values(" + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HBillType + "','" + omodel.HBillSubType + "','" + omodel.HDate.ToShortDateString() + "','" + omodel.HRemark + "'" +
                ", " + omodel.HYear + "," + omodel.HPeriod + ",'" + omodel.HMaker + "',getdate()," + omodel.HSTOCKORGID.ToString() +
                ",'" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "'" +
                ", " + omodel.HWHID.ToString() + "," + omodel.HSPID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HSCSPID.ToString() +
                ") ");

              
                sErr = sErr + "1;";
                //插入子表
                foreach (Model.ClsKf_TrolleyPositionBillSub oSub in DetailColl)
                {
                    string sql1 = string.Format(@"Insert into Kf_TrolleyPositionBillSub " +
                      " (HInterID,HEntryID,HBillNo_bak,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
                      "HRelationQty,HRelationMoney," +
                      "HMaterID,HUnitID,HWhID,HSCWHID,HSPID,HSCSPID,HCarBarCode,HEquipID,HEquipBarCode," +
                      "HICMOInterID,HICMOEntryID,HICMOBillNo,HProcessExchangeInterID,HProcessExchangeEntryID,HProcessExchangeBillNo,HStockOrgID" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
                      + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HMaterID + "," + oSub.HUnitID + "," + oSub.HWhID + ","
                      + oSub.HSCWHID + "," + oSub.HSPID + "," + oSub.HSCSPID + ",'" + oSub.HCarBarCode + "'," + oSub.HEquipID + ",'" + oSub.HEquipBarCode + "'," + oSub.HICMOInterID + "," + oSub.HICMOEntryID + ",'"
                      + oSub.HICMOBillNo + "'," + oSub.HProcessExchangeInterID + "," + oSub.HProcessExchangeEntryID + ",'" + oSub.HProcessExchangeBillNo + "',"
                      + omodel.HSTOCKORGID +                        
                      ") ");
                    sErr = sErr + sql1 + "2;";
                    oCn.RunProc(sql1);
                   
                    sErr = sErr + "3;";
                }               

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_TrolleyPositionBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_TrolleyPositionBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = sErr + "," + e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn("Select * from Kf_TrolleyPositionBillMain Where HInterID=" + lngBillKey.ToString() , "Kf_TrolleyPositionBillMain");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据未找到！";
                    return false;
                }
                //固定赋值===========================================
                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
                omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
                omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
                omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
                omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
                omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
                omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
                omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
                omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
                omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                //========================================================
              
                //
                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from Kf_TrolleyPositionBillSub Where HInterID=" + lngBillKey.ToString() , "Kf_TrolleyPositionBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsKf_TrolleyPositionBillSub oSub = new Model.ClsKf_TrolleyPositionBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HBillNo_bak = DsSub.Tables[0].Rows[i]["HBillNo_bak"].ToString().Trim();
                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
                    oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty_In"]);
                    oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty_Out"]);
                    oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty_WWOrder"]);
                    oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty_Bad"]);
                    oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
                    //===================================================
                
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
    }
}

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.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/Model.csproj

@@ -97,6 +97,8 @@
    <Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
    <Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
    <Compile Include="ClsGy_PatrolCheckItemMethod_Model.cs" />
    <Compile Include="仓库管理\ClsKf_TrolleyPositionBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_TrolleyPositionBillSub.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_PatrolCheckItemClass_Model.cs" />
    <Compile Include="仓库管理\ClsKf_WorkShopICStockBillMain.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_MaintainClass_Model.cs" />

 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/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

 Model/²Ö¿â¹ÜÀí/ClsKf_TrolleyPositionBillMain.cs

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

namespace Model
{
    public class ClsKf_TrolleyPositionBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HWHID;         //   int            --调入仓库
        public Int64 HSPID;     //  int               --调入仓位
        public Int64 HSCWHID;         //   int             --调出仓库
        public Int64 HSCSPID;           //     int             --调出仓位

    }
}

 Model/²Ö¿â¹ÜÀí/ClsKf_TrolleyPositionBillSub.cs

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

namespace Model
{
    public class ClsKf_TrolleyPositionBillSub : DBUtility.ClsXt_BaseBillSub
    {       
        public Int64 HMaterID;
        public Int64 HUnitID;
        public Int64 HWhID;
        public Int64 HSCWHID;
        public Int64 HSPID;
        public Int64 HSCSPID;
        public string HCarBarCode;
        public Int64 HEquipID;
        public string HEquipBarCode;
        public Int64 HICMOInterID; 
        public Int64 HICMOEntryID;
        public string HICMOBillNo;
        public Int64 HProcessExchangeInterID;
        public Int64 HProcessExchangeEntryID;
        public string HProcessExchangeBillNo;
        public Int64 HStockOrgID;
    }
}



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

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

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

@@ -4,18 +4,8 @@
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
<<<<<<< HEAD
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
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
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.AssemblyReference.cache
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
>>>>>>> 890dc6768737055d28277915fdb3abfc3d366e64
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs

@@ -10,6 +10,7 @@
using System.Web;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Models.基础资料;
using WebAPI.Service;

namespace WebAPI.Controllers
@@ -288,6 +289,7 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();

@@ -304,6 +306,7 @@
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg2);
                List<ClsGy_EmployeeSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EmployeeSub>>(msg4);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
@@ -482,6 +485,29 @@
                      "','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "','"+ msg3 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

                    DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_Employee where HNumber = N'" + HNumber + "'", "Gy_Employee");

                    if (temp_ds.Tables[0].Rows.Count < 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "保存失败!原因：插入数据失败";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }

                    int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
                    string sql3 = "";
                    foreach (ClsGy_EmployeeSub listOne in list1)
                    {
                        sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
                        + itemID + "," + listOne.HPostID +",N'" + listOne.HRemark + "');";

                    }
                    LogService.Write(sql3);
                    oCN.RunProcReturn(sql3, "Gy_Employee_Post");
                    oCN.Commit();
                }
                else
@@ -587,6 +613,17 @@

                    ",HAddress='" +  HAddress.ToString() + "'" +
                    ",HDeptID= '" +  HDeptID + "' Where HItemID=" + HItemID);

                    oCN.RunProcReturn("delete from Gy_Employee_Post where HEmpID = " + HItemID, "Gy_Employee_Post");

                    string sql3 = "";
                    foreach (ClsGy_EmployeeSub listOne in list1)
                    {
                        sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
                       + HItemID + "," + listOne.HPostID  + ",N'" + listOne.HRemark + "');";
                    }
                    LogService.Write(sql3);
                    oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
                    oCN.Commit();
                }
                objJsonResult.code = "0";
@@ -840,7 +877,52 @@
        //    }
        //}

        /// <summary>
        /// æŸ¥è¯¢å­è¡¨æ–¹æ³•
        /// </summary>
        [Route("Gy_Employee/listSub")]
        [HttpGet]
        public object listSub(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Employee_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeSubList where 1 = 1 " + sWhere + " order by HItemID ", "h_v_IF_EmployeeSubList");

                //添加列名
                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;
            }
        }

        /// <summary>
        /// èŒå‘˜è®¾ç½®èŽ·å–信息

 WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs

@@ -784,7 +784,6 @@
                    }
                    //================================================================================== 

                    LogService.Write("主表插入语句");
                    string sql_Temp = "Insert into Gy_WorkCenter " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HDeptNumber,HWorkTimes,HQty,HUseFlag" +
@@ -813,7 +812,6 @@
                    }

                    int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
                    LogService.Write(itemID);
                    string sql3 = "";
                    foreach (ClsGy_WorkCenterSub listOne in list1)
                    {

 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs

@@ -409,7 +409,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.Message = "保存失败err！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -286,6 +286,7 @@
                        var HEmpID = list[i]["HEmpID"].ToString();
                        var HWorkQty = list[i]["小时产能"].ToString();
                        var HSourceName = list[i]["生产资源"].ToString();
                        var HMouldID = list[i]["HMouldID"].ToString();
                        //var HWorkQty_ProdLine = list[i]["产线总产能"].ToString();

                        LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -324,7 +325,7 @@
                            " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
                            "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
                            ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName)values" +
                            ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName,HMouldID)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
@@ -332,7 +333,7 @@
                            $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
                            $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
                            $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
                            $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}')";
                            $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}','{HMouldID}')";

                        //LogService.Write("sql:" + sql);
                        //主表
@@ -378,6 +379,7 @@
                        var HOrderLev = list[i]["订单等级"].ToString();
                        var HPlanQty = list[i]["计划数量"].ToString();
                        var HEmpID = list[i]["HEmpID"].ToString();
                         var HMouldID = list[i]["HMouldID"].ToString();

                        LogService.CustomWriteLog("2.1:"+i, DateTime.Now.ToString("yyyy-MM-dd"));
                        
@@ -535,7 +537,7 @@

                            oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX}" +
                                $",HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
                                $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
                                $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine},HMouldID={HMouldID}" +
                                $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["单据号"].ToString()}'");
                        }                       
                    }

 WebAPI/Controllers/»ªÔ¶datamapping/Gy_PNLInfoController.cs

@@ -582,7 +582,9 @@
                sb.Append("HRowCount=N'" + list[0].HRowCount + "',");
                sb.Append("HColCount=N'" + list[0].HColCount + "',");
                sb.Append("HPNLPosition_x=N'" + list[0].HPNLPosition_x + "',");
                sb.Append("HPNLPosition_y=N'" + list[0].HPNLPosition_y + "'");
                sb.Append("HPNLPosition_y=N'" + list[0].HPNLPosition_y + "',");
                sb.Append("HModifyMan=N'" + msg4 + "',");
                sb.Append("HModifyDate=getdate()");
                sb.Append(" where HInterID=N'" + list[0].HInterID + "'");
                string sql1 = sb.ToString();
                oCN.RunProcReturn(sql1, "Gy_PNLInfo");
@@ -646,7 +648,7 @@
                // å­è¡¨åˆ é™¤
                string delWhereStr = "(" + string.Join(",", delEntryIDList.ToArray()) + ")";
                string sql2 = "Delete from Gy_PNLInfoSub where HEntryID in " + delWhereStr;
                //LogService.Write("执行SQL语句：" + sql2);
                LogService.Write("执行SQL语句：" + sql2);
                oCN.RunProcReturn(sql2, "Gy_PNLInfoSub");


@@ -656,9 +658,9 @@

                // åˆ¤æ–­æ˜¯å¦æœ‰set码或者PCS码重复的部分
                ds = oCN.RunProcReturn("select top 1 HEntryID from Gy_PNLInfoSub where HSetNo in " + HSetNoInStr
                    + "AND HPCSNo in " + HPCSNoInStr, "Gy_PNLInfoSub");
                //LogService.Write("执行 SQL è¯­å¥: select top 1 HEntryID from Gy_PNLInfoSub where HSetNo in " + HSetNoInStr
                //    + "AND HPCSNo in " + HPCSNoInStr);
                    + " AND HPCSNo in " + HPCSNoInStr + "and HInterID = " + list[0].HInterID , "Gy_PNLInfoSub");
                LogService.Write("执行 SQL è¯­å¥: select top 1 HEntryID from Gy_PNLInfoSub where HSetNo in " + HSetNoInStr
                    + " AND HPCSNo in " + HPCSNoInStr + "and HInterID = " + list[0].HInterID);

                if (ds.Tables[0].Rows.Count > 0)
                {
@@ -720,6 +722,367 @@
                return objJsonResult;
            }
        }
    #endregion
        #endregion

        #region å®¡æ ¸PNL布局
        [Route("Gy_PNLInfoController/CheckBill")]
        [HttpGet]
        public object CheckBill(int HInterID, string user, int IsAudit)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_PNLInfo_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select top 1 HCheckMan from Gy_PNLInfo  where HInterID=" + HInterID, "Gy_PNLInfo");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
                    {
                        if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) != true)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反审核判断
                    {
                        if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) == true)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }



                oCN.BeginTran();

                if (IsAudit == 0)  //审核判断
                {
                    //审核前控制=========================================
                    ds = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_BeforeCheckCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_BeforeCheckCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    oCN.RunProc("update Gy_PNLInfo set HCheckMan='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID);

                    //审核后控制=========================================
                    DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_AfterCheckCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_AfterCheckCtrl");
                    if (ds2 == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核后判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功";
                    objJsonResult.data = null;
                }
                if (IsAudit == 1) //反审核判断
                {
                    //反审核前控制=========================================
                    ds = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_BeforeUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_BeforeUnCheckCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    oCN.RunProc("update Gy_PNLInfo set HCheckMan='',HCheckDate=null where HInterID=" + HInterID);


                    //反审核后控制=========================================
                    DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_AfterUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_AfterUnCheckCtrl");
                    if (ds2 == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核后判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================


                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反审核成功";
                    objJsonResult.data = null;
                }



                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

        }
        #endregion

        #region ç¦ç”¨PNL布局
        [Route("Gy_PNLInfoController/StopBill")]
        [HttpGet]
        public object StopBill(int HInterID, string user, int IsStop)
        {
            try
            {
                //禁用权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_PNLInfo_Stop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "禁用失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select top 1 HStopMan from Gy_PNLInfo where HInterID=" + HInterID, "Gy_PNLInfo");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsStop == 0)  //禁用判断
                    {
                        if (ds.Tables[0].Rows[0]["HStopMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已禁用!不能再次禁用！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsStop == 1) //反禁用判断
                    {
                        if (ds.Tables[0].Rows[0]["HStopMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未禁用!不需要反禁用!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                if (IsStop == 0)  //禁用判断
                {
                    //禁用前控制=========================================
                    ds = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_BeforeStopCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_BeforeStopCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    oCN.RunProc("update Gy_PNLInfo set HStopMan='" + user + "',HStopDate=getdate() where HInterID=" + HInterID);

                    //禁用后控制=========================================
                    DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_AfterStopCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_AfterStopCtrl");
                    if (ds2 == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用后判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "禁用成功";
                    objJsonResult.data = null;
                }
                if (IsStop == 1) //反禁用判断
                {
                    //反禁用前控制=========================================
                    ds = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_BeforeUnStopCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_BeforeUnStopCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    oCN.RunProc("update Gy_PNLInfo set HStopMan='',HStopDate=null where HInterID=" + HInterID);


                    //反禁用后控制=========================================
                    DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_AfterUnStopCtrl " + HInterID + ",'" + user + "'", "h_p_Gy_PNLInfo_AfterUnStopCtrl");
                    if (ds2 == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用后判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "禁用失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反禁用成功";
                    objJsonResult.data = null;
                }
                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "禁用失败或者反禁用失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/»ªÔ¶datamapping/QC_CheckNote_PNL_TempController.cs

@@ -422,7 +422,9 @@
                sb.Append("HCheckProc=N'" + HCheckProc + "',");
                sb.Append("HBadReason=N'" + HBadReason + "',");
                sb.Append("HMaker=N'" + HMaker + "',");
                sb.Append("HMakeDate=N'" + HMakeDate + "'");
                sb.Append("HMakeDate=N'" + HMakeDate + "',");
                sb.Append("HModifyMan=N'" + msg3 + "',");
                sb.Append("HModifyDate=getdate()");
                sb.Append(" Where HItemID = " + HItemID);

                string sql = sb.ToString();
@@ -471,6 +473,190 @@
                return objJsonResult;
            }
        }
    #endregion
        #endregion

        #region å®¡æ ¸PNL检验信息
        [Route("QC_CheckNote_PNL_TempController/CheckBill")]
        [HttpGet]
        public object CheckBill(int HInterID, string user, int IsAudit)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("QC_CheckNote_PNL_Temp_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select top 1 HCheckMan from QC_CheckNote_PNL_Temp  where HItemID=" + HInterID, "QC_CheckNote_PNL_Temp");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
                    {
                        if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) != true)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反审核判断
                    {
                        if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) == true)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }



                oCN.BeginTran();

                if (IsAudit == 0)  //审核判断
                {
                    //审核前控制=========================================
                    ds = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_BeforeCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_BeforeCheckCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    oCN.RunProc("update QC_CheckNote_PNL_Temp set HCheckMan='" + user + "',HCheckDate=getdate() where HItemID=" + HInterID);

                    //审核后控制=========================================
                    DataSet ds2 = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_AfterCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_AfterCheckCtrl");
                    if (ds2 == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核后判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功";
                    objJsonResult.data = null;
                }
                if (IsAudit == 1) //反审核判断
                {
                    //反审核前控制=========================================
                    ds = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_BeforeUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_BeforeUnCheckCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================

                    oCN.RunProc("update QC_CheckNote_PNL_Temp set HCheckMan='',HCheckDate=null where HItemID=" + HInterID);


                    //反审核后控制=========================================
                    DataSet ds2 = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_AfterUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_AfterUnCheckCtrl");
                    if (ds2 == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核后判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //=========================================================


                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反审核成功";
                    objJsonResult.data = null;
                }



                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

        }
        #endregion
    }
}

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -4403,6 +4403,114 @@

        #endregion

        #region å°è½¦é”å®šå•    ä¸Šä¼ ç”Ÿå•

        /// <summary>
        /// å°è½¦é”å®šå•æ–°å¢žä¸Šä¼ 
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/set_SaveTrolleyPositionBill_Json2")]
        [HttpPost]
        public object set_SaveTrolleyPositionBill_Json([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string UserName = sArray[2].ToString();
            string OperationType = sArray[3].ToString();
            DBUtility.ClsPub.CurUserName = UserName;
            ListModels oListModels = new ListModels();
            try
            {
                DAL.ClsKf_TrolleyPositionBill oBill = new DAL.ClsKf_TrolleyPositionBill();
                List<Model.ClsKf_TrolleyPositionBillMain> lsmain = new List<Model.ClsKf_TrolleyPositionBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Kf_TrolleyPositionBillMain(msg2);

                foreach (Model.ClsKf_TrolleyPositionBillMain oItem in lsmain)
                {                                      
                    DBUtility.ClsPub.CurUserName = oItem.HMaker;
                    oItem.HBillType = "10004";
                    oItem.HBillSubType = "10004";
                    oItem.HBillStatus = 1;   //单据状态（1未审，2审核通过，3关闭，4作废，5审核退回,6审核中,7已阅，8已回复，9结案，10验证,11下达，12开工,13申请审批,15申请检验，16 åˆ¤å®šåˆæ ¼ï¼Œ17判定不合格）     
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }

                // è¡¨ä½“数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsKf_TrolleyPositionBillSub> ls = new List<Model.ClsKf_TrolleyPositionBillSub>();
                ls = oListModels.getObjectByJson_Kf_TrolleyPositionBillSub(msg3);
                int i = 0;
                foreach (Model.ClsKf_TrolleyPositionBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);
                }

                //保存
                //保存完毕后处理
                bool bResult;
                if (OperationType == "1")
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);                   
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.Verify = "N";
                }

                if (bResult)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "小车锁定单上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #endregion



 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill_WorkController.cs

@@ -44,7 +44,7 @@
                    sql += "and " + key + " = " + model.GetType().GetProperty(key).GetValue(model);
                }

                LogService.Write(sql);
                //LogService.Write(sql);
                return sql;
            }catch(Exception e)
            {
@@ -82,7 +82,7 @@
                    sWhere = sWhere.Replace("'", "''");
                }
                
                LogService.Write("exec h_p_PM_ProjectBill_StepsList '" + stage + "','" + sWhere + "'");
                //LogService.Write("exec h_p_PM_ProjectBill_StepsList '" + stage + "','" + sWhere + "'");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBill_StepsList '" + stage + "','" + sWhere + "'", "h_p_PM_ProjectBill_StepsList");

                //添加列名
@@ -119,18 +119,18 @@
            try
            {
                var _value = msg["oMainStr"].ToString();
                LogService.Write(_value);
                //LogService.Write(_value);
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0]; // è¡¨å•ä¸»ä½“
                string msg3 = sArray[1]; // æ‰€åœ¨é˜¶æ®µ
                string msg4 = sArray[2]; // æ“ä½œç”¨æˆ·
                LogService.Write(msg2);
                LogService.Write(msg3);
                LogService.Write(msg4);
                //LogService.Write(msg2);
                //LogService.Write(msg3);
                //LogService.Write(msg4);
                msg2 = "[" + msg2 + "]";
                List<ClsPM_ProjectBill_Work> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsPM_ProjectBill_Work>>(msg2);
                LogService.Write(list);
                //LogService.Write(list);
                if (string.Equals(msg3, "jiaodi", StringComparison.InvariantCultureIgnoreCase))
                {
                    list[0].HJiaodiSaveFlag = 1;
@@ -197,7 +197,7 @@
                    sWhere = sWhere.Replace("'", "''");
                }

                LogService.Write("exec h_p_PM_ProjectBill_FeeList '" + stage + "','" + sWhere + "'");
                //LogService.Write("exec h_p_PM_ProjectBill_FeeList '" + stage + "','" + sWhere + "'");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBill_FeeList '" + stage + "','" + sWhere + "'", "h_p_PM_ProjectBill_FeeList");

                //添加列名
@@ -234,7 +234,7 @@
            try
            {
                var _value = msg["oMainStr"].ToString();
                LogService.Write(_value);
                //LogService.Write(_value);
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0]; // è¡¨å•ä¸»ä½“
@@ -242,7 +242,7 @@
                string msg4 = sArray[2]; // æ“ä½œç”¨æˆ·
                msg2 = "[" + msg2 + "]";
                List<ClsPM_ProjectBill_WorkFee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsPM_ProjectBill_WorkFee>>(msg2);
                LogService.Write(list);
                //LogService.Write(list);
                if (string.Equals(msg3, "workFeeEntry", StringComparison.InvariantCultureIgnoreCase))
                {
                    list[0].HGongfeiluruSaveFlag = 1;

 WebAPI/DLL/ClsSc_ICMOReportBill.cs

@@ -192,6 +192,7 @@

                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
                {
                    LogService.Write("生产汇报单保存失败原因：" + ds.Tables[0].Rows[0]["HBackRemark"]);
                    sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
@@ -265,6 +266,7 @@
                    , "h_p_Sc_ICMOReportBill_ReverseWriteQty");
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
                {
                    LogService.Write("生产汇报单保存失败原因：" + ds.Tables[0].Rows[0]["HBackRemark"]);
                    sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
@@ -288,6 +290,7 @@

                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
                {
                    LogService.Write("生产汇报单保存失败原因：" + ds.Tables[0].Rows[0]["HBackRemark"]);
                    sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
@@ -300,6 +303,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("生产汇报单保存失败原因：" + e.Message);
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);

 WebAPI/ListModels.cs

@@ -3859,6 +3859,30 @@
        }

        /// <summary>
        /// è½¦é—´å®šä½å°è½¦é”å®šä¸»è¡¨json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_TrolleyPositionBillMain> getObjectByJson_Kf_TrolleyPositionBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_TrolleyPositionBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_TrolleyPositionBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// è½¦é—´å®šä½å°è½¦é”å®šå­è¡¨json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_TrolleyPositionBillSub> getObjectByJson_Kf_TrolleyPositionBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_TrolleyPositionBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_TrolleyPositionBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// æŠ¥å·¥å¹³å°è¿”工单主表json
        /// </summary>
        /// <param name="jsonString"></param>

 WebAPI/Models/ClsGy_PNLInfo.cs

@@ -7,15 +7,38 @@
{
    public class ClsGy_PNLInfo
    {
        public int HInterID { get; set; }  // æ ‡è¯†ID
        public string HLayOutName  { get; set; } // PNL布局名称
        public string HIcon { get; set; } // PCS图标
        public int HRowCount { get; set; } // è¡Œæ•°
        public int HColCount { get; set; } // åˆ—æ•°
        public string HMaker { get; set; } // åˆ›å»ºäºº
        public DateTime HMakeDate { get; set; } // åˆ›å»ºæ—¶é—´
        public string HPNLPosition_x { get; set; } 
        public string HPNLPosition_y { get; set; } 
        public int HInterID { get; set; }

        public string HLayOutName { get; set; }

        public string HIcon { get; set; }

        public int HRowCount { get; set; }

        public int HColCount { get; set; }

        public string HMaker { get; set; }

        public DateTime HMakeDate { get; set; }

        public decimal HPNLPositionX { get; set; }

        public decimal HPNLPositionY { get; set; }

        public string HModifyMan { get; set; }

        public DateTime? HModifyDate { get; set; }

        public string HStopMan { get; set; }

        public DateTime? HStopDate { get; set; }

        public string HCheckMan { get; set; }

        public DateTime? HCkeckDate { get; set; }

        public decimal HPNLPosition_x { get; set; }
        public decimal HPNLPosition_y { get; set; }

    }
}

 WebAPI/Models/ClsQC_CheckNote_PNL_Temp.cs

@@ -18,5 +18,9 @@
       public string HBadReason  {set; get;}
       public string HMaker      {set; get;}
       public DateTime HMakeDate { set; get; }
        public string HModifyMan { set; get; }
        public DateTime? HModifyDate { set; get; }
        public string HCheckMan { set; get; }
        public DateTime? HCheckDate { set; get; }
    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/ClsGy_EmployeeSub.cs

New file
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models.基础资料
{
    public class ClsGy_EmployeeSub
    {
        public int? HItemID { get; set; }
        public int? HEmpID { get; set; }
        public int? HPostID { get; set; }
        public string HRemark { get; set; } = "";
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2025-06-26T05:40:17.4650939Z;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <History>True|2025-06-27T08:10:37.5346733Z;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <!-- <History>True|2025-05-30T12:09:45.0529442Z;True|2025-05-30T20:00:10.4746636+08:00;True|2025-05-30T19:57:36.8909388+08:00;True|2025-05-30T19:54:23.3709863+08:00;True|2025-05-30T19:45:59.1224560+08:00;True|2025-05-30T16:11:23.1078874+08:00;True|2025-05-30T15:25:44.1369253+08:00;False|2025-05-30T15:22:59.6023666+08:00;True|2025-05-29T16:10:27.4758580+08:00;True|2025-05-29T15:52:51.1913782+08:00;True|2025-05-29T15:04:09.5789210+08:00;True|2025-05-29T15:02:08.3369006+08:00;True|2025-05-29T14:56:02.6701408+08:00;True|2025-05-29T14:53:01.2526336+08:00;True|2025-05-29T14:06:14.4134236+08:00;True|2025-05-29T10:41:57.8589729+08:00;False|2025-05-29T10:39:13.1065954+08:00;True|2025-05-28T20:49:52.1040536+08:00;True|2025-05-28T20:29:58.7610235+08:00;True|2025-05-28T18:15:25.8543366+08:00;True|2025-05-28T18:08:49.2159745+08:00;True|2025-05-28T16:42:11.4418993+08:00;True|2025-05-28T16:28:22.4271997+08:00;True|2025-05-28T15:04:01.9930101+08:00;True|2025-05-28T14:59:50.5569363+08:00;False|2025-05-28T14:56:53.2197560+08:00;True|2025-05-27T18:43:26.0645332+08:00;True|2025-05-27T18:39:48.9213232+08:00;True|2025-05-27T18:31:00.6833134+08:00;True|2025-05-27T18:14:59.2401391+08:00;True|2025-05-27T18:08:30.5462780+08:00;True|2025-05-27T10:38:24.2792089+08:00;True|2025-05-27T10:35:14.0648253+08:00;True|2025-05-27T09:16:15.6299226+08:00;True|2025-05-27T09:12:14.8112320+08:00;False|2025-05-27T09:10:17.1762667+08:00;True|2025-05-26T20:46:47.2266490+08:00;True|2025-05-26T20:11:25.6943227+08:00;True|2025-05-26T20:06:54.0567323+08:00;True|2025-05-26T20:02:04.0505311+08:00;True|2025-05-26T19:52:14.7038690+08:00;False|2025-05-26T19:46:38.1383433+08:00;True|2025-05-26T14:58:12.1359700+08:00;True|2025-05-26T14:54:29.9414372+08:00;True|2025-05-26T14:50:27.3163470+08:00;True|2025-05-26T14:44:56.5112541+08:00;False|2025-05-26T14:40:09.3953370+08:00;True|2025-05-26T14:25:54.4627693+08:00;False|2025-05-26T14:24:14.2496726+08:00;True|2025-05-22T15:38:35.3926523+08:00;True|2025-05-22T15:35:00.5689883+08:00;True|2025-05-22T14:42:49.5863941+08:00;True|2025-05-22T14:36:46.1020298+08:00;True|2025-05-22T14:32:53.2788353+08:00;True|2025-05-22T14:29:17.0533776+08:00;True|2025-05-22T14:24:40.1069304+08:00;False|2025-05-22T14:23:17.8312640+08:00;True|2025-05-21T15:28:11.4510589+08:00;True|2025-05-21T15:15:40.5460368+08:00;False|2025-05-21T15:12:30.3957240+08:00;True|2025-05-20T20:28:55.1865798+08:00;True|2025-05-20T20:15:51.1649682+08:00;True|2025-05-20T20:02:38.4286705+08:00;True|2025-05-20T19:56:10.5284769+08:00;True|2025-05-20T19:45:37.6791824+08:00;False|2025-05-20T19:42:43.1477567+08:00;True|2025-05-19T15:21:07.7633659+08:00;True|2025-05-19T15:18:18.7396942+08:00;True|2025-05-19T15:13:00.1330400+08:00;True|2025-05-19T14:49:49.2534084+08:00;True|2025-05-19T14:37:59.0451180+08:00;True|2025-05-19T14:33:11.8539600+08:00;True|2025-05-19T14:27:59.3745627+08:00;True|2025-05-19T14:18:26.3913082+08:00;True|2025-05-19T14:00:37.9360187+08:00;False|2025-05-19T13:58:41.7143238+08:00;True|2025-05-12T14:57:55.0385595+08:00;True|2025-05-12T13:06:26.8782755+08:00;True|2025-05-12T12:53:08.7545688+08:00;True|2025-05-12T12:27:23.2918738+08:00;True|2025-05-12T12:14:00.1464431+08:00;True|2025-05-12T11:30:29.5971323+08:00;True|2025-05-12T11:25:21.8905995+08:00;True|2025-05-12T11:19:11.3233309+08:00;True|2025-05-12T11:06:09.4136287+08:00;True|2025-05-12T10:10:42.1771130+08:00;True|2025-05-12T10:09:14.6246190+08:00;True|2025-05-12T08:44:01.0613625+08:00;False|2025-05-12T08:42:33.7100817+08:00;True|2025-05-09T09:52:01.5341669+08:00;True|2025-05-09T09:47:27.3989887+08:00;True|2025-05-09T09:42:36.2617901+08:00;False|2025-05-09T09:40:08.0947782+08:00;True|2025-05-08T16:00:29.8759120+08:00;True|2025-05-08T13:24:39.2927841+08:00;True|2025-05-08T13:14:18.5422608+08:00;True|2025-05-08T12:47:12.7136145+08:00;True|2025-05-08T12:41:36.1177461+08:00;True|2025-05-08T12:41:04.5029523+08:00;True|2025-05-08T12:32:03.0031025+08:00;True|2025-05-08T12:00:14.8603925+08:00;True|2025-05-08T11:23:29.4928832+08:00;True|2025-05-08T11:22:57.1560531+08:00;True|2025-05-08T11:16:10.4999105+08:00;False|2025-05-08T11:14:23.0464674+08:00;True|2025-05-07T13:31:07.7140287+08:00;False|2025-05-07T13:30:22.3469816+08:00;True|2025-05-06T13:31:16.7226626+08:00;True|2025-05-06T11:05:36.8250941+08:00;True|2025-05-06T10:25:27.0035953+08:00;True|2025-05-06T09:55:27.8816646+08:00;True|2025-05-06T09:48:24.2023114+08:00;True|2025-05-06T09:36:31.5646471+08:00;True|2025-05-06T09:31:22.0639528+08:00;False|2025-05-06T09:30:02.7830632+08:00;True|2025-04-30T15:20:59.1827605+08:00;True|2025-04-30T15:14:37.3331777+08:00;True|2025-04-30T13:14:51.3154029+08:00;True|2025-04-30T13:14:15.0963455+08:00;True|2025-04-30T13:10:13.3727222+08:00;False|2025-04-30T13:06:39.8843484+08:00;False|2025-04-30T13:05:01.8963304+08:00;True|2025-04-30T10:23:53.7061459+08:00;True|2025-04-30T10:18:28.2879871+08:00;True|2025-04-30T10:14:38.6366499+08:00;True|2025-04-30T10:02:44.3278308+08:00;True|2025-04-30T09:53:29.6346041+08:00;True|2025-04-30T09:45:29.5572300+08:00;True|2025-04-30T09:14:32.0665725+08:00;True|2025-04-30T09:07:25.5826394+08:00;True|2025-04-30T09:01:28.5360494+08:00;False|2025-04-30T08:59:36.4959754+08:00;True|2025-04-29T16:32:47.7145278+08:00;True|2025-04-29T15:41:44.7116258+08:00;True|2025-04-29T15:32:49.4490248+08:00;False|2025-04-29T15:25:51.5282600+08:00;False|2025-04-29T15:23:33.1022530+08:00;True|2025-04-29T14:39:42.0427387+08:00;True|2025-04-29T14:14:37.1424704+08:00;True|2025-04-29T13:53:06.8818046+08:00;True|2025-04-29T13:38:29.5948294+08:00;True|2025-04-29T08:50:02.3834885+08:00;True|2025-04-29T08:45:53.9723523+08:00;True|2025-04-29T08:41:10.0539041+08:00;True|2025-04-29T08:40:36.8094165+08:00;True|2025-04-29T08:36:14.3169515+08:00;True|2025-04-29T08:18:50.9294272+08:00;True|2025-04-29T08:13:21.0111785+08:00;True|2025-04-29T08:08:41.1470031+08:00;False|2025-04-29T08:08:00.8674071+08:00;True|2025-04-24T14:03:47.0390589+08:00;True|2025-04-24T13:08:57.8491077+08:00;True|2025-04-24T11:15:53.7224800+08:00;True|2025-04-24T11:12:55.2113887+08:00;False|2025-04-24T11:09:59.9499198+08:00;True|2025-04-21T16:51:11.0234671+08:00;False|2025-04-21T16:50:27.9924375+08:00;True|2025-04-21T16:28:02.4554241+08:00;True|2025-04-21T16:26:45.7389516+08:00;True|2025-04-21T16:17:59.3641418+08:00;True|2025-04-21T16:11:42.4953735+08:00;False|2025-04-21T16:10:57.0902986+08:00;False|2025-04-21T16:08:30.7814654+08:00;False|2025-04-21T16:06:31.1495468+08:00;False|2025-04-21T15:32:02.6951071+08:00;False|2025-04-21T15:31:03.0207208+08:00;False|2025-04-21T15:27:46.3232315+08:00;False|2025-04-21T15:26:04.3356811+08:00;False|2025-04-21T15:24:39.2075383+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> -->
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
@@ -47,28 +47,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>06/24/2025 13:14:45</publishTime>
      <publishTime>06/27/2025 14:13:35</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>06/24/2025 13:14:45</publishTime>
      <publishTime>06/27/2025 14:13:35</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/24/2025 13:14:44</publishTime>
      <publishTime>06/27/2025 14:13:34</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>06/24/2025 13:14:44</publishTime>
      <publishTime>06/27/2025 14:13:34</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>06/24/2025 13:14:39</publishTime>
      <publishTime>06/26/2025 16:18:32</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>06/24/2025 13:14:39</publishTime>
      <publishTime>06/26/2025 16:18:32</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -114,10 +114,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>06/24/2025 13:14:40</publishTime>
      <publishTime>06/26/2025 16:18:33</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>06/24/2025 13:14:40</publishTime>
      <publishTime>06/26/2025 16:18:33</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/21/2025 11:46:16</publishTime>
@@ -165,10 +165,10 @@
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>06/23/2025 10:23:59</publishTime>
      <publishTime>06/26/2025 14:28:08</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>06/23/2025 10:23:59</publishTime>
      <publishTime>06/26/2025 14:28:08</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -288,22 +288,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>06/23/2025 10:23:59</publishTime>
      <publishTime>06/26/2025 14:28:08</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>06/23/2025 10:23:59</publishTime>
      <publishTime>06/26/2025 14:28:08</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/26/2025 13:40:06</publishTime>
      <publishTime>06/27/2025 16:10:30</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/26/2025 13:40:06</publishTime>
      <publishTime>06/27/2025 16:10:30</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>06/26/2025 13:40:16</publishTime>
      <publishTime>06/27/2025 16:10:36</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -498,7 +498,7 @@
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/13/2025 10:30:30</publishTime>
      <publishTime>06/26/2025 16:19:04</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj

@@ -885,6 +885,7 @@
    <Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
    <Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
    <Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
    <Compile Include="Models\基础资料\ClsGy_EmployeeSub.cs" />
    <Compile Include="Models\基础资料\Gy_ColorClass.cs" />
    <Compile Include="Models\Employee.cs" />
    <Compile Include="Models\Gy_UserCustomer.cs" />

 WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

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

@@ -4,18 +4,8 @@
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
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.AssemblyReference.cache
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
=======
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.AssemblyReference.cache
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
>>>>>>> 890dc6768737055d28277915fdb3abfc3d366e64
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ