From 3de61d612eeb0e43d042f5e6b1e26df392b81e29 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Sat, 6 Jan 2024 10:14:08 +0800
Subject: [PATCH] =?UTF-8?q?save-=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Scada.Business/InStoreBusiness.cs    | 4 ++--
 Aucma.Scada.Business/InStoreTaskHandle.cs  | 1 -
 Aucma.Scada.Business/OutStoreBusiness.cs   | 4 ++++
 Aucma.Scada.Business/OutStoreTaskHandle.cs | 7 +++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs
index a30942f3..5935643a 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -40,7 +40,6 @@ namespace Aucma.Scada.Business
         private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance;
       
 
-
         #endregion
 
         #region 接口引用
@@ -150,6 +149,7 @@ namespace Aucma.Scada.Business
                     var result = CreateInStoreTask(spaceInfo, materialCode); //创建入库任务
                     if (result)
                     {
+
                         #region 2023-12-15 更新过点数据,插入记录到MATERIAL_COMPLETION表 
                         PrintBarCode print =_printBarCodeServices.query(materialCode);
                         string planCode =  _productPlanInfoServices.GetPlanCode(print.OrderCode, appConfig.stationCode);
@@ -456,7 +456,7 @@ namespace Aucma.Scada.Business
             string result = string.Empty;
             if (!string.IsNullOrEmpty(materialCode))
             {
-                result = materialCode.Substring(2, 10);
+                result = materialCode.Substring(7, 10);
             }
 
             return result;
diff --git a/Aucma.Scada.Business/InStoreTaskHandle.cs b/Aucma.Scada.Business/InStoreTaskHandle.cs
index 25508fb3..68c5bfe7 100644
--- a/Aucma.Scada.Business/InStoreTaskHandle.cs
+++ b/Aucma.Scada.Business/InStoreTaskHandle.cs
@@ -156,7 +156,6 @@ namespace Aucma.Scada.Business
                                         //写入任务号
                                         _plc.writeStringByAddress(plcConfig.in_shell_task, string.Empty);
                                         isFlag = false;
-
                                         WritePlc(taskInfo.storeCode, taskInfo.spaceCode, false);
 
                                         //ReadShellFinish_InStore(taskCode);
diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs
index bcbf9716..bc589e36 100644
--- a/Aucma.Scada.Business/OutStoreBusiness.cs
+++ b/Aucma.Scada.Business/OutStoreBusiness.cs
@@ -248,6 +248,10 @@ namespace Aucma.Scada.Business
                         PrintLogInfoMessage("出库任务创建失败");
                     }
                 }
+                else
+                {
+                    PrintLogInfoMessage("出库任务创建失败，货道明细为空");
+                }
             }
             catch (Exception ex)
             {
diff --git a/Aucma.Scada.Business/OutStoreTaskHandle.cs b/Aucma.Scada.Business/OutStoreTaskHandle.cs
index f61abe50..d0d7d02b 100644
--- a/Aucma.Scada.Business/OutStoreTaskHandle.cs
+++ b/Aucma.Scada.Business/OutStoreTaskHandle.cs
@@ -174,15 +174,14 @@ namespace Aucma.Scada.Business
                                     _plc.writeInt32ByAddress(plcConfig.out_shell_amount, 0);
                                     //写入应答字
                                     _plc.writeInt32ByAddress(plcConfig.out_shell_answer, 0);
-                                    //写入任务号
-                                    _plc.writeStringByAddress(plcConfig.out_shell_task, string.Empty);
+                                    
                                     isFlag = false;
 
                                     //ReadShellFinish_OutStore(taskInfo.taskCode);
 
                                     OutStoreAnswerEvent?.Invoke(appConfig.shellStoreCode, taskInfo.taskCode);
 
-                                    //shellTaskInfos.Add(taskInfo);
+                               
                                 }
 
                                 Thread.Sleep(1000);
@@ -234,7 +233,7 @@ namespace Aucma.Scada.Business
 
                                     isFlag = false;
 
-                                    //shellTaskInfos.Remove(taskInfo);
+                                 
                                 }
 
                                 Thread.Sleep(1000);