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-11-24 09:37:05 +08:00
parent 93bf74498e
commit 5556eaa561
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
View File

@ -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.enumtype.ScanType;
import com.xdadan.erp.emis.domain.exception.EmisBizError; 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.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.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.WaybillHelper;
@ -185,13 +187,24 @@ public class EmisWaybillTransferController extends EmisBaseController
scanInfo.setScanData(scanDataList); scanInfo.setScanData(scanDataList);
try { try {
emisTmsScanRecordService.scan(scanInfo,getLoginUser().getUser().getEmpCode(),getLoginUser().getUser().getOwnerSiteCode()); ScanResult scanResult=emisTmsScanRecordService.scan(scanInfo,getLoginUser().getUser().getEmpCode(),getLoginUser().getUser().getOwnerSiteCode());
List<ScanResultItem> 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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return AjaxResult.error("数据异常!"); return AjaxResult.error("数据异常!");
} }
return AjaxResult.success("成功",1);
} }
// /** // /**

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -519,7 +519,6 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
} }
// 更新每一单的开票状态 // 更新每一单的开票状态
emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill); emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill);
} }
} }

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java
View File

@ -81,7 +81,6 @@ public class EmisWaybillTransferServiceImpl implements IEmisWaybillTransferServ
public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer) public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer)
{ {
// 做一次转件扫描记录 // 做一次转件扫描记录
return emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer); return emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer);
} }