bonus
/
gz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
haozq 2024-11-15 09:22:02 +08:00
parent 93a24761d1
commit 9fceb1844f
24 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/bonus/gzgqj/business/bases/controller/PartApplyController.java
View File

@ -67,8 +67,8 @@ public class PartApplyController {
* @return
*/
@GetMapping("getPartDetailsList")
@DecryptAndVerify(decryptedClass = PartApplyAppVo.class)
public PageInfo<PartApplyDetailAppVo> getPartDetailsList(EncryptedReq<PartApplyAppVo> dto) {
@DecryptAndVerify(decryptedClass = PartApplyDetailAppVo.class)
public PageInfo<PartApplyDetailAppVo> getPartDetailsList(EncryptedReq<PartApplyDetailAppVo> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PartApplyDetailAppVo> list = service.getPartDetailsList(dto.getData());;
PageInfo<PartApplyDetailAppVo> pageInfo = new PageInfo<>(list);
@ -108,7 +108,7 @@ public class PartApplyController {
* @param
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartApplyAppVo dto) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartApplyDetailAppVo dto) {
try {
List<PartApplyDetailAppVo> list = service.getPartDetailsList(dto);;
final int[] num = {1};

4
src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java
View File

@ -91,7 +91,7 @@ public class PartBackController {
*/
@GetMapping("getInfoDetailsList")
@DecryptAndVerify(decryptedClass = PartBackVo.class)
public PageInfo<PartBackDetailsVo> getInfoDetailsList(EncryptedReq<PartBackVo> dto) {
public PageInfo<PartBackDetailsVo> getInfoDetailsList(EncryptedReq<PartBackDetailsVo> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PartBackDetailsVo> list = service.getInfoDetailsList(dto.getData());;
PageInfo<PartBackDetailsVo> pageInfo = new PageInfo<>(list);
@ -132,7 +132,7 @@ public class PartBackController {
* @param
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartBackVo dto) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartBackDetailsVo dto) {
try {
List<PartBackDetailsVo> list = service.getInfoDetailsList(dto);;
final int[] num = {1};

4
src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java
View File

@ -81,7 +81,7 @@ public class PartCheckController {
*/
@GetMapping("getDetailsByIdList")
@DecryptAndVerify(decryptedClass = PartCheckVo.class)
public PageInfo<PartCheckDetailsVo> getDetailsByIdList(EncryptedReq<PartCheckVo> dto) {
public PageInfo<PartCheckDetailsVo> getDetailsByIdList(EncryptedReq<PartCheckDetailsVo> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PartCheckDetailsVo> list = service.getDetailsByIdList(dto.getData());;
PageInfo<PartCheckDetailsVo> pageInfo = new PageInfo<>(list);
@ -124,7 +124,7 @@ public class PartCheckController {
* @param
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartCheckVo dto) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartCheckDetailsVo dto) {
try {
List<PartCheckDetailsVo> list = service.getDetailsByIdList(dto);;
final int[] num = {1};

8
src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
View File

@ -90,7 +90,7 @@ public class PartInputController {
* @param
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartInputVo dto) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartInputDetails dto) {
try {
List<PartInputDetails> list = service.getInputDetailList(dto);;
final int[] num = {1};
@ -151,8 +151,8 @@ public class PartInputController {
* @return
*/
@GetMapping("getInputDetailListByPage")
@DecryptAndVerify(decryptedClass = PartInputVo.class)
public PageInfo<PartInputDetails> getInputDetailListByPage(EncryptedReq<PartInputVo> dto) {
@DecryptAndVerify(decryptedClass = PartInputDetails.class)
public PageInfo<PartInputDetails> getInputDetailListByPage(EncryptedReq<PartInputDetails> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PartInputDetails> list = service.getInputDetailList(dto.getData());;
PageInfo<PartInputDetails> pageInfo = new PageInfo<>(list);
@ -167,7 +167,7 @@ public class PartInputController {
*/
@GetMapping("getInputDetailList")
@DecryptAndVerify(decryptedClass = PartInputVo.class)
public ServerResponse getInputDetailList(EncryptedReq<PartInputVo> dto) {
public ServerResponse getInputDetailList(EncryptedReq<PartInputDetails> dto) {
List<PartInputDetails> list = service.getInputDetailList(dto.getData());;
return ServerResponse.createSuccess(list);
}

6
src/main/java/com/bonus/gzgqj/business/bases/controller/PartScrapController.java
View File

@ -86,8 +86,8 @@ public class PartScrapController {
* @return
*/
@GetMapping("getDetailsByIdList")
@DecryptAndVerify(decryptedClass = PartScrapVo.class)
public PageInfo<PartScrapDetailsVo> getDetailsByIdList(EncryptedReq<PartScrapVo> dto) {
@DecryptAndVerify(decryptedClass = PartScrapDetailsVo.class)
public PageInfo<PartScrapDetailsVo> getDetailsByIdList(EncryptedReq<PartScrapDetailsVo> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PartScrapDetailsVo> list = service.getDetailsByIdList(dto.getData());
PageInfo<PartScrapDetailsVo> pageInfo = new PageInfo<>(list);
@ -133,7 +133,7 @@ public class PartScrapController {
* @param
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartScrapVo dto) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartScrapDetailsVo dto) {
try {
List<PartScrapDetailsVo> list = service.getDetailsByIdList(dto);;
final int[] num = {1};

2
src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java
View File

@ -97,7 +97,7 @@ public class StatisticsController {
*/
@GetMapping("getProDetailsPage")
@DecryptAndVerify(decryptedClass = ProjectInfoVo.class)
public PageInfo<PartApplyDetailAppVo> getProDetailsPage(EncryptedReq<ProjectInfoVo> dto) {
public PageInfo<PartApplyDetailAppVo> getProDetailsPage(EncryptedReq<PartApplyDetailAppVo> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PartApplyDetailAppVo> list = service.getProDetailsPage(dto.getData());;
PageInfo<PartApplyDetailAppVo> pageInfo = new PageInfo<>(list);

1
src/main/java/com/bonus/gzgqj/business/bases/entity/PartScrapDetailsVo.java
View File

@ -48,7 +48,6 @@ public class PartScrapDetailsVo {
*/
@Excel(name = "配件型号", width = 10.0, orderNum = "4")
private String partModel;
/**
* 配件类型
*/

2
src/main/java/com/bonus/gzgqj/business/bases/mapper/PartApplyMapper.java
View File

@ -35,7 +35,7 @@ public interface PartApplyMapper {
* @param data
* @return
*/
List<PartApplyDetailAppVo> getDetailsList(PartApplyAppVo data);
List<PartApplyDetailAppVo> getDetailsList(PartApplyDetailAppVo data);
/**
* 审核数据 查询

2
src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java
View File

@ -62,7 +62,7 @@ public interface PartBackMapper {
* @param data
* @return
*/
List<PartBackDetailsVo> getInfoDetailList(PartBackVo data);
List<PartBackDetailsVo> getInfoDetailList(PartBackDetailsVo data);
/**
* 查询 数据

2
src/main/java/com/bonus/gzgqj/business/bases/mapper/PartCheckMapper.java
View File

@ -48,7 +48,7 @@ public interface PartCheckMapper {
* @param data
* @return
*/
List<PartCheckDetailsVo> getCheckDetailList(PartCheckVo data);
List<PartCheckDetailsVo> getCheckDetailList(PartCheckDetailsVo data);
/**
* 消息

2
src/main/java/com/bonus/gzgqj/business/bases/mapper/PartInputMapper.java
View File

@ -71,7 +71,7 @@ public interface PartInputMapper {
* @param data
* @return
*/
List<PartInputDetails> getInputDetailList(PartInputVo data);
List<PartInputDetails> getInputDetailList(PartInputDetails data);
/**
* 修改 入库信息

2
src/main/java/com/bonus/gzgqj/business/bases/mapper/PartScrapMapper.java
View File

@ -54,7 +54,7 @@ public interface PartScrapMapper {
* @param data
* @return
*/
List<PartScrapDetailsVo> getDetailListById(PartScrapVo data);
List<PartScrapDetailsVo> getDetailListById(PartScrapDetailsVo data);
/**
* 查询数据

2
src/main/java/com/bonus/gzgqj/business/bases/mapper/StatisticsMapper.java
View File

@ -41,7 +41,7 @@ public interface StatisticsMapper {
* @param data
* @return
*/
List<PartApplyDetailAppVo> getProDetailsPage(ProjectInfoVo data);
List<PartApplyDetailAppVo> getProDetailsPage(PartApplyDetailAppVo data);
/**
* 查询工程领料单文件

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyService.java
View File

@ -48,5 +48,5 @@ public interface PartApplyService {
* @param data
* @return
*/
List<PartApplyDetailAppVo> getPartDetailsList(PartApplyAppVo data);
List<PartApplyDetailAppVo> getPartDetailsList(PartApplyDetailAppVo data);
}

7
src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java
View File

@ -95,7 +95,7 @@ public class PartApplyServiceImpl implements PartApplyService{
* @return
*/
@Override
public List<PartApplyDetailAppVo> getPartDetailsList(PartApplyAppVo data) {
public List<PartApplyDetailAppVo> getPartDetailsList(PartApplyDetailAppVo data) {
try{
List<PartApplyDetailAppVo> details=mapper.getDetailsList(data);
return details;
@ -184,8 +184,11 @@ public class PartApplyServiceImpl implements PartApplyService{
data.setStatus("4");
data.setStatusType("1");
mapper.updatePartInfo(data);
//
PartApplyDetailAppVo det=new PartApplyDetailAppVo();
det.setId(data.getId());
//计算出库数量
List<PartApplyDetailAppVo> details=mapper.getDetailsList(data);
List<PartApplyDetailAppVo> details=mapper.getDetailsList(det);
String userName=UserUtil.getLoginUser().getUsername();
//出库数据 维护
userPartInfoService.insert(details,vo.getCreater(),vo.getUserName());

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartBackService.java
View File

@ -50,5 +50,5 @@ public interface PartBackService {
* @param data
* @return
*/
List<PartBackDetailsVo> getInfoDetailsList(PartBackVo data);
List<PartBackDetailsVo> getInfoDetailsList(PartBackDetailsVo data);
}

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartBackServiceImpl.java
View File

@ -82,7 +82,7 @@ public class PartBackServiceImpl implements PartBackService {
* @return
*/
@Override
public List<PartBackDetailsVo> getInfoDetailsList(PartBackVo data) {
public List<PartBackDetailsVo> getInfoDetailsList(PartBackDetailsVo data) {
try{
List<PartBackDetailsVo> detailList=mapper.getInfoDetailList(data);
return detailList;

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckService.java
View File

@ -35,5 +35,5 @@ public interface PartCheckService {
*/
ServerResponse getDetailsById(PartCheckVo data);
List<PartCheckDetailsVo> getDetailsByIdList(PartCheckVo data);
List<PartCheckDetailsVo> getDetailsByIdList(PartCheckDetailsVo data);
}

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckServiceImpl.java
View File

@ -159,7 +159,7 @@ public class PartCheckServiceImpl implements PartCheckService{
* @return
*/
@Override
public List<PartCheckDetailsVo> getDetailsByIdList(PartCheckVo data) {
public List<PartCheckDetailsVo> getDetailsByIdList(PartCheckDetailsVo data) {
try{
List<PartCheckDetailsVo> list=mapper.getCheckDetailList(data);
return list;

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java
View File

@ -39,7 +39,7 @@ public interface PartInputService {
* @param data
* @return
*/
List<PartInputDetails> getInputDetailList(PartInputVo data);
List<PartInputDetails> getInputDetailList(PartInputDetails data);
/**
* 修改入库信息

6
src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
View File

@ -205,7 +205,9 @@ public class PartInputServiceImpl implements PartInputService{
return ServerResponse.createErroe("入库失败");
}
}
List<PartInputDetails> childerList=mapper.getInputDetailList(vo);
PartInputDetails det=new PartInputDetails();
det.setId(vo.getId());
List<PartInputDetails> childerList=mapper.getInputDetailList(det);
AtomicReference<String> isFlag= new AtomicReference<>("1");
final BigDecimal[] allPrice = {new BigDecimal("0")};
childerList.forEach(data->{
@ -256,7 +258,7 @@ public class PartInputServiceImpl implements PartInputService{
* @return
*/
@Override
public List<PartInputDetails> getInputDetailList(PartInputVo data) {
public List<PartInputDetails> getInputDetailList(PartInputDetails data) {
List<PartInputDetails> list=new ArrayList<>();
try{
list=mapper.getInputDetailList(data);

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapService.java
View File

@ -40,5 +40,5 @@ public interface PartScrapService {
* @param data
* @return
*/
List<PartScrapDetailsVo> getDetailsByIdList(PartScrapVo data);
List<PartScrapDetailsVo> getDetailsByIdList(PartScrapDetailsVo data);
}

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapServiceImpl.java
View File

@ -121,7 +121,7 @@ public class PartScrapServiceImpl implements PartScrapService{
@Override
public List<PartScrapDetailsVo> getDetailsByIdList(PartScrapVo data) {
public List<PartScrapDetailsVo> getDetailsByIdList(PartScrapDetailsVo data) {
try{
List<PartScrapDetailsVo> list=mapper.getDetailListById(data);
return list;

2
src/main/java/com/bonus/gzgqj/business/bases/service/StatisticsServiceImpl.java
View File

@ -96,7 +96,7 @@ public class StatisticsServiceImpl {
* @param data
* @return
*/
public List<PartApplyDetailAppVo> getProDetailsPage(ProjectInfoVo data) {
public List<PartApplyDetailAppVo> getProDetailsPage(PartApplyDetailAppVo data) {
List<PartApplyDetailAppVo> list=new ArrayList<>();
try{
list=mapper.getProDetailsPage(data);