Browse Source

出货标签管理,测试项目

callm 1 year ago
parent
commit
b710c9679e

+ 25 - 0
MES/MES.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32901.82
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MES", "MES\MES.csproj", "{3F1CA6C0-3E77-4E42-AA92-6C323EFDF101}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3F1CA6C0-3E77-4E42-AA92-6C323EFDF101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F1CA6C0-3E77-4E42-AA92-6C323EFDF101}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F1CA6C0-3E77-4E42-AA92-6C323EFDF101}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F1CA6C0-3E77-4E42-AA92-6C323EFDF101}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D35F76AC-E305-4C2A-9A98-EE3C366A22FE}
+	EndGlobalSection
+EndGlobal

+ 6 - 0
MES/MES/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

+ 62 - 0
MES/MES/MES.csproj

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3F1CA6C0-3E77-4E42-AA92-6C323EFDF101}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MES</RootNamespace>
+    <AssemblyName>MES</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="UMESDLLService, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\MES_NEW\mes-client\UAS_MesInterface(LGDZ)\bin\Debug\UMESDLLService.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Respone.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

+ 581 - 0
MES/MES/Program.cs

@@ -0,0 +1,581 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UMESDLLService;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace MES
+{
+    class Program
+    {
+        static private MESHelper m_mesHelper = new MESHelper();
+        static void Main(string[] args)
+        {
+            string function = args[0];
+            if(function == "Login")
+            {
+                if(args.Length != 4)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "Login";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string userName = args[1];
+                    string password = args[2];
+                    string resCode = args[3];
+                    Login(userName, password, resCode);
+                }
+            }
+            else if(function == "CheckRoute")
+            {
+                if (args.Length != 3)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "CheckRoute";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    string resCode = args[2];
+                    CheckRoute(sn, resCode);
+                }
+            }
+            else if (function == "GetRcardMOInfo")
+            {
+                if (args.Length != 2)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "GetRcardMOInfo";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    GetRcardMOInfo(sn);
+                }
+            }
+            else if (function == "GetAddressRangeByMO")
+            {
+                if (args.Length != 2)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "GetAddressRangeByMO";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    GetAddressRangeByMO(sn);
+                }
+            }
+            else if (function == "SetAddressInfo")
+            {
+                if (args.Length != 7)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "SetAddressInfo";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    string wifi = args[2];
+                    string bt = args[3];
+                    string code1 = args[4];
+                    string code2 = args[5];
+                    string code3 = args[6];
+                    SetAddressInfo(sn, wifi, bt, code1, code2, code3);
+                }
+            }
+            else if (function == "GetMEIOrNetCodeRange")
+            {
+                if (args.Length != 4)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "GetMEIOrNetCodeRange";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    string imei = args[2];
+                    string inetCode = args[3];
+                    GetMEIOrNetCodeRange(sn, imei, inetCode);
+                }
+            }
+            else if (function == "SetIMEIInfo")
+            {
+                if (args.Length != 10)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "SetIMEIInfo";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    string imei1 = args[2];
+                    string imei2 = args[3];
+                    string imei3 = args[4];
+                    string meid = args[5];
+                    string netcode = args[6];
+                    string id1 = args[7];
+                    string id2 = args[8];
+                    string id3 = args[9];
+                    SetIMEIInfo(sn, imei1, imei2, imei3, meid, netcode, id1, id2, id3);
+                }
+            }
+            else if (function == "GetMobileAllInfo")
+            {
+                if (args.Length != 2)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "GetMobileAllInfo";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    GetMobileAllInfo(sn);
+                }
+            }
+            else if (function == "SetMobileData")
+            {
+                if (args.Length != 7)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "SetMobileData";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string tsn = args[1];
+                    string sn = args[2];
+                    string resCode = args[3];
+                    string user = args[4]; 
+                    string result = args[5];
+                    string errCode = args[6];
+                    SetMobileData(tsn, sn, resCode, user, result, errCode);
+                }
+            }
+            else if (function == "SetPcbaData")
+            {
+                if (args.Length != 6)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "SetPcbaData";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string sn = args[1];
+                    string resCode = args[2];
+                    string user = args[3];
+                    string result = args[4];
+                    string errCode = args[5];
+                    SetPcbaData(sn, resCode, user, result, errCode);
+                }
+            }
+            else if (function == "GoMo")
+            {
+                if (args.Length != 4)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "GoMo";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string moCode = args[1];
+                    string sn = args[2];
+                    string resCode = args[3];
+                    GoMo(moCode, sn, resCode);
+                }
+            }
+            else if(function == "GetInfoByMaterial")
+            {
+                if (args.Length != 2)
+                {
+                    Respone rep = new Respone();
+                    rep.function = "GetInfoByMaterial";
+                    rep.result = false;
+                    rep.errorMessage = "The number of params is error";
+                    Console.Write(rep.ToString());
+                }
+                else
+                {
+                    string pcbaSN = args[1];
+                    GetInfoByMaterial(pcbaSN);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 登录
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <param name="password"></param>
+        /// <param name="resCode"></param>
+        static void Login(string userName, string password, string resCode)
+        {
+            Respone rep = new Respone();
+            rep.function = "Login";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.CheckUserAndResourcePassed(userName, resCode, password, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 检查工序, 需先登录
+        /// </summary>
+        /// <param name="sn"></param>
+        /// <param name="resCode"></param>
+        static void CheckRoute(string sn, string resCode)
+        {
+            Respone rep = new Respone();
+            rep.function = "CheckRoute";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.CheckRoutePassed(sn, resCode, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 根据SN获取工单信息
+        /// </summary>
+        /// <param name="sn"></param>
+        static void GetRcardMOInfo(string sn)
+        {
+            Respone rep = new Respone();
+            rep.function = "GetRcardMOInfo";
+            try
+            {
+                string errMessage = null;
+                string moCode = null;
+                bool res = m_mesHelper.GetRcardMOInfo(sn, out moCode, out errMessage);
+                JObject data = new JObject();
+                data.Add("MoCode", moCode);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                rep.data = data;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 分配MAC地址和BT地址
+        /// </summary>
+        /// <param name="sn"></param>
+        static void GetAddressRangeByMO(string sn)
+        {
+            Respone rep = new Respone();
+            rep.function = "GetAddressRangeByMO";
+            try 
+            {
+                string errMessage = null;
+                string info = "";
+                bool res = m_mesHelper.GetAddressRangeByMO(sn, out info, out errMessage);
+                JObject data = JObject.Parse(info);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                rep.data = data;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+            
+        }
+        /// <summary>
+        /// 记录MAC和BT地址信息
+        /// </summary>
+        /// <param name="sn"></param>
+        /// <param name="wifi"></param>
+        /// <param name="bt"></param>
+        /// <param name="code1"></param>
+        /// <param name="code2"></param>
+        /// <param name="code3"></param>
+        static void SetAddressInfo(string sn, string wifi, string bt, string code1, string code2, string code3)
+        {
+            Respone rep = new Respone();
+            rep.function = "SetAddressInfo";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.SetAddressInfo(sn, wifi, bt, code1, code2, code3, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+            
+        }
+        /// <summary>
+        /// 分配IMEI地址信息
+        /// </summary>
+        /// <param name="sn"></param>
+        /// <param name="imei"></param>
+        /// <param name="inetCode"></param>
+        static void GetMEIOrNetCodeRange(string sn, string imei, string inetCode)
+        {
+            Respone rep = new Respone();
+            rep.function = "GetMEIOrNetCodeRange";
+            try
+            {
+                string errMessage = null;
+                string info = "";
+                bool res = m_mesHelper.GetMEIOrNetCodeRange(sn, imei, inetCode, out info, out errMessage);
+                JObject data = JObject.Parse(info);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                rep.data = data;
+                Console.Write(rep.ToString());
+            }
+            catch (Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+
+        }
+
+        /// <summary>
+        /// 记录IMEI使用信息
+        /// </summary>
+        /// <param name="sn"></param>
+        /// <param name="imei"></param>
+        static void SetIMEIInfo(string sn, string imei1, string imei2, string imei3, string meid, string netcode, string id1, string id2, string id3)
+        {
+            Respone rep = new Respone();
+            rep.function = "SetIMEIInfo";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.SetIMEIInfo(sn, imei1, imei2, imei3, meid, netcode, id1, id2, id3, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        static void GetMobileAllInfo(string sn)
+        {
+            Respone rep = new Respone();
+            rep.function = "GetMobileAllInfo";
+            try
+            {
+                string errMessage = null;
+                string info = null;
+                bool res = m_mesHelper.GetMobileAllInfo(sn, out info, out errMessage);
+                JObject data = JObject.Parse(info);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                rep.data = data;
+                Console.Write(rep.ToString());
+            }
+            catch(Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 执行转号过站
+        /// </summary>
+        /// <param name="tsn"></param>
+        /// <param name="sn"></param>
+        /// <param name="resCode"></param>
+        /// <param name="uer"></param>
+        /// <param name="result"></param>
+        /// <param name="errCode"></param>
+        static void SetMobileData(string tsn, string sn, string resCode, string user, string result, string errCode)
+        {
+            Respone rep = new Respone();
+            rep.function = "SetMobileData";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.SetMobileData(tsn, sn, resCode, user, result, errCode, null, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch (Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 执行过站
+        /// </summary>
+        /// <param name="sn"></param>
+        /// <param name="resCode"></param>
+        /// <param name="uer"></param>
+        /// <param name="result"></param>
+        /// <param name="errCode"></param>
+        static void SetPcbaData(string sn, string resCode, string user, string result, string errCode)
+        {
+            Respone rep = new Respone();
+            rep.function = "SetPcbaData";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.SetPcbaData(sn, resCode, user, result, errCode, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch (Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        static void GoMo(string moCode, string sn, string resCode)
+        {
+            Respone rep = new Respone();
+            rep.function = "GoMo";
+            try
+            {
+                string errMessage = null;
+                bool res = m_mesHelper.GoMo(moCode, sn, resCode, out errMessage);
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch (Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        static void GetInfoByMaterial(string pcbaSN)
+        {
+            Respone rep = new Respone();
+            rep.function = "GetInfoByMaterial";
+            try
+            {
+                string errMessage = null;
+                string tsn = null;
+                bool res = m_mesHelper.GetInfoByMaterial(pcbaSN, out tsn, out errMessage);
+                JObject data = new JObject();
+                data.Add("TSN", tsn);
+                rep.data = data;
+                rep.result = res;
+                rep.errorMessage = errMessage;
+                Console.Write(rep.ToString());
+            }
+            catch (Exception ex)
+            {
+                rep.result = false;
+                rep.errorMessage = ex.Message;
+                Console.Write(rep.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 测试信息记录
+        /// </summary>
+        /// <param name = "sn" ></ param >
+        /// < param name="wifi"></param>
+        /// <param name = "bt" ></ param >
+        /// < param name="code1"></param>
+        /// <param name = "code2" ></ param >
+        /// < param name="code3"></param>
+        //static void SetTestDetail(string sn, string wifi, string bt, string code1, string code2, string code3)
+        //{
+        //    string errMessage = null;
+        //    Dictionary<string, string> info = new Dictionary<string, string>();
+        //    bool res = m_mesHelper.SetAddressInfo(sn, wifi, bt, code1, code2, code3, out errMessage);
+        //    Respone rep = new Respone();
+        //    rep.function = "SetAddressInfo";
+        //    rep.result = res;
+        //    rep.errorMessage = errMessage;
+        //    Console.Write(rep.ToString());
+        //}
+
+
+
+
+    }
+}

+ 36 - 0
MES/MES/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("MES")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MES")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("3f1ca6c0-3e77-4e42-aa92-6c323efdf101")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 28 - 0
MES/MES/Respone.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace MES
+{
+    class Respone
+    {
+        public string function = null;
+        public bool result = false;
+        public string errorMessage;
+        public JObject data = new JObject();
+
+        public override string ToString()
+        {
+            JObject obj = new JObject();
+            obj.Add("function", function);
+            obj.Add("result", result);
+            obj.Add("errorMessage", errorMessage);
+            obj.Add("data", data);
+            return obj.ToString();
+        }
+    }
+}

+ 1 - 0
UAS-出货标签管理(泽天)/PublicMethod/DataHelper.cs

@@ -797,6 +797,7 @@ namespace UAS_LabelMachine
         public object ExecuteSql(string SQL, string Type, params object[] names)
         {
             object result = null;
+            Console.WriteLine(  SQL);
             command = new OracleCommand(SQL, connection);
             Reconnect(command);
             //用来拼接参数的

File diff suppressed because it is too large
+ 187 - 37
UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs


+ 58 - 22
UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -602,9 +602,9 @@ namespace UAS_LabelMachine
             string rulecode = ShareRule == "" ? NrCode : ShareRule;
             sql.Clear();
             sql.Append("insert into prodiobarcode(PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,PIB_PDNO, PIB_PDID,PIB_PICLASS,");
-            sql.Append("PIB_BARCODE,PIB_CUSTBARCODE,PIB_QTY,pib_brand,pib_datecode,pib_lotno,PIB_OUTBOXCODE2,pib_inman,PIB_IFPRINT,PIB_ORDERCODE,PIB_CUSTPO,pib_remark,pib_midcapatity,pib_custcode,pib_ismachine,pib_rulecode) ");
+            sql.Append("PIB_BARCODE,PIB_CUSTBARCODE,PIB_QTY,pib_brand,pib_datecode,pib_lotno,PIB_OUTBOXCODE2,pib_inman,PIB_IFPRINT,PIB_ORDERCODE,PIB_CUSTPO,pib_remark,pib_midcapatity,pib_custcode,pib_ismachine,pib_rulecode,pib_remark1) ");
             sql.Append("select :PIB_ID,pd_prodcode,sysdate,pi_inoutno,pi_id,pd_pdno,pd_id,pi_class,");
-            sql.Append("'" + pib_barcode + "',:PIB_CUSTBARCODE,'" + CurrentZXBZ + "','" + Data["BRAND"] + "','" + Data["DATECODE"] + "','" + Data["LOTNO"] + "','" + pib_outboxcode2 + "','" + User.UserCode + "','" + (EnablePrint && SingleLabelAutoPrint.Checked ? 1 : 0).ToString() + "',pd_ordercode,pd_pocode,pd_remark,'" + MidboxCapacity.Value + "','" + pi_cardcode.Text + "','" + (ConnectToMachine ? "Y" : "N") + "','" + rulecode + "'");
+            sql.Append("'" + pib_barcode + "',:PIB_CUSTBARCODE,'" + CurrentZXBZ + "','" + Data["BRAND"] + "','" + Data["DATECODE"] + "','" + Data["LOTNO"] + "','" + pib_outboxcode2 + "','" + User.UserCode + "','" + (EnablePrint && SingleLabelAutoPrint.Checked ? 1 : 0).ToString() + "',pd_ordercode,pd_pocode,pd_remark,'" + MidboxCapacity.Value + "','" + pi_cardcode.Text + "','" + (ConnectToMachine ? "Y" : "N") + "','" + rulecode + "','" + remarkinfo.Text + "'");
             sql.Append("from prodinout left join prodiodetail on pi_id=pd_piid left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode where pi_id='" + PI_ID + "' and pd_prodcode='" + CurrentPrCode + "' and pd_pdno='" + CurrentPDNO + "'");
             int rowsnum = 0;
             try
@@ -672,8 +672,8 @@ namespace UAS_LabelMachine
             if (SumQty.Columns.Count == 0)
             {
                 sql.Clear();
-                sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiodetail left join prodiobarcode on pd_id=pib_pdid and pd_pdno=pib_pdno ");
-                sql.Append("where pib_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
+                sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiobarcode  left join prodiodetail  on pd_id=pib_pdid and pd_pdno=pib_pdno ");
+                sql.Append("where pd_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
                 SumQty = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             }
             //采集后重新计数,自动跳到下一行
@@ -681,8 +681,8 @@ namespace UAS_LabelMachine
             if (SumQty == null)
             {
                 sql.Clear();
-                sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiodetail left join prodiobarcode on pd_id=pib_pdid and pd_pdno=pib_pdno ");
-                sql.Append("where pib_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
+                sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiobarcode  left join prodiodetail  on pd_id=pib_pdid and pd_pdno=pib_pdno ");
+                sql.Append("where pd_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
                 SumQty = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             }
             collectqty = (SumQty.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
@@ -706,6 +706,7 @@ namespace UAS_LabelMachine
                     OutNum += float.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString());
                 }
             }
+            Console.WriteLine(DateTime.Now.ToString("yyyy-mm-dd hh:mm:ss:ffffff"));
             ProcessCount.Text = CollectNum + "/" + OutNum;
             if (CollectNum == OutNum)
             {
@@ -747,7 +748,15 @@ namespace UAS_LabelMachine
             }
             GridPrcode.Refresh();
             if (!IsSum)
-                Input.Clear();
+                if (!forinput.Checked)
+                {
+                    Input.Clear();
+                }
+                else
+                {
+                    RemainTxt();
+                }
+
         }
 
         private void AutoPrintSingleLabel()
@@ -885,7 +894,15 @@ namespace UAS_LabelMachine
                 CombindetailTwo.Checked = false;
                 CombindetailThree.Checked = false;
                 LoadCheck = true;
-                Input.Clear();
+                if (!forinput.Checked)
+                {
+                    Input.Clear();
+                }
+                else
+                {
+                    RemainTxt();
+                }
+
                 sql.Clear();
                 sql.Append("select pi_id,pi_cardcode,pi_combine_user,pi_title,to_char(pi_date,'yyyymmdd')pi_date,nvl(pi_combine_user,0)pi_combine_user,nvl(cu_controlinout,0)cu_controlinout from prodinout left join customer on pi_cardcode=cu_code where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
@@ -1520,7 +1537,14 @@ namespace UAS_LabelMachine
 
                     LogManager.DoCommandLog(pi_inoutno.Text, User.UserCode, "删除明细", "删除明细成功");
                     MessageBox.Show("删除成功", "提示");
-                    Input.Clear();
+                    if (!forinput.Checked)
+                    {
+                        Input.Clear();
+                    }
+                    else
+                    {
+                        RemainTxt();
+                    }
                     LoadPrcodeData();
                     LoadGridData(sender, e);
                     if (int.Parse(dh.getFieldDataByCondition("prodiobarcode", "count(1)", "pib_inoutno='" + pi_inoutno.Text + "'").ToString()) == 0)
@@ -1596,8 +1620,8 @@ namespace UAS_LabelMachine
                 LabelInf.FirstDisplayedScrollingRowIndex = LabelInf.Rows.Count - 1;
             }
             sql.Clear();
-            sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiodetail left join prodiobarcode on pd_id=pib_pdid and pd_pdno=pib_pdno ");
-            sql.Append("where pib_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
+            sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiobarcode  left join prodiodetail  on pd_id=pib_pdid and pd_pdno=pib_pdno ");
+            sql.Append("where pd_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
             SumQty = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
         }
 
@@ -1799,8 +1823,8 @@ namespace UAS_LabelMachine
                         if (SumQty == null)
                         {
                             sql.Clear();
-                            sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiodetail left join prodiobarcode on pd_id=pib_pdid and pd_pdno=pib_pdno ");
-                            sql.Append("where pib_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
+                            sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiobarcode  left join prodiodetail  on pd_id=pib_pdid and pd_pdno=pib_pdno ");
+                            sql.Append("where pd_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
                             SumQty = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                         }
                         string collectqty = (SumQty.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
@@ -1818,14 +1842,14 @@ namespace UAS_LabelMachine
                             string BPrUnit = GridPrcode.Rows[i].Cells["pr_unit"].Value.ToString();
                             string BPrBrand = GridPrcode.Rows[i].Cells["pd_brand"].Value.ToString();
                             string BPoCode = GridPrcode.Rows[i].Cells["pd_pocode1"].Value.ToString();
-                            string BRemark = GridPrcode.Rows[i].Cells["pd_remark"].Value.ToString();
+                            string BRemark = GridPrcode.Rows[i].Cells["pd_remark1"].Value.ToString();
                             string FProdCode = GridPrcode.Rows[i + 1].Cells["pd_prodcode"].Value.ToString();
                             string FCustProdCode = GridPrcode.Rows[i + 1].Cells["pd_custprodcode1"].Value.ToString();
                             string FPrUnit = GridPrcode.Rows[i + 1].Cells["pr_unit"].Value.ToString();
                             string FrBrand = GridPrcode.Rows[i + 1].Cells["pd_brand"].Value.ToString();
                             string FWhCode = GridPrcode.Rows[i + 1].Cells["pd_whcode"].Value.ToString();
                             string FPoCode = GridPrcode.Rows[i + 1].Cells["pd_pocode1"].Value.ToString();
-                            string FRemark = GridPrcode.Rows[i + 1].Cells["pd_remark"].Value.ToString();
+                            string FRemark = GridPrcode.Rows[i + 1].Cells["pd_remark1"].Value.ToString();
                             if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode && (CombindetailTwo.Checked && FPoCode == BPoCode || Combindetail.Checked || CombindetailThree.Checked && FRemark == BRemark))
                             {
                                 GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["pd_outqty"].Value.ToString());
@@ -1858,8 +1882,8 @@ namespace UAS_LabelMachine
                         if (SumQty == null)
                         {
                             sql.Clear();
-                            sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiodetail left join prodiobarcode on pd_id=pib_pdid and pd_pdno=pib_pdno ");
-                            sql.Append("where pib_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
+                            sql.Append("select pib_pdno,pib_prodcode,sum(pib_qty) pib_qty from  prodiobarcode  left join prodiodetail  on pd_id=pib_pdid and pd_pdno=pib_pdno ");
+                            sql.Append("where pd_inoutno='" + pi_inoutno.Text + "' group by pib_prodcode,pib_pdno order by pib_pdno ");
                             SumQty = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                         }
                         string collectqty = (SumQty.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
@@ -2213,7 +2237,8 @@ namespace UAS_LabelMachine
         {
             if (e.KeyCode == Keys.Enter)
             {
-                Input.SelectAll();
+                if (!forinput.Checked)
+                    Input.SelectAll();
             }
         }
 
@@ -3265,9 +3290,7 @@ namespace UAS_LabelMachine
         }
 
         private void OutBoxLabel_Enter(object sender, EventArgs e)
-        {
-
-        }
+        { }
 
         private void ButtonMidWeigh_Click(object sender, EventArgs e)
         {
@@ -3286,6 +3309,19 @@ namespace UAS_LabelMachine
             }
         }
 
-
+        private void RemainTxt()
+        {
+            string[] str = Input.Text.Split('*');
+            Input.Text = "";
+            if (str.Length >= 4)
+            {
+                for (int i = 0; i < 4; i++)
+                {
+                    Input.Text += str[i] + "*";
+                }
+                Input.Text.Replace("\n", "").Replace("\r", "");
+                Input.SelectionStart = Input.Text.Length;
+            }
+        }
     }
 }

+ 3 - 0
UAS-出货标签管理(泽天)/UAS_出货标签管理.resx

@@ -180,6 +180,9 @@
   <metadata name="checknum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_remark1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pib_datecode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 2 - 2
UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -280,7 +280,7 @@ namespace UAS_LabelMachine
                     MessageLog.AppendText(ex.Message + ex.StackTrace);
                     //MessageBox.Show(ex.Message + ex.StackTrace);
                 }
-              
+
             }
             pi_inoutno.BringToFront();
             LogicHandler.CustInit("0");
@@ -1188,7 +1188,7 @@ namespace UAS_LabelMachine
 
                     if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
                     {
-                        string[] param = new string[] { PI_ID, "","" };
+                        string[] param = new string[] { PI_ID, "", "" };
                         dh.CallProcedure("GetCustBarcode", ref param);
                     }
                     if (dh.GetConfig("PassOrNeg", "FTPModel").ToString() != "Y")

+ 4 - 4
UAS-出货标签管理/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace UAS_LabelMachine.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
     // (以 /str 作为命令选项),或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -47,8 +47,8 @@ namespace UAS_LabelMachine.Properties {
         }
         
         /// <summary>
-        ///   使用此强类型资源类,为所有资源查找
-        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性,对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -191,7 +191,7 @@ namespace UAS_LabelMachine.Properties {
         }
         
         /// <summary>
-        ///   查找类似于 (Icon) 的 System.Drawing.Icon 类型的本地化资源。
+        ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Icon matte_white_square_icon_business_tool_hammer_96px_571061_easyicon_net {
             get {

+ 1 - 1
UAS-出货标签管理/Properties/Settings1.Designer.cs

@@ -12,7 +12,7 @@ namespace UAS_LabelMachine.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

+ 2 - 2
UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -17,7 +17,7 @@ namespace UAS_LabelMachine
         //富为ERP地址
         public static readonly string ERPAddesss = "http://fuw.ubtob.net:8099/ERP/";
         //富为FTP
-        public static readonly string FTPAdress = "ftp://fuw.ubtob.net|printuser|printuser";
+        public static readonly string FTPAdress = "ftp://192.168.20.2|printuser|printuser";
         //Oracle端口
         public static readonly string OraclePort = "1521";
         //需要显示的账套
@@ -72,7 +72,7 @@ namespace UAS_LabelMachine
                     connection = new OracleConnection(DBConnectionString);
                     connection.Open();
                 }
-              
+
             }
             catch (Exception e) { LogManager.DoLog(e.Message); }
         }

+ 1 - 1
UAS-出货标签管理/Service References/Vivo_BoxReelRelation/Reference.cs

@@ -37,7 +37,7 @@ namespace UAS_LabelMachine.Vivo_BoxReelRelation {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

+ 0 - 10
UAS-出货标签管理/Service References/Vivo_BoxReelRelation/UAS_LabelMachine.Vivo_BoxReelRelation.ReelEntity_V1.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="ReelEntity_V1" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>UAS_LabelMachine.Vivo_BoxReelRelation.ReelEntity_V1, Service References.Vivo_BoxReelRelation.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

+ 1 - 1
UAS-出货标签管理/Service References/Vivo_GetPlateID/Reference.cs

@@ -37,7 +37,7 @@ namespace UAS_LabelMachine.Vivo_GetPlateID {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.6.1064.2")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

+ 3 - 3
UAS-出货标签管理/Service References/Vivo_New_BoxReelRelation/Reference.cs

@@ -518,7 +518,7 @@ namespace UAS_LabelMachine.Vivo_New_BoxReelRelation {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3190.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -690,7 +690,7 @@ namespace UAS_LabelMachine.Vivo_New_BoxReelRelation {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3190.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -848,7 +848,7 @@ namespace UAS_LabelMachine.Vivo_New_BoxReelRelation {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3190.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

+ 3 - 3
UAS-出货标签管理/Service References/Vivo_New_GetPlateID/Reference.cs

@@ -518,7 +518,7 @@ namespace UAS_LabelMachine.Vivo_New_GetPlateID {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3190.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -690,7 +690,7 @@ namespace UAS_LabelMachine.Vivo_New_GetPlateID {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3190.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -848,7 +848,7 @@ namespace UAS_LabelMachine.Vivo_New_GetPlateID {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3190.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

+ 2 - 3
UAS-出货标签管理/UAS-出货标签管理.csproj

@@ -56,6 +56,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -65,6 +66,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>0702B5BD480611CA32663309A8FD3717B722E307</ManifestCertificateThumbprint>
@@ -381,9 +383,6 @@
     <None Include="Service References\Vivo_BoxReelRelation\UAS_LabelMachine.Vivo_BoxReelRelation.ReelEntity.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\Vivo_BoxReelRelation\UAS_LabelMachine.Vivo_BoxReelRelation.ReelEntity_V1.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
     <None Include="Service References\Vivo_GetPlateID\ReelAPI.wsdl" />
     <None Include="Service References\Vivo_GetPlateID\UAS_LabelMachine.Vivo_GetPlateID.ReelEntity.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>

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