consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -152,7 +152,7 @@ inOutMap.putAll(ckMap); Long lWhFormOutputId = (Long) inOutMap.get("outId"); //2.根据出库单出库 Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, currentUser, stopTime); Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId,WhBusinessEnum.CAIGOU, currentUser, stopTime); if (lWarehouseFlowId == null) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); // throw new RuntimeException("创建出库单失败"); consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -145,7 +145,7 @@ * @return 流水记录总表ID */ @Transactional(rollbackFor = Exception.class) public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser, Long dealTime) { public Long outFormByTransId(Long outWarehouseFormId,WhBusinessEnum businessType, S_user_core currentUser, Long dealTime) { if (outWarehouseFormId == null) { return null; } @@ -271,7 +271,7 @@ warehouseFlow.setWarehouseId(outWarehouseId); warehouseFlow.setWarehouseName(warehouseName); warehouseFlow.setThisType(2); warehouseFlow.setBusinessType(WhBusinessEnum.DIAOBO.getValue() + 0); warehouseFlow.setBusinessType(businessType.getValue() + 0); warehouseFlow.setBusinessFormId(lWarehouseFlowBusinessId); warehouseFlow.setOperatorId(userId); consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -2,6 +2,7 @@ import com.consum.base.core.CodeGeneratorEnum; import com.consum.base.core.CodeGeneratorService; import com.consum.base.core.WhBusinessEnum; import com.consum.base.core.param.BaseWarehouseParam1; import com.consum.base.core.utils.IdUtil; import com.consum.base.core.utils.MapperUtil; @@ -9,23 +10,20 @@ import com.consum.base.pojo.LWFormsOutputGoodsParam; import com.consum.base.pojo.LWhFormOutputInsertParam; import com.consum.base.pojo.query.LWhFormOutputQry; import com.consum.model.po.BaseGoodsModels; import com.consum.model.po.BaseWarehouse; import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.LWhFormOutput; import com.consum.model.po.LWhProcureModel; import com.consum.model.po.*; import com.iplatform.model.po.S_user_core; import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.StringUtils; import com.walker.jdbc.service.BaseServiceImpl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description 出库单 @@ -213,7 +211,7 @@ } //3.根据出库单出库 Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, currentUser, param.getDealTime()); Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU, currentUser, param.getDealTime()); if (lWarehouseFlowId == null) { log.error("根据出库单出库失败"); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
@@ -1,26 +1,23 @@ package com.consum.base.service; import com.consum.base.core.WhBusinessEnum; import com.consum.base.core.utils.LockManage; import com.consum.model.po.LGoodsUserRecord; import com.consum.model.po.LWarehouseFlow; import com.consum.model.po.LWhFormTransfer; import com.consum.model.po.LWhGoodsRecord; import com.consum.model.po.LWhGoodsRecordDetails; import com.consum.model.po.LWhProcureModelUser; import com.consum.model.po.*; import com.iplatform.model.po.S_user_core; import com.walker.infrastructure.utils.CollectionUtils; import com.walker.infrastructure.utils.DateUtils; import com.walker.infrastructure.utils.NumberGenerator; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; /** * @ClassName LWhFormTransferCoreService @@ -80,7 +77,7 @@ return; } // 出库单 出库，返回 出库单流水Id Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime); Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, WhBusinessEnum.DIAOBO, currentUser, dealTime); // 更新调拨单 lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
