From 26a2fabaa588e6baf90cb283e748a41397e4c2b5 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 9 Jan 2025 20:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceQueueController.java | 10 ++--- .../collect/IoCollectOrderController.java | 38 +++++++++++++++++++ .../inout/IoOrderDetailBizController.java | 27 +++++++------ .../req/collect/CollectOrderBizRequest.java | 2 + 4 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java index 9e77f2983..18f8f5f69 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java @@ -315,9 +315,9 @@ public class SysWorkplaceQueueController extends BaseController { public BaseResponse reloadBindingLed(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) { SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getMac, sysWorkplaceQueue.getMac())); - if (queue != null){ + if (queue != null) { //提示已经被绑定是否需要更改到当前槽位 - return ResultVOUtils.error(503,"该灯组已绑定在" + queue.getCode() + "槽位"); + return ResultVOUtils.error(503, "该灯组已绑定在" + queue.getCode() + "槽位"); } //绑定 sysWorkplaceQueueService.updateById(sysWorkplaceQueue); @@ -335,11 +335,11 @@ public class SysWorkplaceQueueController extends BaseController { } IoCollectLedGroup ledGroupServiceOne = ioCollectLedGroupService.getOne(new LambdaQueryWrapper().eq(IoCollectLedGroup::getMac, macCode)); - if (ledGroupServiceOne == null){ - return ResultVOUtils.error(500,"当前灯组标签不存在"); + if (ledGroupServiceOne == null) { + return ResultVOUtils.error(500, "当前灯组标签不存在"); } SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getMac, macCode)); - if (queue != null && !queue.getCode().equals(request.getCode())){ + if (queue != null && !queue.getCode().equals(request.getCode())) { } return ResultVOUtils.success(ledGroupServiceOne); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 1e50eb4ff..b854176c9 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -18,6 +18,7 @@ import com.glxp.api.constant.WorkOperType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.collect.*; import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import com.glxp.api.entity.inout.ExcelVO; @@ -29,12 +30,14 @@ import com.glxp.api.req.collect.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.ConfirmResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.collect.*; import com.glxp.api.service.inout.ExcelService; import com.glxp.api.service.inout.IoSplitCodeService; @@ -42,6 +45,7 @@ import com.glxp.api.util.Excel.ExcelHandler; import com.glxp.api.util.Excel.Exception.RenException; import com.glxp.api.util.IntUtil; import com.glxp.api.util.MsDateUtil; +import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; @@ -237,6 +241,40 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @Resource + UdiRelevanceService udiRelevanceService; + + /** + * 扫码查询单据明细 + * + * @param collectOrderBizRequest + * @return + */ + @GetMapping("/udiwms/basic/collect/order/detailByCode") + public BaseResponse detailByCode(CollectOrderBizRequest collectOrderBizRequest) { + if (StrUtil.isBlank(collectOrderBizRequest.getOrderIdFk())) { + return ResultVOUtils.error(500, "单据号不能为空"); + } + IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderBizRequest.getOrderIdFk()); + if (collectOrder == null) { + return ResultVOUtils.error(500, "未找到单据"); + } + + + UdiEntity udiEntity = FilterUdiUtils.getUdi(collectOrderBizRequest.getUdiCode()); + if (udiEntity == null) { + return ResultVOUtils.error(500, "无效追溯码！"); + } + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + collectOrderBizRequest.setRelId(udiRelevanceResponse.getId()); + List list = collectOrderBizService.filterList(collectOrderBizRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + @GetMapping("/udiwms/basic/collect/order/allDetail") public BaseResponse allDetail(CollectOrderBizRequest collectOrderBizRequest) { 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 db300a299..b5d96057a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -170,9 +170,9 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setDeptCode(invWarehouseEntity.getParentId()); orderEntity.setInvCode(orderEntity.getInvCode()); orderEntity.setBusType(bussinessTypeEntity.getBusType()); - if (addBizProductReqeust.getProductType() == null){ + if (addBizProductReqeust.getProductType() == null) { orderEntity.setProductType(1); - }else { + } else { orderEntity.setProductType(addBizProductReqeust.getProductType()); } @@ -684,7 +684,7 @@ public class IoOrderDetailBizController extends BaseController { filterOrderRequest.setEndTime(endTime); filterOrderRequest.setBillNo(billNo); List ioOrderResponses = orderService.getfilterOrderList(filterOrderRequest); - if (CollUtil.isEmpty(ioOrderResponses)){ + if (CollUtil.isEmpty(ioOrderResponses)) { PageInfo pageInfo = new PageInfo<>(ioOrderResponses); return ResultVOUtils.page(pageInfo); } @@ -692,7 +692,6 @@ public class IoOrderDetailBizController extends BaseController { orderDetailBizRequest.setOrderIdFks(orders); - orderDetailBizRequest.setLimit(finishBizRequest.getLimit()); orderDetailBizRequest.setPage(finishBizRequest.getPage()); orderDetailBizRequest.setKeyWords(finishBizRequest.getKeyWords()); @@ -704,7 +703,7 @@ public class IoOrderDetailBizController extends BaseController { .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)) .collect(Collectors.toList()); } - if (CollUtil.isEmpty(list)){ + if (CollUtil.isEmpty(list)) { PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } @@ -904,7 +903,7 @@ public class IoOrderDetailBizController extends BaseController { for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo())) && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) { - if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())){ + if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())) { BigDecimal price = new BigDecimal(orderInvoiceEntity.getPrice()); invoiceAmount = invoiceAmount.add(price); } @@ -935,22 +934,26 @@ public class IoOrderDetailBizController extends BaseController { /** * 获取上货记录 + * * @param orderDetailBizRequest * @param bindingResult * @return */ @GetMapping("/udiwms/inout/bizDetail/orderOutRecordPage") public BaseResponse orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest, - BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } List ioOrderDetailBizResponses = orderDetailBizService.orderOutRecordPage(orderDetailBizRequest); PageInfo pageInfo = new PageInfo<>(ioOrderDetailBizResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(ioOrderDetailBizResponses); - return ResultVOUtils.success(pageSimpleResponse); - } + return ResultVOUtils.success(pageSimpleResponse); + } } + + + diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java index 945f21dea..61b6a9818 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java @@ -122,4 +122,6 @@ public class CollectOrderBizRequest extends ListPageRequest { * 组套编码/医保编码/术士套包编码 */ private String checkCode; + + private String udiCode; }