From 1a9dcb3c9b890f58d2fa399d5d2388520176c42e Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 15 Aug 2022 16:44:58 +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=BA=93=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=203.UDI=E7=A0=81=E6=B5=81=E5=90=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderDetailController.java | 39 ++++++++++--------- .../inventory/InvPreInProductsController.java | 5 --- .../InvPreInProductDetailServiceImpl.java | 4 +- .../mybatis/mapper/inout/OrderDao.xml | 1 + 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index ca96e750..63565377 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -92,7 +92,6 @@ public class StockOrderDetailController { } StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk()); - String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code"); List stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); @@ -460,10 +459,8 @@ public class StockOrderDetailController { @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filterProduct") public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) { - - - String nameCode = null; - UdiEntity udiEntity = null; + String nameCode; + UdiEntity udiEntity; if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); if (udiEntity != null) { @@ -485,33 +482,37 @@ public class StockOrderDetailController { companyProductRelevanceRequest.setIsDisable(false); List basicInstrumentMaintainRelevanceResponses = null; BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType()); + + PageInfo pageInfo2 = null; if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { companyProductRelevanceRequest.setCustomerId(null); companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId()); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); } else { - basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + pageInfo2 = new PageInfo<>(udiRelevanceResponses); + if (!pageInfo2.getList().isEmpty()) { + basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size()); + for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) { + CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); + BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse); + companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId()); + basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse); + } + } } PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); + if (null != pageInfo2) { + pageSimpleResponse.setTotal(pageInfo2.getTotal()); + } else { + pageSimpleResponse.setTotal(pageInfo.getTotal()); + } pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses); return ResultVOUtils.success(pageSimpleResponse); } - public List getHosDatas(FilterUdiInfoRequest filterUdiInfoRequest) { - List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); - List basicInstrumentMaintainRelevanceResponses = new ArrayList<>(); - for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { - CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); - BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse); - companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId()); - basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse); - } - return basicInstrumentMaintainRelevanceResponses; - } - @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/copy") public BaseResponse uploadCount(@RequestParam("id") String id) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java index 1ae95a90..5876d952 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java @@ -7,7 +7,6 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.req.inout.DeleteRequest; @@ -18,7 +17,6 @@ import com.glxp.api.admin.res.inventory.InvProductDetailResponse; import com.glxp.api.admin.res.inventory.InvProductPageRespnonse; import com.glxp.api.admin.res.inventory.InvProductResponse; import com.glxp.api.admin.res.inventory.InvProductStatResponse; -import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.service.inventory.InvPreInProductDetailService; import com.glxp.api.admin.service.inventory.InvPreInProductService; import com.glxp.api.common.enums.ResultEnum; @@ -38,13 +36,10 @@ import java.util.List; @RestController public class InvPreInProductsController { - @Resource InvPreInProductService invProductService; @Resource InvPreInProductDetailService invProductDetailService; - @Resource - private CompanyService companyService; @AuthRuleAnnotation("") @GetMapping("spms/prein/inv/products/filter") diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index f316fcaf..4c86000a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -17,9 +17,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Service public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailService { @@ -103,7 +101,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe public InvProductDetailEntity statInvPreInDetail(String code) { FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOriginCode(code); - + filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT); List datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); if (CollUtil.isEmpty(datas)) { filterInvProductDetailRequest.setOriginCode(null); diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 40bea93a..e736e513 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -587,6 +587,7 @@ #{item} + order by actDate