From c3b60d865c3457c35054446e81b352e93e00a696 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期一, 12 一月 2026 18:31:11 +0800
Subject: [PATCH] 更改了大部分功能和逻辑

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Container/Partial/VV_ContainerInfoService.cs |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Container/Partial/VV_ContainerInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Container/Partial/VV_ContainerInfoService.cs"
index 3f230cd..ae2b26e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Container/Partial/VV_ContainerInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Container/Partial/VV_ContainerInfoService.cs"
@@ -202,12 +202,35 @@
         public WebResponseContent BoxOutboundByManual(SaveModel saveModel)
         {
             WebResponseContent content = new WebResponseContent();
+            WebResponseContent content2 = new WebResponseContent();
             try
             {
                 if (saveModel.DelKeys.Count > 0)
                 {
+                    content2 = WCSApi.GetInboundLineCurrentModel(saveModel);
+
                     var contianerList = saveModel.DelKeys;
                     string workStation = saveModel.MainData["workStation"].ToString();
+                    
+                    
+
+                    if (content2.Status)
+                    {
+                        Dictionary<string, string> returndic = JsonConvert.DeserializeObject<Dictionary<string, string>>(content2.Data.ToString());
+                        var controlModel = returndic["controlModel"]; // 鍏ュ簱鍖虹殑妯″紡
+                        var modelResult = returndic["modelResult"]; // 鍑哄簱鍖哄煙鐨勬ā寮�
+                        if (workStation == "20101")
+                        {
+                            if (controlModel!= "鑱旀満妯″紡")
+                            {
+                                return content.Error($"鍏ュ簱鍖哄煙褰撳墠涓嶅浜庛�愯仈鏈烘ā寮忋��");
+                            }
+                        }
+                        else if (modelResult != "鑱旀満妯″紡")
+                        {
+                            return content.Error($"鍑哄簱鍖哄煙褰撳墠涓嶅浜庛�愯仈鏈烘ā寮忋��");
+                        }
+                    }
 
                     //if (workStation != "鍏ュ簱鍙�")
                     //    throw new Exception("::Error::=> 鍑哄簱绾夸綋杩樺湪瀹夎涓紝鏃犳硶鏂板缓锛�");
@@ -824,6 +847,11 @@
                         locationinfo.location_state = LocationState.LocationState_Box_Measure_Out_Wait_Executing.ToString();
                         Dt_locationinfoRepository.Instance.Update(locationinfo, true);
 
+                        // 鏇存敼娴嬮噺鍑哄簱鐨勭姸鎬佷负涓烘祴閲�
+                        Dt_container_detail dt_container_detail = Dt_container_detailRepository.Instance.FindFirst(x => x.containerdtl_barcode == containerInfo.containerdtl_barcode);
+                        dt_container_detail.containerdtl_text1 = "鏈祴閲�";
+                        Dt_container_detailRepository.Instance.Update(dt_container_detail, true);
+
                         string target = CommonFunction.GetInboundAddress(general_Info, locationinfo.location_layer);
                         //鐢熸垚WMS浠诲姟
                         Dt_taskinfo taskinfo = new Dt_taskinfo();

--
Gitblit v1.9.3