From 72928b2d9e3bd013b2abd1b688690618d5fdc772 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 18 Feb 2025 18:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 3 +-- .../glxp/api/controller/inout/IoSplitFifoInvController.java | 2 -- .../com/glxp/api/service/collect/IoCollectOrderService.java | 2 +- .../com/glxp/api/service/inout/IoSplitFifoInvService.java | 3 ++- src/main/resources/application-dev.yml | 4 +++- 5 files changed, 7 insertions(+), 7 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 d56f10fbd..3c11e1c48 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1360,7 +1360,7 @@ public class IoCodeTempController extends BaseController { @Autowired RelCodeBatchService relCodeBatchService; -// @Transactional(rollbackFor = Exception.class) + // @Transactional(rollbackFor = Exception.class) public BaseResponse addDrugOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code) { AddCodeResult addCodeResult = new AddCodeResult(); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); @@ -1935,7 +1935,6 @@ public class IoCodeTempController extends BaseController { } - public void updateRelCode(BasicBussinessTypeEntity bussinessTypeEntity, String code) { if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN))) relCodeBatchService.threadUpdateIoCodeTempEntity(code); diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java index 1632fe084..04e4b0ea2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java @@ -129,8 +129,6 @@ public class IoSplitFifoInvController extends BaseController { } - - @GetMapping("/udiwms/ioSplit/inv/exportExcel") public void exportExcel(IoSplitFifoInvRequest ioSplitFifoInvRequest, HttpServletResponse response) throws IOException { // 模拟数据库获取数据 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 af2bc6683..5b0296406 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -397,7 +397,7 @@ public class IoCollectOrderService extends ServiceImpl