|
@@ -261,8 +261,8 @@ public class SyCostAllocationController {
|
|
QueryWrapper queryWrapper=new QueryWrapper();
|
|
QueryWrapper queryWrapper=new QueryWrapper();
|
|
queryWrapper.eq("plan_num",planNum);
|
|
queryWrapper.eq("plan_num",planNum);
|
|
SyCostJson syCostJson=syCostJsonService.getOne(queryWrapper);
|
|
SyCostJson syCostJson=syCostJsonService.getOne(queryWrapper);
|
|
- System.out.println("SyCostJson\t"+syCostJson);
|
|
|
|
- if (syCostJson!=null&&!syCostJson.getStatus().equals("保存")){
|
|
|
|
|
|
+ if (syCostJson!=null&&(!syCostJson.getStatus().equals("保存")&&
|
|
|
|
+ !syCostJson.getStatus().equals("返单"))){
|
|
return Result.error("该单据是"+syCostJson.getStatus()+"状态,不能保存");
|
|
return Result.error("该单据是"+syCostJson.getStatus()+"状态,不能保存");
|
|
}
|
|
}
|
|
Result<T> result = syCostAllocationService.saveMain(planNum, json);
|
|
Result<T> result = syCostAllocationService.saveMain(planNum, json);
|