From ead7b6458e20a2b5e8a123c30f8b17e1a8343ec1 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 14 Sep 2024 08:55:57 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisCommonController.java | 2 +- .../com/xdadan/erp/emis/service/EmisBaseService.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 7c2495272..bd8aeb8cd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -486,7 +486,7 @@ public class EmisCommonController extends EmisBaseController * @return */ @RequestMapping("/queryTraceInfo") - public AjaxResult queryTraceInfo(String appId,String mainNo,String lang,String sign) + public AjaxResult queryTraceInfo(String appId,String mainNo,String lang,String orderBy,String sign) { if(StringUtils.isAnyEmpty(mainNo,appId,sign)){ return AjaxResult.error("appId,sign,mainNo required!"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index bd74c7f9a..4edb1e451 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -28,10 +28,7 @@ package com.xdadan.erp.emis.service; import com.xdadan.erp.common.utils.*; import com.xdadan.erp.common.utils.sign.MD5; import com.xdadan.erp.emis.domain.*; - import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; - import com.xdadan.erp.emis.domain.enumtype.PaymentStatus; - import com.xdadan.erp.emis.domain.enumtype.ScanType; - import com.xdadan.erp.emis.domain.enumtype.WaybillStatus; + import com.xdadan.erp.emis.domain.enumtype.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl; import com.xdadan.erp.emis.domain.vo.WaybillOrder; @@ -2809,6 +2806,11 @@ public class EmisBaseService { // 判断是否已超时及锁账 if(emisWaybill!=null ) { + // 未接单不判断超时 + if(OrderStatus.INIT.statusCode.equals(emisWaybill.getOrderStatus())){ + return; + } + if( PaymentStatus.PAID.statusCode.equals(emisWaybill.getPaymentStatus()) || PaymentStatus.PAID_SOME.statusCode.equals(emisWaybill.getPaymentStatus()) ){