From 468a7aeb0805a0d55343895fac5c678b4fa3b35d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 25 Nov 2024 18:08:50 +0800 Subject: [PATCH] =?UTF-8?q?11/25=20=E7=94=B3=E8=B4=AD=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoOrderController.java | 1 + .../com/glxp/api/service/inout/IoCheckInoutService.java | 7 +++++++ .../mybatis/mapper/purchase/PurApplyDetailDao.xml | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) 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 850a97140..0df1eee14 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1170,6 +1170,7 @@ public class IoOrderController extends BaseController { IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId()); IoOrderEntity newOrder = new IoOrderEntity(); List originCodes = codeService.findByOrderId(originOrder.getBillNo()); + newOrder.setProductType(originOrder.getProductType()); newOrder.setCreateTime(new Date()); newOrder.setFromCorp(addOrderChangeRequest.getFromCorp()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index df17f42e8..a47f3ed15 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -849,6 +849,8 @@ public class IoCheckInoutService { List orderCheckResultResponses = new ArrayList<>(); for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { + //药品数据把药品数据补齐 bzgg 制剂规格 剂型 + UdiProductEntity product = udiProductService.findProductByNameCode(bizEntity.getNameCode()); boolean isPass = false; for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { if (!codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null @@ -860,6 +862,11 @@ public class IoCheckInoutService { ioOrderCheckResultResponse.setBBatchNo(bizEntity.getBatchNo()); ioOrderCheckResultResponse.setBProductDate(bizEntity.getProductDate()); ioOrderCheckResultResponse.setBExpireDate(bizEntity.getExpireDate()); + if (product.getProductsType() == 2){ + ioOrderCheckResultResponse.setBzgg(product.getBzgg()); + ioOrderCheckResultResponse.setPrepnSpec(product.getPrepnSpec()); + ioOrderCheckResultResponse.setPrepnUnit(product.getPrepnUnit()); + } ioOrderCheckResultResponse.setSBatchNo(codeEntity.getBatchNo()); ioOrderCheckResultResponse.setSProductDate(codeEntity.getProductDate()); diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 9006a4776..c16a78039 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -85,12 +85,12 @@ replace INTO pur_apply_detail - (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh,destinyId) + (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh,destinyId,measname) values (#{orderIdFk}, #{productId}, #{productName}, #{count}, - #{supId}, #{zczbhhzbapzbh}, #{destinyId}) + #{supId}, #{zczbhhzbapzbh}, #{destinyId},#{measname})