Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

4 weeks ago · d563cb1b52
parent 151e00a4d1 95007b6ab2
commit d563cb1b52
2 changed files with 11 additions and 10 deletions
--- a/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs
+++ b/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs
@ -2548,7 +2548,7 @@ public class CommonService : ICommonService
            {
                try
                {
-                    Monitor.Enter(ImportLockObj);
+                    //Monitor.Enter(ImportLockObj);
                    int delimiterNum = 0;
                    for (global::System.Int32 i = 0; i < ruleList.Count; i++)
                    {
@ -2650,7 +2650,7 @@ public class CommonService : ICommonService
                finally
                {
                    //if (Monitor.IsEntered(ImportLockObj))
-                    Monitor.Exit(ImportLockObj);
+                    //Monitor.Exit(ImportLockObj);
                }

                return DataResult<string>.Success(sequenceNewNo);
--- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs
+++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs
@ -3734,14 +3734,15 @@ namespace DS.WMS.Core.TaskPlat.Method
            {
                result.batchTotal += " -";
            }
-            if (result.succ)
-            {
-                return DataResult<TaskManageOrderResultDto>.Success(result);
-            }
-            else
-            {
-                return DataResult<TaskManageOrderResultDto>.FailedData(result);
-            }
+            return DataResult<TaskManageOrderResultDto>.Success(result);
+            //if (result.succ)
+            //{
+            //    return DataResult<TaskManageOrderResultDto>.Success(result);
+            //}
+            //else
+            //{
+            //    return DataResult<TaskManageOrderResultDto>.FailedData(result);
+            //}
        }

        /// <summary>