diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index b98cf3827..6eec2e828 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -7,6 +7,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBackup; +import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; @@ -103,4 +104,19 @@ public class IoCollectOrderBackupController extends BaseController { return ResultVOUtils.success(); } + + /** + * 通过业务外键获取码明细 + * @param collectOrderBizRequest + * @return + */ + @GetMapping("/udiwms/basic/collect/orderFinish/codeDetail") + public BaseResponse codeDetail(CollectOrderBizRequest collectOrderBizRequest) { + if (collectOrderBizRequest.getId() == null) { + return ResultVOUtils.error(500, "业务外键不能为空"); + } + List list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId()); + return ResultVOUtils.success(list); + } + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 33d58bb43..2c6eb2314 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -191,7 +191,7 @@ public class IoCodeTempController extends BaseController { return response; } else { BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); - if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) { + if (baseResponse2.getCode() == 20000) { collectOrder = collectOrderService.unionSearch(null, null, code); //=============================================// if (collectOrder != null) { @@ -211,7 +211,7 @@ public class IoCodeTempController extends BaseController { return response; } - }else { + } else { BaseResponse response = ResultVOUtils.error(601, code); response.setData(collectOrder); return response; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 42216268d..11c8c3212 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -812,10 +812,10 @@ public class IoOrderController extends BaseController { codeTempService.deleteByBillNo(billNo); codeService.deleteCodeByOrderId(billNo); } - ThreadUtil.execAsync(() -> { - BaseResponse response = spGetHttpClient.postDelOrder(deleteRequest); - log.info("删除单据:" + "结果:" + response.getMessage()); - }); +// ThreadUtil.execAsync(() -> { +// BaseResponse response = spGetHttpClient.postDelOrder(deleteRequest); +// log.info("删除单据:" + "结果:" + response.getMessage()); +// }); return ResultVOUtils.success("删除成功!"); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 6758578df..e7fb8fbce 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.collect; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -281,4 +282,26 @@ public class IoCollectOrderBackupService extends ServiceImpl codeDetail(Integer bizIdFk) { + List reList = new ArrayList<>(); + + List splitCodes = collectOrderCodeAutoService.list(new LambdaQueryWrapper().eq(IoCollectOrderCodeAuto::getBizIdFk,bizIdFk)); + List manList = collectOrderCodeManService.list(new LambdaQueryWrapper().eq(IoCollectOrderCodeMan::getBizIdFk,bizIdFk)); + + if (CollUtil.isNotEmpty(splitCodes)){ + splitCodes.forEach( item -> { + IoCollectOrderCodeMan ioCollectOrderCodeMan = new IoCollectOrderCodeMan(); + BeanUtils.copyProperties(item,ioCollectOrderCodeMan); + reList.add(ioCollectOrderCodeMan); + }); + } + + if (CollUtil.isNotEmpty(manList)){ + manList.forEach( item -> { + reList.add(item); + }); + } + return reList; + } }