合并

Src/Configs.cs

@@ -13,6 +13,7 @@ namespace Kivii.Client.SamplePackages
 
         public const string RouteLocationQuery = "/Restful/Kivii.Samples.Entities.Location/Query";
         public const string RouteSampleQuery = "/Restful/Kivii.Samples.Entities.Sample/Query";
+        public const string RouteSamplePackageInit = "/Restful/Kivii.Samples.Entities.Sample/PackageInit";
         public const string RouteSamplePrePackaging = "/Restful/Kivii.Samples.Entities.Sample/PrePackaging";
         public const string RouteSamplePackaging = "/Restful/Kivii.Samples.Entities.Sample/Packaging";
         public const string RouteSampleUnPackaging = "/Restful/Kivii.Samples.Entities.Sample/UnPackaging";

Src/FrmMain.Designer.cs

@@ -28,10 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
             this.plLeft = new System.Windows.Forms.Panel();
             this.gbInfo = new System.Windows.Forms.GroupBox();
+            this.btnInstallDriver = new System.Windows.Forms.Button();
             this.lbCurrentPackageNode = new System.Windows.Forms.Label();
             this.lbCurrentPackage = new System.Windows.Forms.Label();
             this.lbCurrentLocation = new System.Windows.Forms.Label();
@@ -71,9 +73,8 @@
             this.SampleName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SampleDealTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SampleDeadTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SampleQuantityUnit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SamplePackageName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnInstallDriver = new System.Windows.Forms.Button();
+            this.SampleQuantityUnit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.plLeft.SuspendLayout();
             this.gbInfo.SuspendLayout();
             this.gbLogin.SuspendLayout();
@@ -113,13 +114,27 @@
             this.gbInfo.TabStop = false;
             this.gbInfo.Text = "信息";
             // 
+            // btnInstallDriver
+            // 
+            this.btnInstallDriver.BackColor = System.Drawing.SystemColors.Control;
+            this.btnInstallDriver.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btnInstallDriver.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.btnInstallDriver.Location = new System.Drawing.Point(3, 272);
+            this.btnInstallDriver.Name = "btnInstallDriver";
+            this.btnInstallDriver.Size = new System.Drawing.Size(259, 38);
+            this.btnInstallDriver.TabIndex = 83;
+            this.btnInstallDriver.Text = "驱动安装";
+            this.btnInstallDriver.UseVisualStyleBackColor = false;
+            this.btnInstallDriver.Visible = false;
+            this.btnInstallDriver.Click += new System.EventHandler(this.btnInstallDriver_Click);
+            // 
             // lbCurrentPackageNode
             // 
             this.lbCurrentPackageNode.AutoSize = true;
             this.lbCurrentPackageNode.Font = new System.Drawing.Font("宋体", 12F);
             this.lbCurrentPackageNode.Location = new System.Drawing.Point(16, 180);
             this.lbCurrentPackageNode.Name = "lbCurrentPackageNode";
-            this.lbCurrentPackageNode.Size = new System.Drawing.Size(79, 16);
+            this.lbCurrentPackageNode.Size = new System.Drawing.Size(80, 16);
             this.lbCurrentPackageNode.TabIndex = 7;
             this.lbCurrentPackageNode.Text = "当前袋子:";
             // 
@@ -129,7 +144,7 @@
             this.lbCurrentPackage.Font = new System.Drawing.Font("宋体", 12F);
             this.lbCurrentPackage.Location = new System.Drawing.Point(16, 127);
             this.lbCurrentPackage.Name = "lbCurrentPackage";
-            this.lbCurrentPackage.Size = new System.Drawing.Size(79, 16);
+            this.lbCurrentPackage.Size = new System.Drawing.Size(80, 16);
             this.lbCurrentPackage.TabIndex = 6;
             this.lbCurrentPackage.Text = "当前箱号:";
             // 
@@ -139,7 +154,7 @@
             this.lbCurrentLocation.Font = new System.Drawing.Font("宋体", 12F);
             this.lbCurrentLocation.Location = new System.Drawing.Point(16, 74);
             this.lbCurrentLocation.Name = "lbCurrentLocation";
-            this.lbCurrentLocation.Size = new System.Drawing.Size(79, 16);
+            this.lbCurrentLocation.Size = new System.Drawing.Size(80, 16);
             this.lbCurrentLocation.TabIndex = 5;
             this.lbCurrentLocation.Text = "当前位置:";
             // 
@@ -149,7 +164,7 @@
             this.lbCurrentDepartment.Font = new System.Drawing.Font("宋体", 12F);
             this.lbCurrentDepartment.Location = new System.Drawing.Point(16, 21);
             this.lbCurrentDepartment.Name = "lbCurrentDepartment";
-            this.lbCurrentDepartment.Size = new System.Drawing.Size(79, 16);
+            this.lbCurrentDepartment.Size = new System.Drawing.Size(80, 16);
             this.lbCurrentDepartment.TabIndex = 4;
             this.lbCurrentDepartment.Text = "当前部门:";
             // 
@@ -481,8 +496,16 @@
             this.SampleName,
             this.SampleDealTime,
             this.SampleDeadTime,
-            this.SampleQuantityUnit,
-            this.SamplePackageName});
+            this.SamplePackageName,
+            this.SampleQuantityUnit});
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSamples.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgvSamples.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvSamples.Location = new System.Drawing.Point(3, 17);
             this.dgvSamples.Name = "dgvSamples";
@@ -552,36 +575,22 @@
             this.SampleDeadTime.Name = "SampleDeadTime";
             this.SampleDeadTime.ReadOnly = true;
             // 
-            // SampleQuantityUnit
-            // 
-            this.SampleQuantityUnit.DataPropertyName = "QuantityUnit";
-            this.SampleQuantityUnit.HeaderText = "数量/单位";
-            this.SampleQuantityUnit.MinimumWidth = 100;
-            this.SampleQuantityUnit.Name = "SampleQuantityUnit";
-            this.SampleQuantityUnit.ReadOnly = true;
-            // 
             // SamplePackageName
             // 
             this.SamplePackageName.DataPropertyName = "PackageName";
             this.SamplePackageName.HeaderText = "箱号";
-            this.SamplePackageName.MinimumWidth = 120;
+            this.SamplePackageName.MinimumWidth = 130;
             this.SamplePackageName.Name = "SamplePackageName";
             this.SamplePackageName.ReadOnly = true;
-            this.SamplePackageName.Width = 120;
+            this.SamplePackageName.Width = 130;
             // 
-            // btnInstallDriver
+            // SampleQuantityUnit
             // 
-            this.btnInstallDriver.BackColor = System.Drawing.SystemColors.Control;
-            this.btnInstallDriver.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.btnInstallDriver.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.btnInstallDriver.Location = new System.Drawing.Point(3, 272);
-            this.btnInstallDriver.Name = "btnInstallDriver";
-            this.btnInstallDriver.Size = new System.Drawing.Size(259, 38);
-            this.btnInstallDriver.TabIndex = 83;
-            this.btnInstallDriver.Text = "驱动安装";
-            this.btnInstallDriver.UseVisualStyleBackColor = false;
-            this.btnInstallDriver.Visible = false;
-            this.btnInstallDriver.Click += new System.EventHandler(this.btnInstallDriver_Click);
+            this.SampleQuantityUnit.DataPropertyName = "QuantityUnit";
+            this.SampleQuantityUnit.HeaderText = "数量/单位";
+            this.SampleQuantityUnit.MinimumWidth = 100;
+            this.SampleQuantityUnit.Name = "SampleQuantityUnit";
+            this.SampleQuantityUnit.ReadOnly = true;
             // 
             // FrmMain
             // 
@@ -593,7 +602,7 @@
             this.Controls.Add(this.plLeft);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmMain";
-            this.Text = "样品入箱客户端 1.0(23.6.14 CP2101)";
+            this.Text = "样品入箱客户端 1.4(23.7.80 CP2101)";
             this.Load += new System.EventHandler(this.FrmMain_Load);
             this.plLeft.ResumeLayout(false);
             this.gbInfo.ResumeLayout(false);
@@ -647,15 +656,15 @@
         private System.Windows.Forms.Label lbTips;
         private System.Windows.Forms.CheckBox ckbAutoCreatePackage;
         private System.Windows.Forms.Label lbLogStatus;
+        private System.Windows.Forms.Button btnInstallDriver;
         private System.Windows.Forms.DataGridViewButtonColumn SampleAction;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleBizId;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleOwnerName;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleName;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleDealTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn SampleDeadTime;
-        private System.Windows.Forms.DataGridViewTextBoxColumn SampleQuantityUnit;
         private System.Windows.Forms.DataGridViewTextBoxColumn SamplePackageName;
-        private System.Windows.Forms.Button btnInstallDriver;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SampleQuantityUnit;
     }
 }
 

Src/FrmMain.cs

@@ -10,6 +10,7 @@ using System.Drawing;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Timers;
 using System.Windows.Forms;
@@ -34,7 +35,7 @@ namespace Kivii.Client.SamplePackages
 
         private void FrmMain_Load(object sender, EventArgs e)
         {
-
+            this.WindowState = FormWindowState.Maximized;
             initControls();
             loadDefault(tbxServiceUrl, tbxUserName, tbxPassword);
             //initReader();
@@ -94,9 +95,9 @@ namespace Kivii.Client.SamplePackages
                     }
                 }
             }
-            catch
+            catch(Exception ex)
             {
-
+                throw ex;
             }
         }
 
@@ -125,9 +126,9 @@ namespace Kivii.Client.SamplePackages
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
-
+                throw ex;
             }
         }
         #endregion
@@ -205,7 +206,7 @@ namespace Kivii.Client.SamplePackages
             {
                 dgvSamples.DataSource = null;
             }));
-            var request = new SampleQuery2();
+            var request = new SampleQuery();
             request.PackageKvid = _currentPackage.Kvid;
             try
             {
@@ -272,12 +273,30 @@ namespace Kivii.Client.SamplePackages
                     return;
                 }
                 var record = resp.Results[0];
-                if (record.DealTime == null || record.DealTime.Value < DateTime.Parse("2023-06-25"))
+                bool packageNameIsA = false;
+                bool sampleBizIdWithSuffix = false;
+
+                if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("a")) packageNameIsA = true;
+                sampleBizIdWithSuffix = Regex.IsMatch(record.BizId.ToLower(), "[a-zA-Z]$", RegexOptions.IgnoreCase);
+                if (packageNameIsA)
+                {
+                    if(sampleBizIdWithSuffix) samplePackaging(record);
+                    else
+                    {
+                        MessageBox.Show("此报告号无后缀，不可入A箱!", "样品入箱");
+                        return;
+                    }
+                }
+                else
+                {
+                    if(!sampleBizIdWithSuffix) samplePackaging(record);
+                    else
                     {
-                    MessageBox.Show("此样品受理时间不在2023-06-25之后,请使用老样品系统退样", "Rfid读取样品");
+                        MessageBox.Show("此报告号有后缀，不可入B箱!", "样品入箱");
                         return;
                     }
-                samplePackaging(record);
+                }
+                
             }
             catch (Exception ex)
             {
@@ -288,6 +307,11 @@ namespace Kivii.Client.SamplePackages
         private void samplePackaging(Sample sample)
         {
             if (sample == null) return;
+            if (_currentPackage == null) return;
+            if (_currentPackage.PackageName.IsNullOrEmpty())
+            {
+                _currentPackage.PackageName = cbSetCurrentPackageNode.Text;
+            }
             var request = new SamplePackaging();
             request.Package = _currentPackage;
             request.Kvid = sample.Kvid;
@@ -304,7 +328,7 @@ namespace Kivii.Client.SamplePackages
                 if (_currentSamples == null) _currentSamples = new List<Sample>();
                 if (!_currentSamples.Exists(o => o.Kvid == record.Kvid))
                 {
-                    _currentSamples.Add(record);
+                    _currentSamples.Insert(0, record);
                 }
                 this.Invoke(new Action(delegate
                 {
@@ -361,12 +385,24 @@ namespace Kivii.Client.SamplePackages
         }
         private void setCurrentPackage(Sample package)
         {
+            if (package.CurrentLocation != null)
+            {
+                if (package.CurrentLocation.InternalCode == "Location.Warehouse101")
+                {
+                    MessageBox.Show("当前箱子已经交接至仓库，无法设置", "箱号设置失败");
+                    return;
+
+                }
+            }
+            
             _currentPackage = new Sample();
             _currentPackage.PopulateWith(package);
             tbSetCurrentPackage.Enabled = _currentPackage == null;
-            tbCurrentPackage.Text = _currentPackage.Name + (_currentPackage.PackageName.IsNullOrEmpty() ? "" : $"({_currentPackage.PackageName})");
             btnClearCurrentPackage.Enabled = _currentPackage != null;
             cbSetCurrentPackageNode.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
+            cbSetCurrentPackageNode.SelectedIndex = 0;
+            _currentPackage.PackageName = cbSetCurrentPackageNode.Text;
+            tbCurrentPackage.Text = _currentPackage.Name + (_currentPackage.PackageName.IsNullOrEmpty() ? "" : $"({_currentPackage.PackageName})");
             btnScanRfid.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
             tbScanSample.Enabled = _currentPackage.Status == (int)PackageStatus.Empty || _currentPackage.Status == (int)PackageStatus.Full;
             tbScanSample.Text = "";
@@ -379,7 +415,6 @@ namespace Kivii.Client.SamplePackages
                 MessageBox.Show("当前箱子已入库,无法继续操作!", "箱号设置");
                 return;
             }
-            cbSetCurrentPackageNode.SelectedIndex = 0;
             Thread.Sleep(200);
             btnScanRfid_Click(null, null);
         }
@@ -396,69 +431,20 @@ namespace Kivii.Client.SamplePackages
                 MessageBox.Show("请输入箱号!");
                 return;
             }
-            var request = new SampleQuery();
-            request.Name = tbSetCurrentPackage.Text;
-            request.Type = SampleType.Package;
+            var request = new SamplePackageInit();
+            request.PackageName = tbSetCurrentPackage.Text;
+            request.AutoCreate = ckbAutoCreatePackage.Checked;
             try
             {
                 var resp = _client.Post(request);
-                if (resp.Results.Count <= 0)
-                {
-                    if (!ckbAutoCreatePackage.Checked)
+                if (resp.Result == null)
                 {
                     _currentPackage = null;
                     MessageBox.Show("未找到箱号!", "箱号设置");
                     return;
                 }
-                    else
-                    {
-                        var requestCreate = new PackageCreate();
-                        requestCreate.Item = new Sample();
-                        requestCreate.Item.Name = tbSetCurrentPackage.Text;
-                        requestCreate.Item.Type = SampleType.Package;
-                        requestCreate.Item.OperateTime = DateTime.Now;
-                        try
-                        {
-                            var res = _client.Post(requestCreate);
-                            if (res.Results.Count <= 0)
-                            {
-                                _currentPackage = null;
-                                MessageBox.Show("创建箱号失败!", "箱号设置");
-                                return;
-                            }
-                            var createPackage = res.Results.FirstOrDefault();
-                            setCurrentPackage(createPackage);
-                            return;
-                        }
-                        catch (Exception ex)
-                        {
-                            _currentPackage = null;
-                            MessageBox.Show(ex.GetResponseStatus().Message, "创建箱号失败");
-                            return;
-                        }
-                        //var createTask = _client.PostAsync(requestCreate);
-                        //createTask.Success(res =>
-                        //{
-                        //    if (res.Results.Count <= 0)
-                        //    {
-                        //        _currentPackage = null;
-                        //        MessageBox.Show("创建箱号失败!", "箱号设置");
-                        //        return;
-                        //    }
-                        //    var createPackage = res.Results.FirstOrDefault();
-                        //    setCurrentPackage(createPackage);
-                        //    return;
-                        //});
-                        //createTask.Error(ex =>
-                        //{
-                        //    _currentPackage = null;
-                        //    MessageBox.Show("创建箱号失败!", "箱号设置");
-                        //    return;
-                        //});
-                        //return;
-                    }
-                }
-                var package = resp.Results.FirstOrDefault();
+                var package = resp.Result;
+                package.RemoveAllOnlyProperties();
                 setCurrentPackage(package);
             }
             catch (Exception ex)
@@ -534,8 +520,10 @@ namespace Kivii.Client.SamplePackages
             btnLogin.Enabled = false;
             _client = new JsonServiceClient(tbxServiceUrl.Text);
             var auth = new Authenticate { UserName = tbxUserName.Text, Password = tbxPassword.Text, provider = "Kivii" };
-            var task = _client.PostAsync(auth);
-            task.Success(resp =>
+            var resp = _client.Post(auth);
+            try
+            {
+                if (resp != null)
                 {
                     initUserInfo(resp);
                     btnLogin.Enabled = false;
@@ -547,15 +535,37 @@ namespace Kivii.Client.SamplePackages
                     lbLogStatus.ForeColor = Color.Green;
                     //tbSetCurrentPackage.Enabled = !btnLogin.Enabled;
                     setDefault(tbxServiceUrl, tbxUserName, tbxPassword);
-            }, true);
-            task.Error(err =>
+                }
+            }
+            catch(Exception ex)
             {
                 btnLogin.Enabled = true;
                 initUserInfo();
                 _client.Dispose();
                 _client = null;
-                MessageBox.Show(err.Message, "Login Error");
-            }, true);
+                MessageBox.Show(ex.Message, "Login Error");
+            }
+            //task.Success(resp =>
+            //{
+            //    initUserInfo(resp);
+            //    btnLogin.Enabled = false;
+            //    btnLogout.Enabled = !btnLogin.Enabled;
+            //    tbxServiceUrl.Enabled = btnLogin.Enabled;
+            //    tbxUserName.Enabled = btnLogin.Enabled;
+            //    tbxPassword.Enabled = btnLogin.Enabled;
+            //    lbLogStatus.Text = "登录成功";
+            //    lbLogStatus.ForeColor = Color.Green;
+            //    //tbSetCurrentPackage.Enabled = !btnLogin.Enabled;
+            //    setDefault(tbxServiceUrl, tbxUserName, tbxPassword);
+            //}, true);
+            //task.Error(err =>
+            //{
+            //    btnLogin.Enabled = true;
+            //    initUserInfo();
+            //    _client.Dispose();
+            //    _client = null;
+            //    MessageBox.Show(err.Message, "Login Error");
+            //}, true);
         }
 
         private void btnLogout_Click(object sender, EventArgs e)
@@ -640,7 +650,14 @@ namespace Kivii.Client.SamplePackages
         private void cbSetCurrentPackageNode_TextChanged(object sender, EventArgs e)
         {
             tbCurrentPackageNode.Text = cbSetCurrentPackageNode.Text;
-            if (_currentPackage != null) _currentPackage.PackageName = cbSetCurrentPackageNode.Text;
+            
+            if (_currentPackage != null)
+            {
+                _currentPackage.PackageName = cbSetCurrentPackageNode.Text;
+
+                tbCurrentPackage.Text = _currentPackage.Name + (_currentPackage.PackageName.IsNullOrEmpty() ? "" : $"({_currentPackage.PackageName})");
+            }
+
         }
 
         private void dgvSamples_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)

Src/FrmMain.resx

@@ -135,10 +135,10 @@
   <metadata name="SampleDeadTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="SampleQuantityUnit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="SamplePackageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="SamplePackageName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="SampleQuantityUnit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

Src/Kivii.Client.SamplePackages.V4.0.csproj

@@ -34,6 +34,9 @@
   <PropertyGroup>
     <ApplicationIcon>F.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Kivii.Common.V4.0, Version=5.6.2023.4000, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Kivii.Common.5.6.2023.4000\lib\net40\Kivii.Common.V4.0.dll</HintPath>
@@ -88,6 +91,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <None Include="App.config" />
+    <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2023.6190")]
-[assembly: AssemblyFileVersion("5.4.2023.6190")]
+[assembly: AssemblyVersion("5.4.2023.7080")]
+[assembly: AssemblyFileVersion("5.4.2023.7080")]

Src/Requests/RestfulRequests.cs

@@ -12,18 +12,17 @@ namespace Kivii.Samples.Transforms
     {
         public Guid OwnerKvid { get; set; }
     }
-
-    [Route(Configs.RouteSampleQuery)]
-    public class SampleQuery : IReturn<RestfulQueryResponse<Sample>>
+    [Route(Configs.RouteSamplePackageInit)]
+    public class SamplePackageInit : IReturn<RestfulReadResponse<Sample>>
     {
-        public string Name { get; set; }
-        public SampleType Type { get; set; }
-
-        //public Guid PackageKvid { get; set; }
+        public string PackageName { get; set; }
+        public bool AutoCreate { get; set; }
+        public bool IncludeLocation { get; set; } = true;
     }
 
+
     [Route(Configs.RouteSampleQuery)]
-    public class SampleQuery2 : IReturn<RestfulQueryResponse<Sample>>
+    public class SampleQuery : IReturn<RestfulQueryResponse<Sample>>
     {
         public Guid PackageKvid { get; set; }
     }

Src/app.manifest

+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。n
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则删除此
+            元素。
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，
+           Windows 将自动选择最兼容的环境。 -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- 指示该应用程序可以感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(目标设定为 .NET Framework 4.6 )还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。-->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>