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())); }