resolve merge conflicts: keep theirs for all binary files

dytyqx

1 天以前 ba927b1faad68ab38d053ee9ea9eeac4b1a5531b

resolve merge conflicts: keep theirs for all binary files

 LMES/LMES.csproj

@@ -261,10 +261,6 @@
      <Project>{c518f792-17cd-4894-99e5-c0ea4f59e0f3}</Project>
      <Name>WarM</Name>
    </ProjectReference>
    <ProjectReference Include="..\WebAPI\WebAPI.csproj">
      <Project>{5b60ce0c-963c-4dc2-91b3-0b471aac5438}</Project>
      <Name>WebAPI</Name>
    </ProjectReference>
    <ProjectReference Include="..\WorkM\WorkM.csproj">
      <Project>{38499782-d273-45ee-a5a4-19ac1fc36444}</Project>
      <Name>WorkM</Name>

 LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/TopSdk.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/TopSdk.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WebAPI.XmlSerializers.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WebAPI.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WebAPI.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/stdole.dll

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt

@@ -588,7 +588,6 @@
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Net.Http.Formatting.dll
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Dapper.dll
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.TeaUtil.dll
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Microsoft.Web.Infrastructure.dll
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Razor.dll
E:\gz\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.Razor.dll

 PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.pdb

Binary files differ

 PayM/bin/x86/Debug/DAL.dll

Binary files differ

 PayM/bin/x86/Debug/DAL.pdb

Binary files differ

 PayM/bin/x86/Debug/DBUtility.dll

Binary files differ

 PayM/bin/x86/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/bin/x86/Debug/Model.dll

Binary files differ

 PayM/bin/x86/Debug/Model.pdb

Binary files differ

 PayM/bin/x86/Debug/PayM.dll

Binary files differ

 PayM/bin/x86/Debug/PayM.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 Pub_Class/.vs/Pub_Class/v16/.suo

Binary files differ

 Pub_Class/Backup/Pub_Class.sln

New file
@@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pub_Class", "Pub_Class.csproj", "{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
        Debug|x86 = Debug|x86
        Release|Any CPU = Release|Any CPU
        Release|x86 = Release|x86
    EndGlobalSection
    GlobalSection(ProjectConfigurationPlatforms) = postSolution
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|x86.ActiveCfg = Debug|x86
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Debug|x86.Build.0 = Debug|x86
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|Any CPU.Build.0 = Release|Any CPU
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|x86.ActiveCfg = Release|x86
        {0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}.Release|x86.Build.0 = Release|x86
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
    EndGlobalSection
EndGlobal

 Pub_Class/Pub_Class.sln

@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.36631.11
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pub_Class", "Pub_Class.csproj", "{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}"
EndProject
Global
@@ -23,4 +25,7 @@
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {501AE6C4-7697-4700-8F50-A2EBF7FC2693}
    EndGlobalSection
EndGlobal

 Pub_Class/UpgradeLog.htm

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

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

Binary files differ

 WebAPI/Controllers/LMESController.cs

@@ -2249,6 +2249,73 @@
        }


        /// <summary>
        /// 返回工序流转卡列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("LEMS/MES_Sc_ProcessExchangeBillList_Json")]
        [HttpGet]
        public object MES_Sc_ProcessExchangeBillList_Json(string sWhere, string user)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>()
;                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBillQuery", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "生产订单列表");

                        sWhere += sql_splice;
                    }
                }

                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by 制单日期 desc,单据号 desc", "h_v_Sc_ProcessExchangeBillQuery");
                //添加列名
                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列对象的列名
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                //objJsonResult.code = "1";
                //objJsonResult.count = 1;
                //objJsonResult.Message = "Sucess！";
                //objJsonResult.data = ds.Tables[0];
                //objJsonResult.list = a;
                //return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }


        #region 生产订单列表-分页
        [Route("LEMS/MES_IF_ICMOBillList_Json_byPage")]
        [HttpGet]
@@ -2846,6 +2913,73 @@
        }
        #endregion

        #region 判断下推的工序流转卡是否审核
        [Route("LEMS/ProcessExchangeBillCheck")]
        [HttpGet]
        public object ProcessExchangeBillCheck(string hmainid, string HEntryID, int OrganizationID,string HSourceBillNo)
        {
            DataSet ds;
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1  and hmainid=" + hmainid + " and  HEntryID=" + HEntryID + " order by 单据号 desc", "h_v_IF_ICMOBillList");
                string HNumber = ds.Tables[0].Rows[0]["产品代码"].ToString();

                if (ds.Tables[0].Rows[0]["审核人"].ToString() == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单为未审核状态，不允许下推生成工序流转卡！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["关闭人"].ToString() != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单为已关闭状态，不允许下推生成工序流转卡！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["作废人"].ToString() != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单为已作废状态，不允许下推生成工序流转卡！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Kf_ICStockBillSub where HInterID=" + hmainid + " and HEntryID=" + HEntryID , "Kf_ICStockBillSub");

                if (double.Parse(ds.Tables[0].Rows[0]["HSourceBillNo"].ToString()).Equals(HSourceBillNo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单已全部下推,不允许再次下推！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 生产订单流转卡 履历条件查询
        [Route("LEMS/GetProcessBillOrICMOBillResumeList")]
        [HttpGet]

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -2473,6 +2473,7 @@
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                }
                else if (refSav == "Update")
                {
@@ -2525,7 +2526,7 @@
                tableList.Add(ds.Tables[1]);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.code = "0"; 
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;

 WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\gz\wy\MES-WEB-API</_PublishTargetUrl>
    <History>True|2026-02-04T06:14:08.6815293Z;True|2026-02-04T14:12:55.3426756+08:00;True|2026-02-04T14:06:04.8563633+08:00;True|2026-02-04T13:59:45.8674762+08:00;True|2026-02-04T13:59:40.8476722+08:00;True|2026-02-04T13:49:27.8178193+08:00;True|2026-02-04T13:47:17.9531917+08:00;True|2026-02-04T13:33:13.4905042+08:00;True|2026-02-04T11:13:26.7587124+08:00;True|2026-02-04T10:44:11.8398866+08:00;True|2026-02-04T10:37:30.4140022+08:00;True|2026-02-04T10:10:15.2756301+08:00;True|2026-02-04T10:06:43.8401980+08:00;True|2026-02-04T09:43:16.4168165+08:00;True|2026-02-04T09:38:57.6155453+08:00;True|2026-02-04T09:36:23.7275649+08:00;True|2026-02-04T09:18:39.5157535+08:00;True|2026-02-04T08:55:39.8422012+08:00;True|2026-02-04T08:50:53.2493857+08:00;True|2026-02-04T08:49:13.6401738+08:00;True|2026-02-04T08:47:44.4063649+08:00;True|2026-02-04T08:27:35.3397920+08:00;True|2026-02-04T08:11:10.8455212+08:00;False|2026-02-04T08:10:46.8065171+08:00;True|2026-02-03T11:17:54.1264839+08:00;True|2026-02-03T11:13:07.3503801+08:00;True|2026-02-03T10:57:22.0499756+08:00;True|2026-02-03T10:49:51.5729577+08:00;False|2026-02-03T10:49:34.3419439+08:00;True|2026-02-02T16:46:50.4584549+08:00;True|2026-02-02T16:42:58.9718820+08:00;True|2026-02-02T16:37:04.3367393+08:00;True|2026-02-02T16:25:15.8758401+08:00;True|2026-02-02T16:23:39.5355352+08:00;False|2026-02-02T16:22:23.6470725+08:00;True|2026-01-27T14:38:42.1847305+08:00;True|2026-01-27T14:35:31.4859936+08:00;True|2026-01-27T14:18:36.2122726+08:00;True|2026-01-27T14:03:03.8424130+08:00;True|2026-01-27T13:14:23.0197795+08:00;True|2026-01-27T11:26:12.7603302+08:00;True|2026-01-27T11:23:11.2980950+08:00;True|2026-01-27T11:17:42.7742881+08:00;True|2026-01-27T10:27:13.8894331+08:00;True|2026-01-27T10:22:33.6468907+08:00;True|2026-01-27T10:13:18.5553398+08:00;False|2026-01-27T10:10:23.9320618+08:00;True|2026-01-27T10:00:58.3355300+08:00;False|2026-01-27T10:00:37.4820904+08:00;True|2026-01-27T09:45:12.8813559+08:00;True|2026-01-27T09:41:43.1787804+08:00;True|2026-01-27T09:40:22.3478291+08:00;True|2026-01-27T09:39:19.6165154+08:00;True|2026-01-27T09:37:31.7523727+08:00;True|2026-01-27T08:33:15.6345855+08:00;True|2026-01-27T08:25:27.8955175+08:00;False|2026-01-27T08:24:59.4512268+08:00;True|2026-01-26T16:40:38.8412768+08:00;True|2026-01-26T16:16:41.7932895+08:00;True|2026-01-26T16:15:35.4808695+08:00;True|2026-01-26T16:08:19.1707669+08:00;True|2026-01-26T16:07:38.4808637+08:00;True|2026-01-26T16:00:28.5139031+08:00;True|2026-01-26T15:56:20.5415856+08:00;True|2026-01-26T15:47:55.9662192+08:00;True|2026-01-26T15:40:45.2534281+08:00;True|2026-01-26T15:39:09.6931174+08:00;True|2026-01-26T15:37:51.9154771+08:00;True|2026-01-26T15:33:35.6039826+08:00;True|2026-01-26T15:31:52.9425047+08:00;True|2026-01-26T15:30:45.3923302+08:00;True|2026-01-26T15:29:05.0429905+08:00;True|2026-01-26T15:27:05.4558977+08:00;True|2026-01-26T15:26:29.2629885+08:00;True|2026-01-26T15:25:43.3181913+08:00;True|2026-01-26T15:25:14.6706698+08:00;True|2026-01-26T15:24:20.6134253+08:00;True|2026-01-26T15:23:57.0303408+08:00;True|2026-01-26T15:20:06.4088432+08:00;True|2026-01-26T15:19:31.8076951+08:00;True|2026-01-26T15:14:49.8542368+08:00;</History>
    <History>True|2026-02-27T01:08:33.3985444Z;False|2026-02-27T09:08:11.1491962+08:00;True|2026-02-26T16:55:18.8275449+08:00;True|2026-02-26T16:40:40.3807253+08:00;False|2026-02-26T16:40:03.2172667+08:00;True|2026-02-04T14:14:08.6815293+08:00;True|2026-02-04T14:12:55.3426756+08:00;True|2026-02-04T14:06:04.8563633+08:00;True|2026-02-04T13:59:45.8674762+08:00;True|2026-02-04T13:59:40.8476722+08:00;True|2026-02-04T13:49:27.8178193+08:00;True|2026-02-04T13:47:17.9531917+08:00;True|2026-02-04T13:33:13.4905042+08:00;True|2026-02-04T11:13:26.7587124+08:00;True|2026-02-04T10:44:11.8398866+08:00;True|2026-02-04T10:37:30.4140022+08:00;True|2026-02-04T10:10:15.2756301+08:00;True|2026-02-04T10:06:43.8401980+08:00;True|2026-02-04T09:43:16.4168165+08:00;True|2026-02-04T09:38:57.6155453+08:00;True|2026-02-04T09:36:23.7275649+08:00;True|2026-02-04T09:18:39.5157535+08:00;True|2026-02-04T08:55:39.8422012+08:00;True|2026-02-04T08:50:53.2493857+08:00;True|2026-02-04T08:49:13.6401738+08:00;True|2026-02-04T08:47:44.4063649+08:00;True|2026-02-04T08:27:35.3397920+08:00;True|2026-02-04T08:11:10.8455212+08:00;False|2026-02-04T08:10:46.8065171+08:00;True|2026-02-03T11:17:54.1264839+08:00;True|2026-02-03T11:13:07.3503801+08:00;True|2026-02-03T10:57:22.0499756+08:00;True|2026-02-03T10:49:51.5729577+08:00;False|2026-02-03T10:49:34.3419439+08:00;True|2026-02-02T16:46:50.4584549+08:00;True|2026-02-02T16:42:58.9718820+08:00;True|2026-02-02T16:37:04.3367393+08:00;True|2026-02-02T16:25:15.8758401+08:00;True|2026-02-02T16:23:39.5355352+08:00;False|2026-02-02T16:22:23.6470725+08:00;True|2026-01-27T14:38:42.1847305+08:00;True|2026-01-27T14:35:31.4859936+08:00;True|2026-01-27T14:18:36.2122726+08:00;True|2026-01-27T14:03:03.8424130+08:00;True|2026-01-27T13:14:23.0197795+08:00;True|2026-01-27T11:26:12.7603302+08:00;True|2026-01-27T11:23:11.2980950+08:00;True|2026-01-27T11:17:42.7742881+08:00;True|2026-01-27T10:27:13.8894331+08:00;True|2026-01-27T10:22:33.6468907+08:00;True|2026-01-27T10:13:18.5553398+08:00;False|2026-01-27T10:10:23.9320618+08:00;True|2026-01-27T10:00:58.3355300+08:00;False|2026-01-27T10:00:37.4820904+08:00;True|2026-01-27T09:45:12.8813559+08:00;True|2026-01-27T09:41:43.1787804+08:00;True|2026-01-27T09:40:22.3478291+08:00;True|2026-01-27T09:39:19.6165154+08:00;True|2026-01-27T09:37:31.7523727+08:00;True|2026-01-27T08:33:15.6345855+08:00;True|2026-01-27T08:25:27.8955175+08:00;False|2026-01-27T08:24:59.4512268+08:00;True|2026-01-26T16:40:38.8412768+08:00;True|2026-01-26T16:16:41.7932895+08:00;True|2026-01-26T16:15:35.4808695+08:00;True|2026-01-26T16:08:19.1707669+08:00;True|2026-01-26T16:07:38.4808637+08:00;True|2026-01-26T16:00:28.5139031+08:00;True|2026-01-26T15:56:20.5415856+08:00;True|2026-01-26T15:47:55.9662192+08:00;True|2026-01-26T15:40:45.2534281+08:00;True|2026-01-26T15:39:09.6931174+08:00;True|2026-01-26T15:37:51.9154771+08:00;True|2026-01-26T15:33:35.6039826+08:00;True|2026-01-26T15:31:52.9425047+08:00;True|2026-01-26T15:30:45.3923302+08:00;True|2026-01-26T15:29:05.0429905+08:00;True|2026-01-26T15:27:05.4558977+08:00;True|2026-01-26T15:26:29.2629885+08:00;True|2026-01-26T15:25:43.3181913+08:00;True|2026-01-26T15:25:14.6706698+08:00;True|2026-01-26T15:24:20.6134253+08:00;True|2026-01-26T15:23:57.0303408+08:00;True|2026-01-26T15:20:06.4088432+08:00;True|2026-01-26T15:19:31.8076951+08:00;True|2026-01-26T15:14:49.8542368+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>02/04/2026 14:05:56</publishTime>
      <publishTime>02/26/2026 16:40:23</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>02/04/2026 14:05:56</publishTime>
      <publishTime>02/26/2026 16:40:23</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>02/04/2026 14:05:54</publishTime>
      <publishTime>02/26/2026 16:40:20</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>02/04/2026 14:05:54</publishTime>
      <publishTime>02/26/2026 16:40:20</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>02/02/2026 16:23:19</publishTime>
      <publishTime>02/26/2026 16:40:15</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>02/02/2026 16:23:19</publishTime>
      <publishTime>02/26/2026 16:40:15</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -138,10 +138,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>02/03/2026 10:57:09</publishTime>
      <publishTime>02/26/2026 16:40:17</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>02/03/2026 10:57:09</publishTime>
      <publishTime>02/26/2026 16:40:17</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -177,34 +177,34 @@
      <publishTime>11/13/2012 12:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>02/02/2026 16:23:17</publishTime>
      <publishTime>02/04/2026 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>02/02/2026 16:23:17</publishTime>
      <publishTime>02/04/2026 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/04/2026 18:25:42</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/04/2026 18:25:42</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/06/2026 14:30:52</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/06/2026 14:30:52</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>01/19/2026 15:35:44</publishTime>
      <publishTime>02/04/2026 18:16:05</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/19/2026 15:35:44</publishTime>
      <publishTime>02/04/2026 18:16:05</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -315,22 +315,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/27/2026 14:47:22</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/27/2026 14:47:22</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>02/04/2026 14:14:04</publishTime>
      <publishTime>02/27/2026 09:08:26</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>02/04/2026 14:14:04</publishTime>
      <publishTime>02/27/2026 09:08:26</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2026 14:14:07</publishTime>
      <publishTime>02/27/2026 09:08:31</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -435,16 +435,16 @@
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/27/2026 08:36:04</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/09/2025 08:11:33</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.js">
      <publishTime>01/27/2026 08:35:50</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.min.js">
      <publishTime>01/27/2026 08:35:50</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -555,7 +555,7 @@
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>02/02/2026 16:23:36</publishTime>
      <publishTime>02/26/2026 16:40:38</publishTime>
    </File>
  </ItemGroup>
</Project>