锦隆 启用不良处理

chenhaozhe

14 小时以前 e3f1d0969406b51f319f8683a55d124f473eacda

锦隆  启用不良处理

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 BLL/bin/x86/Release/BLL.dll

Binary files differ

 BLL/bin/x86/Release/BLL.pdb

Binary files differ

 BLL/bin/x86/Release/DAL.dll

Binary files differ

 BLL/bin/x86/Release/DAL.pdb

Binary files differ

 BLL/bin/x86/Release/DBUtility.dll

Binary files differ

 BLL/bin/x86/Release/DBUtility.pdb

Binary files differ

 BLL/bin/x86/Release/Model.dll

Binary files differ

 BLL/bin/x86/Release/Model.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Class.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Control.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/x86/Release/SQLHelper.dll

Binary files differ

 BLL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 BLL/bin/x86/Release/TopSdk.dll

Binary files differ

 BLL/bin/x86/Release/TopSdk.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/x86/Release/DAL.dll

Binary files differ

 DAL/bin/x86/Release/DAL.pdb

Binary files differ

 DAL/bin/x86/Release/DBUtility.dll

Binary files differ

 DAL/bin/x86/Release/DBUtility.pdb

Binary files differ

 DAL/bin/x86/Release/Model.dll

Binary files differ

 DAL/bin/x86/Release/Model.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Class.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Control.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/x86/Release/SQLHelper.dll

Binary files differ

 DAL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/bin/x86/Release/DBUtility.dll

Binary files differ

 Model/bin/x86/Release/DBUtility.pdb

Binary files differ

 Model/bin/x86/Release/Model.dll

Binary files differ

 Model/bin/x86/Release/Model.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Class.dll

Binary files differ

 Model/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Control.dll

Binary files differ

 Model/bin/x86/Release/Pub_Control.pdb

Binary files differ

 Model/bin/x86/Release/SQLHelper.dll

Binary files differ

 Model/bin/x86/Release/SQLHelper.pdb

Binary files differ

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

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

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

Binary files differ

 Model/obj/x86/Release/Model.dll

Binary files differ

 Model/obj/x86/Release/Model.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

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

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.pdb

Binary files differ

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

Binary files differ

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

@@ -8,4 +8,3 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache

 WebAPI/Controllers/BaseSet/Gy_DriverController.cs

@@ -106,7 +106,7 @@
            public string title { get; set; }
            public List<TreeModel> children = new List<TreeModel>();
        }
        [Route("Gy_Department/Gy_DepartmentTreeList")]
        [Route("Gy_Driver/Gy_DepartmentTreeList")]
        [HttpGet]
        public object Gy_DepartmentTreeList(string sWhere)
        {

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1707,8 +1707,9 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);

                //if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                //{
                    string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                             join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
@@ -1717,7 +1718,7 @@
                             where e.HItemID ='" + HKeeperID + "' ";
                    //查询质检员对应质检部门
                    ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
                    LogService.Write("sql" + sql);
                    // LogService.Write("sql" + sql);
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
@@ -1737,11 +1738,10 @@
                model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //质检组织
                model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //来源组织
                                                                                                    //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门
                LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);
                // if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                // {
                //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                //{
                    model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
                // }
                //}
                model.Add("FISSYNCED", "false");//  是否已同步
                model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));//  报检日期
                model.Add("FBillNo", HBillNo);
@@ -1782,7 +1782,12 @@
                FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //基本单位数量
                FentityModel2.Add("FUsePolicy", HUseResult.ToString());   //使用决策
                FentityModel2.Add("FIsCheck", false);   //是否抽检
                FentityModel2.Add("FIsDefectProcess", false);  //不良处理
                //FentityModel2.Add("FIsDefectProcess", false);  //不良处理
                // 锦隆启用不良处理
                //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                //{
                    FentityModel2.Add("FIsDefectProcess", true);  //不良处理
                //}
                FentityModel2.Add("FCanSale", false);   //可销售
                FentityModel2.Add("FIsMRBReview", false);   //MRP评审
                FentityModel2.Add("FIsReturn", true);   //判退

 WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2026-01-19T07:58:34.1439056Z;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
    <History>True|2026-01-20T02:28:19.5250951Z;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>01/19/2026 15:56:17</publishTime>
      <publishTime>01/20/2026 10:27:11</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>01/19/2026 15:56:17</publishTime>
      <publishTime>01/20/2026 10:27:11</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/19/2026 15:56:14</publishTime>
      <publishTime>01/20/2026 10:27:09</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>01/19/2026 15:56:14</publishTime>
      <publishTime>01/20/2026 10:27:09</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/19/2026 15:56:07</publishTime>
      <publishTime>01/20/2026 10:27:02</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>01/19/2026 15:56:07</publishTime>
      <publishTime>01/20/2026 10:27:02</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -123,10 +123,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/19/2026 15:56:08</publishTime>
      <publishTime>01/20/2026 10:27:04</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>01/19/2026 15:56:08</publishTime>
      <publishTime>01/20/2026 10:27:04</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/21/2025 11:46:16</publishTime>
@@ -159,34 +159,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>01/19/2026 15:56:02</publishTime>
      <publishTime>01/20/2026 10:26:59</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>01/19/2026 15:56:02</publishTime>
      <publishTime>01/20/2026 10:26:59</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/19/2026 15:56:03</publishTime>
      <publishTime>01/20/2026 10:27:00</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>01/19/2026 15:56:03</publishTime>
      <publishTime>01/20/2026 10:27:00</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/19/2026 15:56:05</publishTime>
      <publishTime>01/20/2026 10:27:01</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>01/19/2026 15:56:05</publishTime>
      <publishTime>01/20/2026 10:27:01</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:54:15</publishTime>
      <publishTime>01/20/2026 10:26:02</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/19/2026 15:54:15</publishTime>
      <publishTime>01/20/2026 10:26:02</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -297,22 +297,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/19/2026 15:54:21</publishTime>
      <publishTime>01/20/2026 10:26:09</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/19/2026 15:54:21</publishTime>
      <publishTime>01/20/2026 10:26:09</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>01/19/2026 15:58:21</publishTime>
      <publishTime>01/20/2026 10:28:10</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>01/19/2026 15:58:21</publishTime>
      <publishTime>01/20/2026 10:28:10</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>01/19/2026 15:58:30</publishTime>
      <publishTime>01/20/2026 10:28:17</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

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

Binary files differ

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

@@ -8,4 +8,3 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ