From 66b1b95f207cbf623e0ef216c963d2e96a6923f6 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期一, 16 十二月 2024 18:44:22 +0800
Subject: [PATCH] 修改问题

---
 Wms/WMS.BLL/BllTransServer/RcsServer.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 7d54d41..270b6ef 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -229,7 +229,7 @@
                                 //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
                                 logTaskEntry2.IsSuccess = 1;
                                 logTaskEntry2.IsSend = 0;
-                                logTaskEntry2.IsCancel = 0;
+                                //logTaskEntry2.IsCancel = 0;
                                 logTaskEntry2.BackDate = DateTime.Now;
                                 logTaskEntry2.Status = "1";
                                 Db.Insertable(logTaskEntry2).ExecuteCommand();
@@ -303,7 +303,7 @@
                     //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
                     logTaskEntry.IsSuccess = 1;
                     logTaskEntry.IsSend = 0;
-                    logTaskEntry.IsCancel = 0;
+                    //logTaskEntry.IsCancel = 0;
                     logTaskEntry.BackDate = DateTime.Now;
                     logTaskEntry.Status = "1";//姝e湪鎵ц
                     Db.Insertable(logTaskEntry).ExecuteCommand();
@@ -485,7 +485,7 @@
                     //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
                     logTaskEntry.IsSuccess = 1;
                     logTaskEntry.IsSend = 0;
-                    logTaskEntry.IsCancel = 0;
+                    //logTaskEntry.IsCancel = 0;
                     logTaskEntry.BackDate = DateTime.Now;
                     logTaskEntry.Status = "1";//姝e湪鎵ц
                     Db.Insertable(logTaskEntry).ExecuteCommand();
@@ -788,10 +788,10 @@
                 {
                     throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
                 }
-                if (task.Status != "0")
-                {
-                    throw new Exception("鍙湁绛夊緟鎵ц鐨勪换鍔℃墠鍙彇娑�");
-                }
+                //if (task.Status != "0")
+                //{
+                //    throw new Exception("鍙湁绛夊緟鎵ц鐨勪换鍔℃墠鍙彇娑�");
+                //}
                 //淇敼浠诲姟 
                 task.IsSuccess = 0;
                 task.IsSend = 0;
@@ -802,7 +802,7 @@
                 Db.Updateable(task).ExecuteCommand();
 
                 //淇敼璧峰鍌ㄤ綅淇℃伅
-                var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.StartLocat && a.Status == "3");//鍑哄簱涓�
+                var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
                 if (locat == null)
                 {
                     throw new Exception("鏈煡璇㈠埌璧峰浣嶇疆鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
@@ -811,7 +811,7 @@
                 Db.Updateable(locat).ExecuteCommand();
 
                 //淇敼鐩爣鍌ㄤ綅淇℃伅
-                var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.EndLocat && a.Status == "2");//鍏ュ簱涓�
+                var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.EndLocat);
                 if (locatEnd == null)
                 {
                     throw new Exception("鏈煡璇㈠埌鐩爣浣嶇疆鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");                    

--
Gitblit v1.8.0