From 1a56d8e7ad294e8cda87615452d3361fcd09600d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 5 May 2023 09:18:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 35 +++++ .../inout/IoOrderDetailBizController.java | 47 +++++- .../com/glxp/api/dao/inout/IoOrderDao.java | 4 +- .../api/dao/inout/IoOrderDetailBizDao.java | 2 + .../entity/inout/IoOrderDetailBizEntity.java | 4 + .../entity/inout/IoOrderInvoiceEntity.java | 4 + .../inout/FilterOrderDetailBizRequest.java | 1 - .../res/inout/IoOrderDetailBizResponse.java | 4 + .../glxp/api/res/inout/IoOrderResponse.java | 5 + .../inout/IoOrderDetailBizService.java | 2 + .../api/service/inout/IoOrderService.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 11 ++ .../inout/impl/IoOrderServiceImpl.java | 11 ++ .../mybatis/mapper/inout/IoOrderDao.xml | 144 ++++++++++++++++++ .../mapper/inout/IoOrderDetailBizDao.xml | 27 +++- src/main/resources/schemas/schema_v2.1.sql | 4 + 16 files changed, 300 insertions(+), 7 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 8de2ba04..a4657eca 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -103,6 +103,41 @@ public class IoOrderController extends BaseController { return ResultVOUtils.page(pageInfo); } + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/order/filterList") + public BaseResponse filterOrderList(FilterOrderRequest filterOrderRequest) { + + + if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { + orderService.setFilterStatus(filterOrderRequest); + } + if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { + orderService.setActions(filterOrderRequest); + } + + if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) { + orderService.setInvoiceFiltes(filterOrderRequest); + } + + if (filterOrderRequest.getSourceLocalType() != null) { + if (filterOrderRequest.getSourceLocalType() == 1) { + filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5)); + } else { + filterOrderRequest.setSourceTypes(Arrays.asList(6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17)); + } + } + + String customerId = getCustomerId(); + if (!customerId.equals("110")) { + filterOrderRequest.setFromCorp(customerId); + } + List list = orderService.getfilterList(filterOrderRequest); + + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + @GetMapping("/udiwms/inout/order/filterInvoice") public BaseResponse filterInvoice(FilterOrderRequest filterOrderRequest) { filterOrderRequest.setDealStatuses(Arrays.asList(2, 3)); 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 e40a5042..9308fd39 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -513,6 +513,15 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.page(pageInfo); } + @GetMapping("/udiwms/inout/bizDetail/filterListInv") + public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) { + List list = orderDetailBizService.getfilterList(orderDetailBizRequest); + List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk()); + ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + @GetMapping("/udiwms/inout/bizDetail/filterListInvoice") public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) { List list = orderDetailBizService.filterListInv(orderDetailBizRequest); @@ -543,14 +552,33 @@ public class IoOrderDetailBizController extends BaseController { /** * 删除发票表 * - * @param id + * @param * @return */ - @GetMapping("/udiwms/inout/biz/deleteById") + @PostMapping("/udiwms/inout/biz/deleteById") @Log(title = "发票管理", businessType = BusinessType.DELETE) - public BaseResponse deleteById(Integer id) { + public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) { + + ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()); + //更改 登记状态 + IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); + + FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); + + filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); + + ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); + + ioOrderDetailBizEntity.setId(ioOrderInvoiceEntity.getRegId()); + + List list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest); + if(list == null && list.size()==0){ + ioOrderDetailBizEntity.setRegStatus(false); + } + orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity); + return ResultVOUtils.success(); + - return ResultVOUtils.success(ioOrderInvoiceService.deleteByInvId(id)); } @@ -590,6 +618,17 @@ public class IoOrderDetailBizController extends BaseController { } + @PostMapping("/udiwms/inout/biz/updateorderBiz") + public BaseResponse updateorderBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { + ioOrderDetailBizEntity.setRegStatus(true); + orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity); + + return ResultVOUtils.success("成功"); + + } + + + /** * 查询单据业务详情列表 * diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index 46a59feb..b2cfe5dc 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -20,6 +20,8 @@ public interface IoOrderDao extends BaseMapperPlus filterList(FilterOrderRequest filterOrderRequest); + List getfilterList(FilterOrderRequest filterOrderRequest); + /** * 查询单据实体列表 * @@ -59,4 +61,4 @@ public interface IoOrderDao extends BaseMapperPlus filterList(FilterOrderDetailBizRequest orderDetailBizRequest); + List getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest); + List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); /** diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index 15b29ced..186b3e81 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -197,4 +197,8 @@ public class IoOrderDetailBizEntity { @TableField(exist = false) private String errMsg; + @TableField(value = "regStatus") + private boolean regStatus; + + } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java index cef5f2a4..dd45cbd7 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java @@ -106,6 +106,10 @@ public class IoOrderInvoiceEntity { @TableField(value = "bizIdFk") private Integer bizIdFk; + @TableField(exist = false) + private Integer regId; + + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java index ca65a742..a6cc55bc 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java @@ -13,7 +13,6 @@ public class FilterOrderDetailBizRequest extends ListPageRequest { * 耗材字典产品ID */ private Long relId; - /** * 批次号 */ diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index 54bfe00e..29af9533 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -163,6 +163,10 @@ public class IoOrderDetailBizResponse { private String invoiceCodes; + private Integer sucCount; + + private boolean regStatus; + } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 757b5ee8..f9ee6dd5 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -232,6 +232,11 @@ public class IoOrderResponse { private Integer processStatus; private int inCodeStatus; + private Integer allCout; + + private Integer partCount; + + /** * 校验信息 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 ab3008c8..bbeb3681 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -34,6 +34,8 @@ public interface IoOrderDetailBizService { List filterList(FilterOrderDetailBizRequest orderDetailBizRequest); + List getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest); + IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk); List checkOrderList(String orderId); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 0c4af4fd..3c117440 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -54,6 +54,8 @@ public interface IoOrderService { */ List filterList(FilterOrderRequest filterOrderRequest); + List getfilterList(FilterOrderRequest filterOrderRequest); + /** * 查询单据列表 * 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 e435b746..1b802e98 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 @@ -117,6 +117,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.filterList(orderDetailBizRequest); } + @Override + public List getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest) { + if (null == orderDetailBizRequest) { + return Collections.emptyList(); + } + if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) { + PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit()); + } + return ioOrderDetailBizDao.getfilterList(orderDetailBizRequest); + } + @Override public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) { QueryWrapper ew = new QueryWrapper<>(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 36f6f218..b417ef87 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -531,6 +531,17 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.filterList(filterOrderRequest); } + @Override + public List getfilterList(FilterOrderRequest filterOrderRequest) { + if (null == filterOrderRequest) { + return Collections.emptyList(); + } + if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { + PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); + } + return orderDao.getfilterList(filterOrderRequest); + } + @Override public List filterOrderList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) { diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index d5ed8b26..36a7a47b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -136,6 +136,150 @@ order by createTime desc + + + + + - select io_order_detail_biz.* + select io_order_detail_biz.*, from io_order_detail_biz left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk left join basic_products bp on bu.uuid = bp.uuid @@ -23,6 +23,31 @@ group by io_order_detail_biz.id + + + +