diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java index f97cc787e..bf5b615bc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java @@ -10,6 +10,7 @@ package com.xdadan.erp.emis.service.impl; +import java.util.Date; import java.util.List; import com.xdadan.erp.emis.domain.EmisWarehouseInDtl; @@ -75,8 +76,10 @@ public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchSer public int insertEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch) throws EmisBizError { // 进仓序列号 String serialNo= WaybillHelper.genWsInSerialNo(); + emisWarehouseInBatch.setSerialNo(serialNo); - emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch); + emisWarehouseInBatch.setEntryDate(new Date()); + List cargoList=emisWarehouseInBatch.getCargoList(); if(CollectionUtils.isEmpty(cargoList)){ throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空"); @@ -87,7 +90,9 @@ public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchSer emisWarehouseInDtlMapper.insertEmisWarehouseInDtl(item); } - return emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch); + emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch); + + return 1; } /**