From 5556eaa56128077bea9667e5d605e7b672c4a10b Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 24 Nov 2024 09:37:05 +0800 Subject: [PATCH] md --- .../web/emis/EmisWaybillTransferController.java | 17 +++++++++++++++-- .../service/impl/EmisSettleBillServiceImpl.java | 1 - .../impl/EmisWaybillTransferServiceImpl.java | 1 - 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java index 847e3bb25..a80b1be7f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java @@ -19,6 +19,8 @@ import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; +import com.xdadan.erp.emis.domain.vo.scan.ScanResult; +import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; import com.xdadan.erp.emis.utils.WaybillHelper; @@ -185,13 +187,24 @@ public class EmisWaybillTransferController extends EmisBaseController scanInfo.setScanData(scanDataList); try { - emisTmsScanRecordService.scan(scanInfo,getLoginUser().getUser().getEmpCode(),getLoginUser().getUser().getOwnerSiteCode()); + ScanResult scanResult=emisTmsScanRecordService.scan(scanInfo,getLoginUser().getUser().getEmpCode(),getLoginUser().getUser().getOwnerSiteCode()); + List rstList=scanResult.getScanResult(); + if(!CollectionUtils.isEmpty(rstList)) { + + ScanResultItem item0=rstList.get(0); + if("fail".equals(item0.getResult()) ){ + return AjaxResult.error(item0.getMessage()); + }else{ + return AjaxResult.success("处理成功"); + } + }else{ + return AjaxResult.error("扫描失败!"); + } } catch (Exception e) { e.printStackTrace(); return AjaxResult.error("数据异常!"); } - return AjaxResult.success("成功",1); } // /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 592a62b04..71bd0fa10 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -519,7 +519,6 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS } // 更新每一单的开票状态 emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill); - } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java index 7c152b052..6b1225ea9 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java @@ -81,7 +81,6 @@ public class EmisWaybillTransferServiceImpl implements IEmisWaybillTransferServ public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer) { // 做一次转件扫描记录 - return emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer); }