From edd716eede4bd26574f4c6343a92ea250edeb8f8 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sun, 6 Mar 2022 15:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=EF=BC=9A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessLocalTypeController.java | 18 +++++++++++++++++- .../basic/BussinessTypeController.java | 6 +++--- .../inout/StockOrderDetailController.java | 3 +++ .../entity/basic/BussinessLocalTypeEntity.java | 8 ++++---- .../req/inout/StockOrderFilterRequest.java | 1 + .../basic/impl/BussinessTypeServiceImpl.java | 8 ++++---- .../admin/thread/BasicGenExcelService.java | 2 ++ .../admin/thread/InvProductsTrService.java | 2 +- .../thread/InvProductsTrService_back.java | 6 +++--- .../sale/admin/thread/IoTransInoutService.java | 1 + .../mybatis/mapper/inout/StockOrderDao.xml | 7 +++++-- 11 files changed, 44 insertions(+), 18 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index b07dab7..312bb4a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -93,12 +93,28 @@ public class BussinessLocalTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - String customerId = getCustomerId(); if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { bussinessTypeFilterRequest.setSpUse(true); } + List bussinessTypeEntities; + bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/localBusType/filterUnUse") + public BaseResponse filterUnUse(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } List bussinessTypeEntities; bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest); PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index b40fbb9..e3eb365 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -193,12 +193,12 @@ public class BussinessTypeController { * @return */ @GetMapping("/warehouse/bussinessType/candidateBussinessType") - public BaseResponse candidateBussinessType(String id) { - if (StrUtil.isBlank(id)) { + public BaseResponse candidateBussinessType(String mainAction) { + if (StrUtil.isBlank(mainAction)) { return ResultVOUtils.error(ResultEnum.DATA_ERROR); } //查询补单单据类型 - return ResultVOUtils.success(bussinessTypeService.candidateBussinessType(id)); + return ResultVOUtils.success(bussinessTypeService.candidateBussinessType(mainAction)); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index 249cbdc..2d0a574 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -249,6 +249,9 @@ public class StockOrderDetailController { List stockOrderDetailEntityList = new ArrayList<>(); List originDatas = stockOrderIdsRequest.getStockOrderLists(); + if(stockOrderIdsRequest.getDatas()== null && stockOrderIdsRequest.getDatas().size()<1){ + return ResultVOUtils.error(500,"未选择产品!"); + } for (StockSelectDataEntity stockSelectDataEntity : stockOrderIdsRequest.getDatas()) { CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); companyProductRelevanceRequest.setId(stockSelectDataEntity.getRelId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java index c0e2988..c9e940f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java @@ -14,10 +14,10 @@ public class BussinessLocalTypeEntity { private String localName; private String remark; private Boolean enable; - private Boolean checkEnable; - private Boolean advanceType; - private Boolean changeEnable; - private Boolean spUse; + private boolean checkEnable; + private boolean advanceType; + private boolean changeEnable; + private boolean spUse; private String storageCode; private int corpType; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java index 5bfd962..ddff7b6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java @@ -29,4 +29,5 @@ public class StockOrderFilterRequest extends ListPageRequest { private String thirdOrderFk; private String orderIdFk; private BigDecimal totalPrice; + private String locStorageCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java index aa9098b..c1ac8cc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -121,10 +121,10 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { } @Override - public List candidateBussinessType(String id) { - BussinessTypeEntity rawData = bussinessTypeDao.selectById(id); - String mainAction; - if (rawData.getMainAction().equals(TypeConstant.TYPE_OUT)) { + public List candidateBussinessType(String mainAction) { +// BussinessTypeEntity rawData = bussinessTypeDao.selectById(id); +// String mainAction; + if (mainAction.equals(TypeConstant.TYPE_OUT)) { mainAction = TypeConstant.TYPE_PUT; } else { mainAction = TypeConstant.TYPE_OUT; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java index dcd4a3e..94989f2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java @@ -227,6 +227,8 @@ public class BasicGenExcelService { } @Async public void exportJsonUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) { + + } @Async diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index 42f1aae..ca61c3c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -172,7 +172,7 @@ public class InvProductsTrService { //单据流转 List bussinessChangeTypeEntitys = bussinessChangeTypeService.findByAction(bussinessLocalTypeEntity.getLocalAction()); - if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.getChangeEnable()) { + if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.isChangeEnable()) { //普通出库 if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java index 95f2a0c..b493b0b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java @@ -184,7 +184,7 @@ public class InvProductsTrService_back { } //临床出库单据流转 if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) - && bussinessLocalTypeEntity.getChangeEnable() + && bussinessLocalTypeEntity.isChangeEnable() ) { if (ConstantType.TYPE_OUT_CLINIC.equals(bussinessTypeEntity.getAction())) @@ -213,7 +213,7 @@ public class InvProductsTrService_back { //临床是否补单 public void addOrderChange(OrderEntity orderEntity, BussinessTypeEntity bussinessTypeEntity) { BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction()); - if (bussinessLocalTypeEntity.getChangeEnable()) { + if (bussinessLocalTypeEntity.isChangeEnable()) { List bussinessChangeTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeEntity.getLocalAction()); List warehouseEntities = codesService.findByReceiptId(orderEntity.getId()); List preOutList = new ArrayList<>(); @@ -301,7 +301,7 @@ public class InvProductsTrService_back { //寄售出库是否补单 public void addConsignOrderChange(OrderEntity orderEntity, BussinessTypeEntity bussinessTypeEntity) { BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction()); - if (bussinessLocalTypeEntity.getChangeEnable()) { + if (bussinessLocalTypeEntity.isChangeEnable()) { List bussinessChangeTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeEntity.getLocalAction()); List warehouseEntities = codesService.findByReceiptId(orderEntity.getId()); List useInList = new ArrayList<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 4b4071a..650ae1c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -781,6 +781,7 @@ public class IoTransInoutService { stockOrderEntity.setCustomerId(orderEntity.getCustomerId()); stockOrderEntity.setUnitIdFk(orderEntity.getFromCorpId()); stockOrderEntity.setSourceType(ConstantStatus.ST_SCAN_ADD); + stockOrderEntity.setLocStorageCode(orderEntity.getLocStorageCode()); stockOrderEntity.setCorpId(orderEntity.getFromCorpId()); if (bussinessTypeEntity.isSecCheckEnable()) { stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 8520dd3..db6c082 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -96,7 +96,7 @@ and id =#{id} - and billNo =#{billNo} + and billNo LIKE concat('%',#{billNo},'%') and billdate = #{billdate} @@ -105,7 +105,7 @@ and corpId = #{corpId} - and corpName = #{corpName} + and corpName LIKE concat('%',#{corpName},'%') and billType = #{billType} @@ -146,6 +146,9 @@ and totalPrice = #{totalPrice} + + and locStorageCode = #{locStorageCode} + = DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]>