feat: 调拨调整

cy

2023-11-06 d7f0b77a81c6c6f8895af082214edcbed29e3ab9

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java

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

import com.consum.base.core.util.LockManage;
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.*;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
@@ -12,8 +9,10 @@
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;
@@ -43,8 +42,10 @@
    private LGoodsWhRecordServiceImpl lGoodsWhRecordService;
    @Resource
    private LWarehouseFlowService lWarehouseFlowService;
//    @Resource
//    private LWarehouseFlowService LWhGoodsRecordDetailsService;
    @Resource
    private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
    @Resource
    private LGoodsUserRecordServiceImpl lGoodsUserRecordService;


    /**
@@ -116,8 +117,20 @@

        // 流水记录总表ID
        long inWarehouseFlowId = NumberGenerator.getLongSequenceNumber();
        // 根据出库流水ID 查询 出库的物品ID
        List<Long> outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId);
        //单据类型。0仓库调拨；1部门分发；2部门物品回退
        Integer businessType = lWhFormTransfer.getBusinessType();
        //状态（0=在途调拨；1=入库未分发；2=已下发；3=报废 4 零星出库）
        short goodsStatus = 1;
        //类型0分发使用1 反库
        Integer recordType = null;
        if (businessType == 1) {
            goodsStatus = 2;
            recordType = 0;

        } else if (businessType == 2) {
            goodsStatus = 1;
            recordType = 1;
        }

        // 插入 进出库流水总表[L_WAREHOUSE_FLOW]
        LWarehouseFlow inwarehouseFlow = new LWarehouseFlow();
@@ -146,6 +159,59 @@
            //通过LockManage获得锁
            Object warehouseModelLockObj = LockManage.acquireLock(inWarehouseType, inWarehouseId, baseGoodsModelsId);
            synchronized (warehouseModelLockObj) {
                // 根据出库流水ID 查询 出库的物品ID
                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("入库单失败，使用人使用数量与物品数量不一致");
//                        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.insertBatch(goodsUserRecordList);
                //将保管仓库信息更新到 物品仓库保管记录【L_GOODS_WH_RECORD】
                lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);

                // 获得锁后查询该型号的期初数量
                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, (short) 1, null);
                whGoodsRecord.setInitialCount(goodsModelNum);
@@ -153,30 +219,14 @@
            }
            LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
            lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
            List<LWhGoodsRecordDetails> goodsRecordDetailsList = null;// LWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
            List<LWhGoodsRecordDetails> goodsRecordDetailsList = lWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
            for (LWhGoodsRecordDetails whGoodsRecordDetails : goodsRecordDetailsList) {
                whGoodsRecordDetails.setId(NumberGenerator.getLongSequenceNumber());
                whGoodsRecordDetails.setThisType(1);
            }
//            LWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
            lWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
        }
        lWhGoodsRecordService.insertBatch(whGoodsRecordList);

        // 库存物品详情（L_WH_GOODS）中 状态设置为1
        lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, (short) 1);
        //将保管仓库信息更新到 物品仓库保管记录【L_GOODS_WH_RECORD】
        lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);

        //单据类型。0仓库调拨；1部门分发；2部门物品回退
        Integer businessType = lWhFormTransfer.getBusinessType();
        if (businessType == 1) {
            // 需要往 物品使用记录【L_GOODS_USER_RECORD】 增加记录

        } else if (businessType == 2) {
            // 需要往 物品使用记录【L_GOODS_USER_RECORD】 增加记录

        }


        // 更新调拨单
        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
@@ -198,11 +248,17 @@
     *
     * @param lWarehouseFlowId
     */
    private List<Long> getGoodsidByFlowId(long lWarehouseFlowId) {
    private List<Long> getGoodsidByFlowId(Long lWarehouseFlowId, Long whGoodsRecordId) {
        StringBuilder sql = new StringBuilder(GET_GOODSID_BY_FLOWID);
        Map<String, Object> paramts = new HashMap<>();
        sql.append(" and gr.WAREHOUSE_FLOW_ID =:lWarehouseFlowId");
        paramts.put("lWarehouseFlowId", lWarehouseFlowId);
        if (lWarehouseFlowId != null) {
            sql.append(" and gr.WAREHOUSE_FLOW_ID =:lWarehouseFlowId");
            paramts.put("lWarehouseFlowId", lWarehouseFlowId);
        }
        if (whGoodsRecordId != null) {
            sql.append(" and gr.id =:whGoodsRecordId");
            paramts.put("whGoodsRecordId", whGoodsRecordId);
        }
        List<Map<String, Object>> outGoods = goodsBaseService.select(sql.toString(), paramts);
        if (CollectionUtils.isEmpty(outGoods)) {
            return null;