From 0531281f4ba5795c99a12a4c99e498e33f8b71ae Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 8 Dec 2022 17:10:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=A2=84=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/constant/ConstantType.java | 4 +- .../controller/inout/OrderController.java | 54 ++++++++----------- .../req/basic/BussinessTypeFilterRequest.java | 2 + .../service/inout/impl/OrderServiceImpl.java | 31 +++++------ .../mybatis/mapper/basic/BussinessTypeDao.xml | 3 ++ 5 files changed, 46 insertions(+), 48 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantType.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantType.java index 794e3c8..7a98e2e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantType.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantType.java @@ -18,8 +18,8 @@ public interface ConstantType { String TYPE_CODE_DESTORY = "CodeDestory"; //码注销 String TYPE_STOCK_CHECK = "StockCheck"; //盘点 - String TYPE_PUT = "WareHouseIn"; //出库 - String TYPE_OUT = "WareHouseOut"; //入库 + String TYPE_PUT = "WareHouseIn"; //入库 + String TYPE_OUT = "WareHouseOut"; //出库 String TYPE_IN_CONSIGN = "ConsignWareHouseIn"; //寄售入库 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 51a7efd..2c87fff 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; import com.glxp.sale.admin.dao.inout.CodesTempDao; import com.glxp.sale.admin.dao.inout.OrderDao; @@ -791,44 +790,37 @@ public class OrderController { if (StrUtil.isEmpty(code) && StrUtil.isEmpty(billNo)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - List orderEntities = new ArrayList<>(); + Set orderEntities = new HashSet<>(); + //查询预验收单据类型 + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setCheckPreIn(true); + List bussinessTypResponses = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); - if (StrUtil.isNotEmpty(code)) { - - //查询预验收单据类型 - BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); - bussinessTypeFilterRequest.setPreIn(true); - bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT); - List bussinessTypResponses = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); - - List actions = new ArrayList<>(); - if (CollUtil.isNotEmpty(bussinessTypResponses)) { - for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) { - actions.add(bussinessTypResponse.getAction()); - } - WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setCode(code); - warehouseQueryRequest.setActions(actions); - List warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest); - if (CollUtil.isNotEmpty(warehouseEntityList)) { - for (WarehouseEntity warehouseEntity : warehouseEntityList) { - List temps = orderService.filterPreInChange(warehouseEntity.getOrderId()); - if (CollUtil.isNotEmpty(temps)) - orderEntities.addAll(temps); + List actions = new ArrayList<>(); + if (CollUtil.isNotEmpty(bussinessTypResponses)) { + for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) { + actions.add(bussinessTypResponse.getAction()); + } + WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setCode(code); + warehouseQueryRequest.setActions(actions); + List warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest); + if (CollUtil.isNotEmpty(warehouseEntityList)) { + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + List temps = orderService.filterPreInChange(warehouseEntity.getOrderId()); + if (CollUtil.isNotEmpty(temps)) + orderEntities.addAll(temps); - } } } - - - } else { - orderEntities = orderService.filterPreInChange(billNo); } - PageInfo pageInfo = new PageInfo<>(orderEntities); + ArrayList result = CollUtil.newArrayList(orderEntities); + + PageInfo pageInfo = new PageInfo<>(result); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(orderEntities); + pageSimpleResponse.setList(result); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java index 7d8df15..b0c77af 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java @@ -27,4 +27,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private String ids; private List actionList; private Boolean preIn; + + private Boolean checkPreIn; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 282a322..ac1a849 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -380,27 +380,28 @@ public class OrderServiceImpl implements OrderService { orderId = stockOrderEntity.getOrderIdFk(); } OrderEntity orderEntity = orderDao.selectByBillNo(orderId); - orderEntities.add(orderEntity); - if (StrUtil.isNotEmpty(orderEntity.getPreInBillNo())) { - String[] priInNo = orderEntity.getPreInBillNo().split(";"); - if (priInNo != null) { - for (int i = 0; i < priInNo.length; i++) { - OrderEntity temp = orderDao.selectByBillNo(priInNo[i]); - orderEntities.add(temp); + if (null != orderEntity) { + orderEntities.add(orderEntity); + if (StrUtil.isNotBlank(orderEntity.getPreInBillNo())) { + String[] priInNo = orderEntity.getPreInBillNo().split(";"); + if (priInNo != null) { + for (int i = 0; i < priInNo.length; i++) { + OrderEntity temp = orderDao.selectByBillNo(priInNo[i]); + orderEntities.add(temp); + } } } - } - if (StrUtil.isNotEmpty(orderEntity.getPreOutBillNo())) { - String[] priInNo = orderEntity.getPreOutBillNo().split(";"); - if (priInNo != null) { - for (int i = 0; i < priInNo.length; i++) { - OrderEntity temp = orderDao.selectByBillNo(priInNo[i]); - orderEntities.add(temp); + if (StrUtil.isNotEmpty(orderEntity.getPreOutBillNo())) { + String[] priInNo = orderEntity.getPreOutBillNo().split(";"); + if (priInNo != null) { + for (int i = 0; i < priInNo.length; i++) { + OrderEntity temp = orderDao.selectByBillNo(priInNo[i]); + orderEntities.add(temp); + } } } } - return orderEntities; } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index cd3ba25..365f5f2 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -115,6 +115,9 @@ AND basic_bussiness_type.secCheckEnable =#{secCheckEnable} + + AND (basic_bussiness_type.scanPreIn = true or basic_bustype_local.preIn = true) + basic_bussiness_type.action <> #{action,jdbcType=VARCHAR}