From cc89062c39d21fa063acd7c82ef655c77d9753a7 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 27 四月 2025 08:18:16 +0800
Subject: [PATCH] 三升排产保存取消生产资源控制

---
 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll                           |    0 
 /dev/null                                                          |    0 
 WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs |    4 ++--
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user     |   42 +++++++++++++++++++++---------------------
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt   |    1 -
 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb                           |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll                           |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb                           |    0 
 8 files changed, 23 insertions(+), 24 deletions(-)

diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 3725e1f..b6e2856 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -242,7 +242,7 @@
 
                         LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
 
-                        if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                        if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧"&& oSystemParameter.omodel.WMS_CampanyName != "涓夊崌") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
                         {
                             if (HSourceID == "" || HSourceID == "0")
                             {
@@ -333,7 +333,7 @@
 
                         LogService.CustomWriteLog("2.1:"+i, DateTime.Now.ToString("yyyy-MM-dd"));
                         
-                        if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                        if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "涓夊崌") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
                         {
                             if (HSourceID == "" || HSourceID == "0")
                             {
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index e900bd6..b329bf6 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>04/24/2025 13:19:22</publishTime>
+      <publishTime>04/25/2025 13:15:40</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>04/24/2025 13:19:22</publishTime>
+      <publishTime>04/25/2025 13:15:40</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>04/24/2025 13:19:20</publishTime>
+      <publishTime>04/25/2025 13:15:38</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>04/24/2025 13:19:20</publishTime>
+      <publishTime>04/25/2025 13:15:38</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>04/24/2025 13:19:14</publishTime>
+      <publishTime>04/25/2025 13:15:31</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>04/24/2025 13:19:14</publishTime>
+      <publishTime>04/25/2025 13:15:31</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
       <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>04/24/2025 13:19:15</publishTime>
+      <publishTime>04/25/2025 13:15:32</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>04/24/2025 13:19:15</publishTime>
+      <publishTime>04/25/2025 13:15:32</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
       <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
       <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>04/24/2025 13:19:10</publishTime>
+      <publishTime>04/25/2025 13:15:28</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>04/24/2025 13:19:10</publishTime>
+      <publishTime>04/25/2025 13:15:28</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>04/24/2025 13:19:12</publishTime>
+      <publishTime>04/25/2025 13:15:30</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>04/24/2025 13:19:12</publishTime>
+      <publishTime>04/25/2025 13:15:30</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
       <publishTime>08/31/2012 06:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>04/24/2025 13:19:13</publishTime>
+      <publishTime>04/25/2025 13:15:30</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>04/24/2025 13:19:13</publishTime>
+      <publishTime>04/25/2025 13:15:30</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/16/2015 01:57:08</publishTime>
     </File>
     <File Include="bin/SyntacticSugar.dll">
-      <publishTime>04/24/2025 13:19:09</publishTime>
+      <publishTime>04/25/2025 13:15:26</publishTime>
     </File>
     <File Include="bin/SyntacticSugar.pdb">
-      <publishTime>04/24/2025 13:19:09</publishTime>
+      <publishTime>04/25/2025 13:15:26</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
       <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
-      <publishTime>04/24/2025 13:19:16</publishTime>
+      <publishTime>04/25/2025 13:15:32</publishTime>
     </File>
     <File Include="bin/TopSdk.pdb">
-      <publishTime>04/24/2025 13:19:16</publishTime>
+      <publishTime>04/25/2025 13:15:32</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>04/24/2025 13:19:30</publishTime>
+      <publishTime>04/25/2025 13:15:49</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>04/24/2025 13:19:30</publishTime>
+      <publishTime>04/25/2025 13:15:49</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
       <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
       <publishTime>04/29/2024 08:30:03</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/24/2025 13:21:52</publishTime>
+      <publishTime>04/25/2025 13:15:59</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index f960208..7168556 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index a24bcb7..89ad873 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index d6e21aa..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index eb22329..5821135 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -9,4 +9,3 @@
 C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
 C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
 C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index f960208..7168556 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index a24bcb7..89ad873 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ

--
Gitblit v1.9.1