xxjProject/low-consum-manage.git

			@@ -1,26 +1,26 @@
			package com.consum.base.service;

			import cn.hutool.core.convert.Convert;
			import com.consum.base.core.WhBusinessEnum;
			import com.consum.base.core.service.LWhWarningCoreServiceImpl;
			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.Propagation;
			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
			@@ -30,7 +30,7 @@
			**/
			@Service
			@Slf4j
			@Transactional(rollbackFor = Exception.class)
			@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
			public class LWhFormTransferCoreService {

			@Resource
			@@ -51,7 +51,8 @@
			private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
			@Resource
			private LGoodsUserRecordServiceImpl lGoodsUserRecordService;

			@Resource
			private LWhWarningCoreServiceImpl lWhWarningCoreService;

			/**
			* 执行调拨出库操作
			@@ -69,18 +70,30 @@
			Long userId = currentUser.getId();
			String nickName = currentUser.getNick_name();
			long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
			//单据类型。0仓库调拨；1部门分发；2部门物品回退
			Integer businessType = lWhFormTransfer.getBusinessType();
			businessType = businessType == null ? 0 : businessType;
			WhBusinessEnum businessEnum = WhBusinessEnum.DIAOBO;
			if (businessType == 0) {
			businessEnum = WhBusinessEnum.DIAOBO;
			} else if (businessType == 1) {
			businessEnum = WhBusinessEnum.BUMENFENFA;
			} else if (businessType == 2) {
			businessEnum = WhBusinessEnum.BUMENTUIHUI;
			}

			// 出库单ID
			Long outWarehouseFormId = null;
			try {
			// 根据调拨单生成出库单
			outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser, dealTime);
			// 根据调拨单生成出库单这样就能公用出库
			lWhFormTransfer.getBusinessType();
			outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, businessEnum, currentUser, dealTime);
			} catch (Exception e) {
			log.error(e.getMessage());
			return;
			}
			// 出库单出库，返回出库单流水Id
			Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime);
			Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, businessEnum, currentUser, dealTime);

			// 更新调拨单
			lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
			@@ -91,6 +104,7 @@
			lWhFormTransfer.setOutputTime(dealTime);
			lWhFormTransfer.setOutWarehouseFlowId(lWarehouseFlowId);
			lWhFormTransferService.update(lWhFormTransfer);

			log.info("调拨单：{} 出库完成", whFormTransferId);
			return;

			@@ -113,6 +127,10 @@
			String nickName = currentUser.getNick_name();
			// 出库单流水id
			Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
			if (outWarehouseFlowId == null){
			log.error("调拨失败！未找到出库单");
			return;
			}
			// 入库仓库类型 0机构1部门
			Integer inWarehouseType = lWhFormTransfer.getInWarehouseType();
			Long inWarehouseId = lWhFormTransfer.getInWarehouseId();
			@@ -151,30 +169,51 @@
			inwarehouseFlow.setDealTime(dealTime);
			lWarehouseFlowService.insert(inwarehouseFlow);

			ArrayList<Long> allChangModelList = new ArrayList<>();
			LWhGoodsRecord lWhGoodsRecord = new LWhGoodsRecord();
			lWhGoodsRecord.setWarehouseFlowId(outWarehouseFlowId);
			List<LWhGoodsRecord> whGoodsRecordList = lWhGoodsRecordService.select(lWhGoodsRecord);
			for (LWhGoodsRecord whGoodsRecord : whGoodsRecordList) {
			Long oldRecordId = whGoodsRecord.getId();
			Long baseGoodsModelsId = whGoodsRecord.getBaseGoodsModelsId();
			allChangModelList.add(baseGoodsModelsId);
			whGoodsRecord.setId(NumberGenerator.getLongSequenceNumber());
			whGoodsRecord.setWarehouseType(inWarehouseType);
			whGoodsRecord.setWarehouseId(inWarehouseId);
			whGoodsRecord.setDealTime(dealTime);
			//通过LockManage获得锁
			Object warehouseModelLockObj = LockManage.acquireLock(inWarehouseType, inWarehouseId, baseGoodsModelsId);
			List<Long> outGoodsIds = null;
			synchronized (warehouseModelLockObj) {
			// 根据出库流水ID 查询出库的物品ID
			List<Long> outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);
			outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);
			if (CollectionUtils.isEmpty(outGoodsIds)){
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			throw new RuntimeException("入库单失败，未查询到物品！");
			}
			// 库存物品详情（L_WH_GOODS）中状态设置为1
			lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, goodsStatus);
			//此时要往物品使用记录【L_GOODS_USER_RECORD】添加数据

			// 获得锁后查询该型号的期初数量
			int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, 1, null);
			whGoodsRecord.setInitialCount(goodsModelNum);
			whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());
			long totalAmount = lWhGoodsService.queryGoodsPriceById(outGoodsIds);
			whGoodsRecord.setTotalPrice(totalAmount);
			}
			if (businessType == 1) {
			// List<Map<String, Object>> modelInfo = baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);

			// 1部门分发此时要往物品使用记录【L_GOODS_USER_RECORD】添加数据
			//查询部门分发使用人
			LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
			lWhProcureModelUser.setTransBusinessId(whFormTransferId);
			lWhProcureModelUser.setBaseGoodsModelsId(baseGoodsModelsId);
			List<LWhProcureModelUser> goodsUserInfo = goodsBaseService.select(lWhProcureModelUser);
			int totalGoodsNum = goodsUserInfo.stream().mapToInt(LWhProcureModelUser::getGoodsNum).sum();
			if (CollectionUtils.isEmpty(goodsUserInfo)){
			continue;
			}
			int totalGoodsNum = goodsUserInfo.stream().filter(item -> item.getGoodsNum() != null).mapToInt(LWhProcureModelUser::getGoodsNum).sum();
			if (totalGoodsNum != outGoodsIds.size()) {
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			throw new RuntimeException("入库单失败，使用人使用数量与物品数量不一致");
			@@ -214,19 +253,17 @@
			}
			//批量插入使用人记录
			lGoodsUserRecordService.insertBatch(goodsUserRecordList);
			//将保管仓库信息更新到物品仓库保管记录【L_GOODS_WH_RECORD】
			lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);

			// 获得锁后查询该型号的期初数量
			int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, (short) 1, null);
			whGoodsRecord.setInitialCount(goodsModelNum);
			whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());
			}
			//将保管仓库信息更新到物品仓库保管记录【L_GOODS_WH_RECORD】
			lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);


			LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
			lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
			List<LWhGoodsRecordDetails> goodsRecordDetailsList = lWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
			for (LWhGoodsRecordDetails whGoodsRecordDetails : goodsRecordDetailsList) {
			whGoodsRecordDetails.setId(NumberGenerator.getLongSequenceNumber());
			whGoodsRecordDetails.setId(null);
			whGoodsRecordDetails.setWhGoodsRecordId(whGoodsRecord.getId());
			whGoodsRecordDetails.setThisType(1);
			}
			lWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
			@@ -235,12 +272,18 @@

			// 更新调拨单
			lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
			lWhFormTransfer.setInWarehouseFormId(inWarehouseFlowId);
			lWhFormTransfer.setInWarehouseFlowId(inWarehouseFlowId);
			lWhFormTransfer.setInWarehouseFormId(null);
			lWhFormTransfer.setStates(2);
			lWhFormTransfer.setInOperatorId(userId);
			lWhFormTransfer.setInOperatorName(nickName);
			lWhFormTransfer.setInTime(dealTime);
			lWhFormTransferService.update(lWhFormTransfer);

			//当库存变动时调用该方法
			if (inWarehouseType == 0){
			lWhWarningCoreService.updateKuCun(Convert.toShort(inWarehouseType, (short) 0), inWarehouseId, allChangModelList, null, dealTime);
			}
			log.info("调拨单：{} 入库完成", whFormTransferId);
			return;
			}