From 7fefd6dc2408a94795e232a8c293f4e1709ea048 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 30 Jul 2023 10:32:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inv/UdiTraceController.java | 10 +++------- src/main/java/com/glxp/api/task/VailInvTask.java | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index d4e491e4d..28ac37129 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -137,7 +134,7 @@ public class UdiTraceController { if (filterCodeTraceRequest.getCode() == null) { return ResultVOUtils.success(); } - System.out.println(filterCodeTraceRequest+"---------------------------------------------"); + System.out.println(filterCodeTraceRequest + "---------------------------------------------"); UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode()); if (udiEntity == null) { return ResultVOUtils.error(500, "无效条码"); @@ -205,8 +202,6 @@ public class UdiTraceController { mInvProductDetailEntities.addAll(invProductDetailEntities); } } - - if (mInvProductDetailEntities.size() > 0) { Map filterMap = new HashMap<>(); @@ -222,6 +217,7 @@ public class UdiTraceController { filterOrderRequest.setPage(filterCodeTraceRequest.getPage()); filterOrderRequest.setLimit(filterCodeTraceRequest.getLimit()); List orderEntities = orderService.filterList(filterOrderRequest); + Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime)); PageInfo pageInfo; pageInfo = new PageInfo<>(orderEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/task/VailInvTask.java b/src/main/java/com/glxp/api/task/VailInvTask.java index 058d362e1..b42d97bbf 100644 --- a/src/main/java/com/glxp/api/task/VailInvTask.java +++ b/src/main/java/com/glxp/api/task/VailInvTask.java @@ -24,8 +24,8 @@ import javax.annotation.Resource; import java.util.List; @Slf4j -@Component -@Transactional(rollbackFor = Exception.class) +//@Component +//@Transactional(rollbackFor = Exception.class) public class VailInvTask implements SchedulingConfigurer { From de7412b096e2b2397548934d82a6cfb596982b89 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 30 Jul 2023 18:21:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=A0=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inv/UdiTraceController.java | 8 -------- .../inv/impl/InvPreInProductDetailServiceImpl.java | 2 +- .../service/inv/impl/InvPreProductDetailServiceImpl.java | 6 +++++- .../service/inv/impl/InvProductDetailServiceImpl.java | 9 +++++---- src/main/resources/application-dev.yml | 2 +- src/main/resources/schemas/schema_v2.1.sql | 1 - 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 28ac37129..12521734d 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -172,10 +172,7 @@ public class UdiTraceController { mInvProductDetailEntities.addAll(invProductDetailEntities); } } - } - - } else { filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + ""); @@ -184,14 +181,9 @@ public class UdiTraceController { if (CollUtil.isNotEmpty(invProductDetailEntities)) { mInvProductDetailEntities.addAll(invProductDetailEntities); } - } } - - } - - } else { //单级包装 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index c000e9f08..be36420a8 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -214,7 +214,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe List datas = invPreInProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo), "batchNo", ""))); + .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", ""))); int count = 0; if (CollUtil.isNotEmpty(datas)) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java index 16a9b8399..a63cef8d6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java @@ -190,7 +190,11 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic } List datas = invPreProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)); + .eq(StrUtil.isNotEmpty(supId), "supId", supId) + .eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode) + .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) + .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", ""))) + ; int count = 0; if (CollUtil.isNotEmpty(datas)) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java index 601ae48ff..d8cea5d4d 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java @@ -182,8 +182,9 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { } List datas = invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) - .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) .isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo),"batchNo","") + .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) + .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) + .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", "")) ); int count = 0; @@ -221,10 +222,10 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { } @Override - public List findByGroupCode(String invCode, String code,Boolean isCheckSpace) { + public List findByGroupCode(String invCode, String code, Boolean isCheckSpace) { if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) { List datas = - invProductDetailDao.findByGroupCode(invCode, code,isCheckSpace); + invProductDetailDao.findByGroupCode(invCode, code, isCheckSpace); return datas; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 86bb3fdf0..9463b3440 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index f1389d7e9..3d2e35759 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -608,4 +608,3 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1); - From 1846ce85dcf65b1f6e71ab20a9a7333dee9a848e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 31 Jul 2023 11:02:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A5orderresult=E8=A1=A8=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 7 ++++--- .../inout/IoOrderInvoiceController.java | 19 +++++++------------ .../api/dao/inout/IoOrderDetailBizDao.java | 6 ++++-- .../inout/IoOrderDetailResultResponse.java | 14 ++++++++++++++ .../inout/IoOrderDetailBizService.java | 6 ++++-- .../impl/IoOrderDetailBizServiceImpl.java | 4 +++- .../mapper/inout/IoOrderDetailBizDao.xml | 6 +++--- 7 files changed, 39 insertions(+), 23 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 d2d1563f5..3a053edb0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -37,6 +37,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; @@ -701,9 +702,9 @@ public class IoOrderDetailBizController extends BaseController { */ @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList") public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) { - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); + List ioOrderDetailCodeResponses = orderDetailBizService.getInvoicResultDetail(orderDetailBizRequest); List orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk()); - for (IoOrderDetailCodeResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) { + for (IoOrderDetailResultResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) { if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) { orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice())); } @@ -722,7 +723,7 @@ public class IoOrderDetailBizController extends BaseController { } orderDetailCodeEntity.setInvoiceCodes(msg); } - PageInfo pageInfo = new PageInfo<>(ioOrderDetailCodeResponses); + PageInfo pageInfo = new PageInfo<>(ioOrderDetailCodeResponses); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index b24eaf5c0..f076f97b6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -21,10 +21,7 @@ import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.req.inout.RefreshInoiceRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; -import com.glxp.api.res.inout.IoOrderInvoiceResponse; -import com.glxp.api.res.inout.IoOrderResponse; -import com.glxp.api.res.inout.RefreshInoiceResponse; +import com.glxp.api.res.inout.*; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; @@ -95,8 +92,6 @@ public class IoOrderInvoiceController { } - - //分组查询发票列表 @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/group/invoice") @@ -162,8 +157,8 @@ public class IoOrderInvoiceController { //查询单据详情 FilterOrderDetailCodeRequest orderDetailBizRequest = new FilterOrderDetailCodeRequest(); orderDetailBizRequest.setOrderIdFk(orderFk); - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); - for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { + List ioOrderDetailCodeResponses = orderDetailBizService.getInvoicResultDetail(orderDetailBizRequest); + for (IoOrderDetailResultResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId()); @@ -192,7 +187,7 @@ public class IoOrderInvoiceController { @Log(title = "发票管理", businessType = BusinessType.UPDATE) public BaseResponse uploadInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) { - List ioOrderInvoiceEntityList=ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode",ioOrderInvoice.getInvoiceEncode())); + List ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode", ioOrderInvoice.getInvoiceEncode())); for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate()); ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice()); @@ -215,7 +210,7 @@ public class IoOrderInvoiceController { if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode())) return ResultVOUtils.error(500, "发票编码不能为空"); - boolean b = ioOrderInvoiceService.remove(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk",deleteRequest.getBillNo())); + boolean b = ioOrderInvoiceService.remove(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk", deleteRequest.getBillNo())); if (b) return ResultVOUtils.success("删除成功！"); else @@ -230,8 +225,8 @@ public class IoOrderInvoiceController { return ResultVOUtils.error(500, "发票编码不能为空"); List ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode())); - if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size()>0){ - return ResultVOUtils.error(999,"发票编码已存在！"); + if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size() > 0) { + return ResultVOUtils.error(999, "发票编码已存在！"); } return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index c71010191..4d3c9acf0 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -2,10 +2,12 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; +import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import org.apache.ibatis.annotations.Param; @@ -24,11 +26,11 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); - List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); - List selectByorderIdFk(String orderIdFk); + List selectByorderIdFk(String orderIdFk); IoOrderInvoiceResponse selectByinvoiceId(Long id); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 894385e7c..bb54f9c06 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -165,6 +165,20 @@ public class IoOrderDetailResultResponse { private String fromInvName; private String fromName; + + + private int orderCount; + + private String invoiceCodes; + + private Integer sucCount; + + private boolean regStatus; + + //金额 + private BigDecimal amount; + + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) return fromCorpName; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 4ebde9cd2..a5def8022 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -1,10 +1,12 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; +import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import java.util.List; @@ -46,13 +48,13 @@ public interface IoOrderDetailBizService { List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); - List selectByorderIdFk(String orderIdFk); + List selectByorderIdFk(String orderIdFk); IoOrderInvoiceResponse selectByinvoiceId(Long id); Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity); - List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getInvoicResultDetail(FilterOrderDetailCodeRequest orderDetailBizRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 9655608c7..fff113029 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -9,11 +9,13 @@ import com.glxp.api.dao.inout.IoOrderDetailBizDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; +import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.IoCheckInoutService; @@ -132,7 +134,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } @Override - public List getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { + public List getInvoicResultDetail(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { if (null == OrderDetailCodeRequest) { return Collections.emptyList(); } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index cca30507f..0e6ea12a6 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -119,9 +119,9 @@ - select * - from io_order_detail_code + from io_order_detail_result AND orderIdFk = #{orderIdFk} @@ -133,6 +133,6 @@ AND batchNo = #{batchNo} - group by io_order_detail_code.id + group by io_order_detail_result.id