From fe75798f818fe71f69a9fc6542812ed1350b8f61 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 3 Apr 2023 11:22:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 19 +++++++------------ .../purchase/SupCertController.java | 1 - .../mapper/inout/IoOrderDetailBizDao.xml | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 23d01ef1..952be59d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -470,20 +470,15 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/biz/insertInvoice") - public BaseResponse insertInvoice(@RequestBody List list) { - if (CollUtil.isEmpty(list)) { - return ResultVOUtils.error(500, "请选入产品！"); - } - for (IoOrderDetailResultEntity ioOrderDetailResultEntity : list) { + public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { + IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); - ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailResultEntity.getOrderIdFk()); - ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailResultEntity.getBindRlFk() + ""); - ioOrderInvoiceEntity.setBatchNo(ioOrderDetailResultEntity.getBatchNo()); - ioOrderInvoiceEntity.setProductDate(ioOrderDetailResultEntity.getProductDate()); - ioOrderInvoiceEntity.setExpireDate(ioOrderDetailResultEntity.getExpireDate()); + ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); + ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + ""); + ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo()); + ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate()); + ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate()); boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity); - } - return ResultVOUtils.success("成功"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 9ff760e9..ec0bc08c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -529,7 +529,6 @@ public class SupCertController { //首营预览文件 @PostMapping("/udiwms/image/register/file") public BaseResponse uploadRegisterFile(@RequestBody FilterImageRequest filterImageRequest) { - List urlList=Arrays.asList(filterImageRequest.getImageUrl().split(",")); List list = new ArrayList<>(); for (String obj:urlList){ diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 8e1888e7..28543ba8 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -38,6 +38,6 @@ AND ic.orderIdFk = #{orderIdFk} - GROUP BY ic.bindRlFk,ic.batchNo + GROUP BY ic.id