WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug52732虚拟清单发布修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-01 14:39:16 +08:00
parent 3adff7c3eb
commit cbe4a0b5f6
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+2 -2
View File
@@ -222,13 +222,13 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
return Result.OK().success("发布成功"); return Result.OK().success("发布成功");
} else { } else {
return Result.error("Release success!"); return Result.OK().success("Release success!");
} }
}else { }else {
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
return Result.OK().success("撤回成功"); return Result.OK().success("撤回成功");
} else { } else {
return Result.error("Withdrawal succeeded!"); return Result.OK().success("Withdrawal succeeded!");
} }
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+7 -9
View File
@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.MessageTypeEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
import com.jero.modules.domain.service.DomainUserRelService; import com.jero.modules.domain.service.DomainUserRelService;
@@ -274,11 +272,11 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
if(list.size() != 0){ if(list.size() != 0){
iDummyContentChangeEOService.saveBatch(list); iDummyContentChangeEOService.saveBatch(list);
} }
if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { // if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败"); // throw new JeroBootException("维护清单为空,发布失败");
}else{ // }else{
throw new JeroBootException("The maintenance list is empty, and publishing failed."); // throw new JeroBootException("The maintenance list is empty, and publishing failed.");
} // }
}else{ }else{
//1.查询之前保存过的基础数据 //1.查询之前保存过的基础数据
LambdaQueryWrapper<DummyContentChangeEO> wrapperBase =new LambdaQueryWrapper<>(); LambdaQueryWrapper<DummyContentChangeEO> wrapperBase =new LambdaQueryWrapper<>();
@@ -431,13 +429,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
iDummyContentChangeEOService.saveBatch(list); iDummyContentChangeEOService.saveBatch(list);
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut()); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
}else { }/*else {
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("操作成功"); throw new JeroBootException("操作成功");
} else { } else {
throw new JeroBootException("Successful operation."); throw new JeroBootException("Successful operation.");
} }
} }*/
} }
} }
}else{ }else{