chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
dev
jianghaiqing 4 weeks ago
parent 151e00a4d1 95007b6ab2
commit d563cb1b52
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs
Unescape Escape View File

@ -2548,7 +2548,7 @@ public class CommonService : ICommonService
{ {
try try
{ {
Monitor.Enter(ImportLockObj); //Monitor.Enter(ImportLockObj);
int delimiterNum = 0; int delimiterNum = 0;
for (global::System.Int32 i = 0; i < ruleList.Count; i++) for (global::System.Int32 i = 0; i < ruleList.Count; i++)
{ {
@ -2650,7 +2650,7 @@ public class CommonService : ICommonService
finally finally
{ {
//if (Monitor.IsEntered(ImportLockObj)) //if (Monitor.IsEntered(ImportLockObj))
Monitor.Exit(ImportLockObj); //Monitor.Exit(ImportLockObj);
} }
return DataResult<string>.Success(sequenceNewNo); return DataResult<string>.Success(sequenceNewNo);

15
ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs
Unescape Escape View File

@ -3734,14 +3734,15 @@ namespace DS.WMS.Core.TaskPlat.Method
{ {
result.batchTotal += " -"; result.batchTotal += " -";
} }
if (result.succ)
{
return DataResult<TaskManageOrderResultDto>.Success(result); return DataResult<TaskManageOrderResultDto>.Success(result);
} //if (result.succ)
else //{
{ // return DataResult<TaskManageOrderResultDto>.Success(result);
return DataResult<TaskManageOrderResultDto>.FailedData(result); //}
} //else
//{
// return DataResult<TaskManageOrderResultDto>.FailedData(result);
//}
} }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save