aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-14 08:55:57 +08:00
parent 90099ea500
commit ead7b6458e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -486,7 +486,7 @@ public class EmisCommonController extends EmisBaseController
* @return * @return
*/ */
@RequestMapping("/queryTraceInfo") @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)){ if(StringUtils.isAnyEmpty(mainNo,appId,sign)){
return AjaxResult.error("appId,sign,mainNo required!"); return AjaxResult.error("appId,sign,mainNo required!");

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -28,10 +28,7 @@ package com.xdadan.erp.emis.service;
import com.xdadan.erp.common.utils.*; import com.xdadan.erp.common.utils.*;
import com.xdadan.erp.common.utils.sign.MD5; import com.xdadan.erp.common.utils.sign.MD5;
import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.enumtype.*;
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.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl; import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl;
import com.xdadan.erp.emis.domain.vo.WaybillOrder; import com.xdadan.erp.emis.domain.vo.WaybillOrder;
@ -2809,6 +2806,11 @@ public class EmisBaseService {
// 判断是否已超时及锁账 // 判断是否已超时及锁账
if(emisWaybill!=null ) { if(emisWaybill!=null ) {
// 未接单不判断超时
if(OrderStatus.INIT.statusCode.equals(emisWaybill.getOrderStatus())){
return;
}
if( PaymentStatus.PAID.statusCode.equals(emisWaybill.getPaymentStatus()) if( PaymentStatus.PAID.statusCode.equals(emisWaybill.getPaymentStatus())
|| PaymentStatus.PAID_SOME.statusCode.equals(emisWaybill.getPaymentStatus()) || PaymentStatus.PAID_SOME.statusCode.equals(emisWaybill.getPaymentStatus())
){ ){