低值易耗品管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
cy
2023-11-20 717ff115ee5c57c8df0fd491b40b848090d2c68e 
 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java


@@ -2,22 +2,26 @@




import com.consum.base.core.WhBusinessEnum;


import com.consum.base.core.utils.LockManage;


import com.consum.model.po.*;


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.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


@@ -70,14 +74,25 @@


        // 出库单ID


        Long outWarehouseFormId = null;


        try {


            // 根据调拨单 生成 出库单


            // 根据调拨单 生成 出库单 这样就能公用出库


            outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser, dealTime);


        } catch (Exception e) {


            log.error(e.getMessage());


            return;


        }


        //单据类型。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 lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, WhBusinessEnum.DIAOBO, currentUser, dealTime);


        Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, businessEnum, currentUser, dealTime);




        // 更新调拨单


        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);


@@ -165,57 +180,59 @@


                List<Long> outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);


                // 库存物品详情（L_WH_GOODS）中 状态设置为1


                lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, goodsStatus);


                //此时要往 物品使用记录【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 (totalGoodsNum != outGoodsIds.size()) {


                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                    throw new RuntimeException("入库单失败，使用人使用数量与物品数量不一致");


                if (businessType == 1){


                    // 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 (totalGoodsNum != outGoodsIds.size()) {


                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                        throw new RuntimeException("入库单失败，使用人使用数量与物品数量不一致");


//                        log.error("创建入库单失败");


                }


                //将物品型号以前的使用记录设置为非最新


                lGoodsUserRecordService.updSetNotLast(outGoodsIds);


                ArrayList<LGoodsUserRecord> goodsUserRecordList = new ArrayList<>();


                int startIndex = 0;


                for (LWhProcureModelUser whProcureModelUser : goodsUserInfo) {


                    Integer goodsNum = whProcureModelUser.getGoodsNum();


                    String nowUserName = whProcureModelUser.getNowUserName();


                    Long nowUserPhone = whProcureModelUser.getNowUserPhone();


                    Long procureModelUserRecordId = whProcureModelUser.getProcureModelUserRecordId();


                    List<Long> goodsIds = outGoodsIds.subList(startIndex, startIndex + goodsNum);


                    for (Long goodsId : goodsIds) {


                        LGoodsUserRecord tmp = new LGoodsUserRecord();


                        tmp.setWhGoodsId(goodsId);


                        tmp.setRecordType(recordType);


                        tmp.setTransBusinessId(whFormTransferId);


                        if (businessType == 1) {


                            tmp.setNowUserName(nowUserName);


                            tmp.setNowUserPhone(nowUserPhone);


                        } else if (businessType == 2) {


                            tmp.setNowUserName(null);


                            tmp.setNowUserPhone(null);


                        }


                        tmp.setProcureModelUserRecordId(procureModelUserRecordId);


                        tmp.setOperatorId(userId);


                        tmp.setOperatorName(nickName);


                        tmp.setDealTime(dealTime);


                        tmp.setLastRecord(1);


                        goodsUserRecordList.add(tmp);


                    }


                    // 更新下标位置


                    startIndex += goodsNum;


                    //将物品型号以前的使用记录设置为非最新


                    lGoodsUserRecordService.updSetNotLast(outGoodsIds);


                    ArrayList<LGoodsUserRecord> goodsUserRecordList = new ArrayList<>();


                    int startIndex = 0;


                    for (LWhProcureModelUser whProcureModelUser : goodsUserInfo) {


                        Integer goodsNum = whProcureModelUser.getGoodsNum();


                        String nowUserName = whProcureModelUser.getNowUserName();


                        Long nowUserPhone = whProcureModelUser.getNowUserPhone();


                        Long procureModelUserRecordId = whProcureModelUser.getProcureModelUserRecordId();


                        List<Long> goodsIds = outGoodsIds.subList(startIndex, startIndex + goodsNum);


                        for (Long goodsId : goodsIds) {


                            LGoodsUserRecord tmp = new LGoodsUserRecord();


                            tmp.setWhGoodsId(goodsId);


                            tmp.setRecordType(recordType);


                            tmp.setTransBusinessId(whFormTransferId);


                            if (businessType == 1) {


                                tmp.setNowUserName(nowUserName);


                                tmp.setNowUserPhone(nowUserPhone);


                            } else if (businessType == 2) {


                                tmp.setNowUserName(null);


                                tmp.setNowUserPhone(null);


                            }


                            tmp.setProcureModelUserRecordId(procureModelUserRecordId);


                            tmp.setOperatorId(userId);


                            tmp.setOperatorName(nickName);


                            tmp.setDealTime(dealTime);


                            tmp.setLastRecord(1);


                            goodsUserRecordList.add(tmp);


                        }


                        // 更新下标位置


                        startIndex += goodsNum;


                    }


                    //批量插入使用人记录


                    lGoodsUserRecordService.insertBatch(goodsUserRecordList);


                }


                //批量插入使用人记录


                lGoodsUserRecordService.insertBatch(goodsUserRecordList);


                //将保管仓库信息更新到 物品仓库保管记录【L_GOODS_WH_RECORD】


                lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);




                // 获得锁后查询该型号的期初数量


                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, (short) 1, null);


                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, 1, null);


                whGoodsRecord.setInitialCount(goodsModelNum);


                whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());


            }


@@ -223,7 +240,8 @@


            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);


@@ -232,7 +250,8 @@




        // 更新调拨单


        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);


        lWhFormTransfer.setInWarehouseFormId(inWarehouseFlowId);


        lWhFormTransfer.setInWarehouseFlowId(inWarehouseFlowId);


        lWhFormTransfer.setInWarehouseFormId(null);


        lWhFormTransfer.setStates(2);


        lWhFormTransfer.setInOperatorId(userId);


        lWhFormTransfer.setInOperatorName(nickName);