From d160138cb78985d9a660197e2d06e5cc20e47647 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 8 Sep 2023 16:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 27 ++++++++++++++ .../inout/IoOrderDetailBizController.java | 35 +++++++++++-------- .../api/req/inout/FilterOrderRequest.java | 1 + .../api/service/inout/IoAddInoutService.java | 2 +- .../java/com/glxp/api/task/SyncHeartTask.java | 4 +-- .../mybatis/mapper/inout/IoOrderDao.xml | 6 ++++ 6 files changed, 57 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 6187fd578..846f5d6ec 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -500,6 +500,33 @@ public class IoOrderController extends BaseController { } + /** + * PDA获取获取单据列表 + * + * @param filterOrderRequest + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/order/pda/list") + public BaseResponse pdaListOrder(@RequestBody FilterOrderRequest filterOrderRequest) { + + if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { + orderService.setFilterStatus(filterOrderRequest); + } + if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { + orderService.setActions(filterOrderRequest); + if (CollUtil.isEmpty(filterOrderRequest.getActions())) { + PageInfo pageInfo = new PageInfo<>(new ArrayList<>()); + return ResultVOUtils.page(pageInfo); + } + } + List list = orderService.filterList(filterOrderRequest); + if (CollUtil.isEmpty(list)) + return ResultVOUtils.error(500, "未查询到单据"); + return ResultVOUtils.success(list); + } + + /** * PDA获取待校验、待配货等单据 * 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 5f4523f79..25f54bc30 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -94,10 +94,20 @@ public class IoOrderDetailBizController extends BaseController { ReceivedetailService receivedetailService; @Resource IBasicBusTypeChangeService basicBusTypeChangeService; - @Resource IoOrderInvoiceService ioOrderInvoiceService; - + @Resource + SupProductService supProductService; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + SupCertService supCertService; + @Resource + ThrOrderDetailService thrOrderDetailService; + @Resource + ThrSystemBusApiService thrSystemBusApiService; + @Resource + UdiRlSupService udiRlSupService; //获取单据业务详情---临时接口查询 @AuthRuleAnnotation("") @@ -110,12 +120,14 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } - @Resource - SupProductService supProductService; - @Resource - SystemParamConfigService systemParamConfigService; - @Resource - SupCertService supCertService; + + @AuthRuleAnnotation("") + @GetMapping("udiwms/inout/order/biz/detail") + public BaseResponse getOrderBizDetail(String billNo) { + List orderEntityList = orderDetailBizService.findByOrderId(billNo); + return ResultVOUtils.success(orderEntityList); + } + //录入业务单据详情 @AuthRuleAnnotation("") @@ -221,13 +233,6 @@ public class IoOrderDetailBizController extends BaseController { } - @Resource - ThrOrderDetailService thrOrderDetailService; - @Resource - ThrSystemBusApiService thrSystemBusApiService; - @Resource - UdiRlSupService udiRlSupService; - //选入第三方单据至业务单据 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addThrOrder") diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 94e12ea5f..074af1767 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -200,4 +200,5 @@ public class FilterOrderRequest extends ListPageRequest { private String keyWords; private Integer confirmStatus; private Boolean filterSelected; + private List inOrders; } diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 56de85ffb..ccfc27537 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -688,7 +688,7 @@ public class IoAddInoutService { int count = 0; if (filterList != null) { for (IoCodeTempEntity temp : filterList) { - if (temp.getCode().equals(codeEntity.getCode())) { + if (temp.getCode().equals(codeEntity.getCode()) && StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo()))) { count = count + 1; } } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index a6e2762ae..78cb299df 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -20,8 +20,8 @@ import javax.annotation.Resource; import java.util.Arrays; @Slf4j -//@Component -//@EnableScheduling +@Component +@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { @Resource diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 9738ac04d..ffb875d80 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -106,6 +106,12 @@ #{item} + + AND io.billNo in + + #{item} + + AND io.billNo in