Bladeren bron

上传中兴修改

callm 3 weken geleden
bovenliggende
commit
88a182f9c8

+ 1 - 1
UAS_MES_HYSX/FunctionCode/Packing/Packing_PackageCollectionZX.cs

@@ -609,7 +609,7 @@ namespace UAS_MES_NEW.Packing
                 string Seal = MessageBox.Show(this.ParentForm, "是否确认封箱?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                 if (Seal == "Yes")
                 {
-                    //HttpServer.SendBoxData(pa_outboxcode.Text);
+                    HttpServer.SendBoxData(pa_outboxcode.Text);
                     HttpServer.GetOutBoxInfo(pa_outboxcode.Text);
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "采集完成,手动封箱成功\n", Color.Green);
                     dh.UpdateByCondition("package", "pa_status=1,pa_totalqty=pa_currentqty,pa_packageqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");

File diff suppressed because it is too large
+ 14 - 9
UAS_MES_HYSX/PublicMethod/HttpServer.cs


+ 2 - 1
UAS_MES_HYSX/UAS_MES_HYSX.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UAS_MES_NEW</RootNamespace>
     <AssemblyName>UAS_MES_NEW</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetFrameworkProfile />
@@ -166,6 +166,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />

+ 2 - 2
UAS_MES_HYSX/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="9.7.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+  <package id="HslCommunication" version="9.7.0" targetFramework="net40" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" requireReinstallation="true" />
 </packages>

Some files were not shown because too many files changed in this diff