From 62dec41a67ec5f1978e9fc1fd5fb3cb4e929f00a Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 10 Dec 2024 18:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E6=8C=89=E7=85=A7=E9=98=9F?= =?UTF-8?q?=E5=88=97=E5=8F=96=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 2 +- .../controller/inout/IoCodeTempController.java | 16 ++++++++-------- .../api/controller/inout/IoSplitController.java | 3 ++- .../api/entity/collect/IoCollectOrderBiz.java | 3 ++- .../api/req/collect/CollectOrderRequest.java | 3 +++ .../service/collect/IoCollectOrderService.java | 2 +- .../api/service/inout/IoSplitCodeService.java | 12 ++++++------ .../service/inout/IoSplitFifoCodeService.java | 3 ++- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index fba28ad8c..0dcb8feb9 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -422,7 +422,7 @@ public class IoCollectOrderController extends BaseController { /** * 取货确认 */ - splitCodeService.confirmBizAutiTagCode(confirmOrderBiz); + splitCodeService.confirmBizAutiTagCode(confirmOrderBiz, confirmOrderBiz.getQueueCode()); return ResultVOUtils.success("确认成功！"); } 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 5a5a68411..353b909a7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1597,6 +1597,7 @@ public class IoCodeTempController extends BaseController { codeEnttity.setPreInSpaceCode(addOrderRequest.getCheckPreInSpaceCode()); codeEnttity.setRelId(addOrderRequest.getRelId()); codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit()); + codeEnttity.setPrice(udiRelevanceResponse.getPrice()); codeEnttity.setProductType(2); codeEnttity.setCount(1); RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code); @@ -1721,13 +1722,13 @@ public class IoCodeTempController extends BaseController { } } else { //判断产品是否已经绑定其他槽位 - SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId())); - if (workplaceQueue1 != null) { - if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) { -// orderService.deleteByBillNo(orderId); - return ResultVOUtils.error(507, "当前产品已绑定在" + workplaceQueue1.getCode() + "取货槽"); - } - } +// SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId())); +// if (workplaceQueue1 != null) { +// if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) { +//// orderService.deleteByBillNo(orderId); +// return ResultVOUtils.error(507, "当前产品已绑定在" + workplaceQueue1.getCode() + "取货槽"); +// } +// } } } else { return ResultVOUtils.error(500, "取货槽位不存在!"); @@ -1765,7 +1766,6 @@ public class IoCodeTempController extends BaseController { } } - BaseResponse baseResponse = checkDrugRelId(codeEnttity, unitFk); if (baseResponse != null) { deleteEmptyBillNo(orderEntity); diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 566f4a927..26e361969 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -142,7 +142,8 @@ public class IoSplitController extends BaseController { SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType()); if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) { collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode()); - splitCodeService.preAutoTagCode(collectOrder); + //todo 后面改 + splitCodeService.preAutoTagCode(collectOrder,null); collectOrderService.updateById(collectOrder); return ResultVOUtils.success("后台已开始赋码，请稍后刷新查看"); } else { diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java index d228cd725..99a077299 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java @@ -301,6 +301,7 @@ public class IoCollectOrderBiz implements Serializable { @TableField(exist = false) private Integer addScanActCount; - + @TableField(exist = false) + private String queueCode; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 095953bb9..b455d8b0d 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -154,6 +154,9 @@ public class CollectOrderRequest extends ListPageRequest { */ private Long bizId; + + private String queueCode; + private List uploadStatusList; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index d732b4459..5f74f8616 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -863,7 +863,7 @@ public class IoCollectOrderService extends ServiceImpl 0) { - List ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo()); + List ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(),queueCode ); if (ioSplitFifoCodeEntities.size() < quotient) { if (isAuto) throw new JsonException(500, "提交失败，工位库存数量不足！"); @@ -388,7 +388,7 @@ public class IoSplitCodeService extends ServiceImpl 0) { - List ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo()); + List ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), queueCode); if (ioSplitFifoCodeEntities.size() < quotient) { throw new JsonException(500, "确认失败，工位库存数量不足！"); } @@ -516,7 +516,7 @@ public class IoSplitCodeService extends ServiceImpl splitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, - collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo()); + collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), queueCode); int total = splitFifoCodeEntities.stream() .mapToInt(IoSplitFifoCodeEntity::getTotalCount) .sum(); diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index 77f9eaf6a..26da60bcc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -50,12 +50,13 @@ public class IoSplitFifoCodeService extends ServiceImpl findByRelId(Long workPlaceCode, Long relId, String batchNo) { + public List findByRelId(Long workPlaceCode, Long relId, String batchNo, String queueCode) { List splitFifoCodeEntities = list(new LambdaQueryWrapper() .eq(IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode) .eq(IoSplitFifoCodeEntity::getRelId, relId) .eq(StrUtil.isNotEmpty(batchNo), IoSplitFifoCodeEntity::getBatchNo, batchNo) + .eq(StrUtil.isNotEmpty(queueCode), IoSplitFifoCodeEntity::getWorkPlaceQueueCode, queueCode) .orderByAsc(IoSplitFifoCodeEntity::getInBactchNo) );