From 0b5ccdca6263cf7a2cee460f30c76ef1efea2811 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 27 四月 2024 17:47:27 +0800
Subject: [PATCH] 人工出库,人工入库,人工移库,PDA扫码确认外协物料已被取走接口

---
 代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
index ca5afa7..f807711 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
@@ -59,7 +59,7 @@
             WebResponseContent webResponse = new WebResponseContent();
             try
             {
-                var Tel = UserContext.Current.UserInfo.Tel;//缂撳瓨鏋舵潈闄�
+                var Tel = UserContext.Current.UserInfo.Tel;
                 var data = JsonConvert.DeserializeObject<Parm>(json.ToString());
                 //var updateList = FreeDB.DB.Select<dt_stationinfo>().Where(t => data.data.Contains(t.id.ToString())).ToList();
                 var updateList = _repository.Find(x => data.data.Contains(x.id.ToString())).ToList();
@@ -95,11 +95,28 @@
             }
             return webResponse;
         }
+
+        public WebResponseContent SendAGVTask(object json)
+        {
+            WebResponseContent webResponse = new WebResponseContent();
+            try
+            {
+
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return webResponse;
+        }
+
         public override WebResponseContent Add(SaveModel saveDataModel)
         {
 
             return base.Add(saveDataModel);
         }
+
+
 
         public override WebResponseContent Update(SaveModel saveModel)
         {
@@ -129,17 +146,23 @@
                 station.heatNumber = string.Empty;
                 station.Number = string.Empty;
             }
-            station.tray_status = list.Count == 0 ? "EmptyTray" : "StrogeTray";
+            station.tray_status = string.IsNullOrEmpty(station.stationType) ? "EmptyTray" : "StrogeTray";
+            if (station.location_state == "Empty" && !string.IsNullOrEmpty(station.stationType))
+            {
+                webResponse.Error("鍥惧彿涓嶄负绌�,璐т綅鐘舵�佷笉鑳借缃负绌鸿揣浣嶏紒");
+            }
+            //station.tray_status = list.Count == 0 ? "EmptyTray" : "StrogeTray";
             if (station.location_state == "Empty")
             {
                 station.stationType = string.Empty;
                 station.heatNumber = string.Empty;
                 station.Number = string.Empty;
+                station.billetID = string.Empty;
                 station.tray_status = string.Empty;
                 station.bindSN = string.Empty;
                 station.quantity = 0;
-                if (!station.stationCode.Contains("S") && !station.stationCode.Contains("X") && !station.stationCode.Contains("W01001004") && !station.stationCode.Contains("W01001005"))
-                    station.tray_type = string.Empty;
+                //if (!station.stationCode.Contains("S") && !station.stationCode.Contains("X") && !station.stationCode.Contains("W01001004") && !station.stationCode.Contains("W01001005"))
+                //    station.tray_type = string.Empty;
             }
             var count = _repository.Update(station, true);
             if (count > 0)

--
Gitblit v1.9.3