diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 1dda25d5..500ef983 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -127,11 +127,20 @@ public class UdiRelevanceController extends BaseController { if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) { UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode()); filterUdiRelRequest.setNameCode(udiEntity.getUdi()); + List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); + if (temps != null && temps.size() > 0) { + filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); + } } - List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); - if (temps != null && temps.size() > 0) { - filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); - filterUdiRelRequest.setNameCode(null); + + } else if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode()) && StrUtil.isEmpty(filterUdiRelRequest.getUdiCode())) { + if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) { + filterUdiRelRequest.setNameCode(filterUdiRelRequest.getUnionCode()); + List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); + if (temps != null && temps.size() > 0) { + filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); + filterUdiRelRequest.setNameCode(null); + } } } else { filterUdiRelRequest.setDiType(1); 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 d163c5a8..442ad766 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.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; 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.*; @@ -711,9 +712,9 @@ public class IoOrderDetailBizController extends BaseController { */ @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList") public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) { - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); + List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(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())); } @@ -732,7 +733,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 ca27b726..d81aea1e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -19,10 +19,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; @@ -135,8 +132,8 @@ public class IoOrderInvoiceController { //查询单据详情 FilterOrderDetailCodeRequest orderDetailBizRequest = new FilterOrderDetailCodeRequest(); orderDetailBizRequest.setOrderIdFk(orderFk); - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); - for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { + List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); + for (IoOrderDetailResultResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId()); 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 a26a90c1..470e32ed 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -6,6 +6,7 @@ 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; @@ -23,11 +24,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 56e2da9f..024d52d9 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -163,4 +163,17 @@ public class IoOrderDetailResultResponse { private Date auditTime; + + private int orderCount; + + private String invoiceCodes; + + private Integer sucCount; + + private boolean regStatus; + + //金额 + private BigDecimal amount; + + } 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 34d77e15..e266e51b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -5,6 +5,7 @@ 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; @@ -38,7 +39,7 @@ public interface IoOrderDetailBizService { List getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); - List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk); 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 46a7eb2c..33ecb201 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 @@ -14,6 +14,7 @@ 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.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; @@ -133,7 +134,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } @Override - public List getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { + public List getfilterOrderList(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 28da472e..d68274fa 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