From 7c5316f17334b183abf42426c5a3f20a8ae93ef8 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 9 Apr 2025 22:05:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8D=95=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E8=B6=85=E6=97=B6=E8=BF=9B=E8=A1=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 4 ++++ .../java/com/glxp/api/req/collect/CollectOrderRequest.java | 4 +--- .../glxp/api/service/collect/IoCollectOrderBackupService.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 3ac6015ca..a4446228e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -198,6 +198,10 @@ public class IoCodeTempController extends BaseController { //先判断是否已完成 IoCollectOrderBackup byBillNo = ioCollectOrderBackupService.getByBillNo(code); + if (byBillNo == null) { + byBillNo = ioCollectOrderBackupService.getByBillNoNew(code); + + } //补充发票查询 if (byBillNo == null) { String billNo = ioOrderInvoiceService.selectBillNoByInvoiceEncode(code); diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index aaba85560..2b7299c73 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -188,7 +188,5 @@ public class CollectOrderRequest extends ListPageRequest { private Integer inAndOutType; private String ybbm; - - - + private String summaryNo; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index b66d75da2..087fa30bb 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -138,7 +138,9 @@ public class IoCollectOrderBackupService extends ServiceImpl().eq(IoCollectOrderBackup::getBillNo, billNo).last("limit 1")); } - + public IoCollectOrderBackup getByBillNoNew(String billNo) { + return ioCollectOrderBackupMapper.selectOne(new LambdaQueryWrapper().eq(IoCollectOrderBackup::getBackupOrderRemark1, billNo).last("limit 1")); + } public int updateByBillNo(IoCollectOrderBackup collectOrder) { return ioCollectOrderBackupMapper.update(collectOrder, new UpdateWrapper().eq("billNo", collectOrder.getBillNo())); }