From df185518ed500a72a42fce68ce25a1c10a0edaf8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 25 Oct 2024 15:56:26 +0800 Subject: [PATCH] =?UTF-8?q?10/25=20bug=20=E4=BC=98=E5=8C=96=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 10 ++++++++++ .../glxp/api/controller/inout/IoOrderController.java | 2 +- .../api/res/collect/CollectOrderCodeManResponse.java | 1 + .../service/collect/IoCollectOrderBackupService.java | 5 ++++- .../service/collect/IoCollectOrderCodeManService.java | 8 +++++--- .../mybatis/mapper/purchase/PurApplyDetailDao.xml | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) 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 f201eb940..a48418b91 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -869,6 +869,14 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(533, "扫码重复或当前追溯码已存在草稿单据中!"); } } + //校验工位库存 +// List codeTempEntities = codeTempService.findByOrderId(addOrderRequest.getBillNo()); +// for (IoCodeTempEntity codeTempEntity : codeTempEntities) { +// //校验工位库存 +// if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){ +// return ResultVOUtils.error(500, "当前码库存不足!"); +// } +// } } //校验预验收是否已存在 if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { @@ -1029,6 +1037,7 @@ public class IoCodeTempController extends BaseController { } } if (exitLocalEntity == null) { + UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); codeEnttity.setCode(code); codeEnttity.setOrderId(orderId); @@ -1051,6 +1060,7 @@ public class IoCodeTempController extends BaseController { codeEnttity.setRelId(addOrderRequest.getRelId()); codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit()); codeEnttity.setCount(1); + codeEnttity.setPrice(udiRelevanceResponse1.getPrice()); String unitFk = null; if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { unitFk = addOrderRequest.getFromCorp(); 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 21f485371..7266c8bf0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -434,7 +434,7 @@ public class IoOrderController extends BaseController { } //校验工位库存 if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){ - return ResultVOUtils.error(500, "当前码:库存不足!"); + return ResultVOUtils.error(500, "当前码:"+ fifoCodeEntity.getCode()+ "库存不足，请更改码明细!"); } } } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java index 069ac7f7b..8f27178fd 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java @@ -36,6 +36,7 @@ public class CollectOrderCodeManResponse { private String ggxh; private String batchNo; private Integer scanCount; + private Integer scanActCount; private String zczbhhzbapzbh; private String manufactory; private String productDate; 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 b2d2c76b5..403714ffa 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.collect; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -213,7 +214,9 @@ public class IoCollectOrderBackupService extends ServiceImpl stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + ""); + ThreadUtil.execAsync(() -> { + BaseResponse stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + ""); + }); } updateReview(authAdmin,orderEntity); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 2d8cf8233..83f62aad5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -413,9 +413,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl and (pur_apply.status = 3 or saf.status = 3) -# GROUP BY basic_products.uuid + GROUP BY basic_products.uuid