优化设置箱号接口

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.cs

@@ -205,7 +205,7 @@ namespace Kivii.Client.SamplePackages
             {
                 dgvSamples.DataSource = null;
             }));
-            var request = new SampleQuery2();
+            var request = new SampleQuery();
             request.PackageKvid = _currentPackage.Kvid;
             try
             {
@@ -361,12 +361,16 @@ namespace Kivii.Client.SamplePackages
         }
         private void setCurrentPackage(Sample package)
         {
-            if(package.CurrentLocation.InternalCode== "Location.Warehouse101")
+            if (package.CurrentLocation != null)
             {
-                MessageBox.Show("当前箱子已经交接至仓库，无法设置", "箱号设置失败");
-                return;
+                if (package.CurrentLocation.InternalCode == "Location.Warehouse101")
+                {
+                    MessageBox.Show("当前箱子已经交接至仓库，无法设置", "箱号设置失败");
+                    return;
 
+                }
             }
+            
             _currentPackage = new Sample();
             _currentPackage.PopulateWith(package);
             tbSetCurrentPackage.Enabled = _currentPackage == null;
@@ -403,50 +407,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 (resp.Result == null)
                 {
-                    if (!ckbAutoCreatePackage.Checked)
-                    {
-                        _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();
-                            createPackage.RemoveAllOnlyProperties();
-                            setCurrentPackage(createPackage);
-                            return;
-                        }
-                        catch (Exception ex)
-                        {
-                            _currentPackage = null;
-                            MessageBox.Show(ex.GetResponseStatus().Message, "创建箱号失败");
-                            return;
-                        }
-                    }
+                    _currentPackage = null;
+                    MessageBox.Show("未找到箱号!", "箱号设置");
+                    return;
                 }
-                var package = resp.Results.FirstOrDefault();
+                var package = resp.Result;
+                package.RemoveAllOnlyProperties();
                 setCurrentPackage(package);
             }
             catch (Exception ex)

Src/Requests/RestfulRequests.cs

@@ -12,19 +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 string PackageName { get; set; }
+        public bool AutoCreate { get; set; }
         public bool IncludeLocation { get; set; } = true;
-
-        //public Guid PackageKvid { get; set; }
     }
 
+
     [Route(Configs.RouteSampleQuery)]
-    public class SampleQuery2 : IReturn<RestfulQueryResponse<Sample>>
+    public class SampleQuery : IReturn<RestfulQueryResponse<Sample>>
     {
         public Guid PackageKvid { get; set; }
     }