blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
4 天以前 930cf3fe63ddea4720ca6818df94c2161a04054f 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java


@@ -1,13 +1,11 @@


package com.vincent.rsf.server.manager.service.impl;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.vincent.rsf.framework.common.R;


import com.vincent.rsf.framework.exception.CoolException;


import com.vincent.rsf.server.api.controller.params.TaskInParam;


import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;


import com.vincent.rsf.server.api.service.WcsService;


import com.vincent.rsf.server.api.utils.LocUtils;


import com.vincent.rsf.server.api.utils.SlaveProperties;


import com.vincent.rsf.server.common.constant.Constants;


import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;


import com.vincent.rsf.server.manager.entity.*;


@@ -19,6 +17,8 @@


import com.vincent.rsf.server.system.utils.SerialRuleUtils;


import lombok.Synchronized;


import org.apache.commons.lang3.StringUtils;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


@@ -29,6 +29,8 @@




@Service("locItemService")


public class LocItemServiceImpl extends ServiceImpl<LocItemMapper, LocItem> implements LocItemService {




    Logger logger = LoggerFactory.getLogger(LocItemServiceImpl.class);




    @Autowired


    private LocService locService;


@@ -42,12 +44,15 @@


    private DeviceSiteService deviceSiteService;


    @Autowired


    private WcsService wcsService;


    @Autowired


    private OutStockService outStockService;






    /**


     * 库存出库生成出库任务


     * type: check 盘点, stock: 库存出库


     *


     * @param resouce


     * @param map


     * @param loginUserId


     * @return


@@ -55,7 +60,7 @@


    @Override


    @Synchronized


    @Transactional(rollbackFor = Exception.class)


    public R generateTask(LocToTaskParams map, Long loginUserId) {


    public void generateTask(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception {


        if (Objects.isNull(map.getSiteNo())) {


            throw new CoolException("站点不能为空！");


        }


@@ -66,22 +71,35 @@


        String siteNo = map.getSiteNo();


        List<LocItem> items = map.getItems();


        Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));


        AsnOrder order;


        if (!Objects.isNull(map.getSourceId())) {


            order = outStockService.getById(map.getSourceId());


        } else {


            order = new AsnOrder();


        }




        listMap.keySet().forEach(key -> {


            Task task = new Task();


            Loc loc = locService.getById(key);


            logger.info("库位：>{}<UNK>", loc.getCode());




            if (Objects.isNull(loc)) {


                throw new CoolException("数据错误：所选库存信息不存在！！");


            }


            if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {


                throw new CoolException("库位:" + loc.getCode() +  ",不处于F.在库状态，不可执行R.出库预约操作！！");


            }




            loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);




            if (!locService.updateById(loc)) {


                throw new CoolException("库位状态更新失败！！");


            }


            Task moveTask = new Task();




            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);


            task.setOrgLoc(loc.getCode())


                    .setTaskCode(ruleCode)


                    .setResource(resouce)


                    .setTargSite(siteNo)


                    .setSort(Constants.TASK_SORT_DEFAULT_VALUE)


                    .setUpdateBy(loginUserId)


@@ -101,12 +119,12 @@


            List<LocItem> locItemList = listMap.get(key);


            Double outQty = locItemList.stream().mapToDouble(LocItem::getOutQty).sum();




            Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, loc.getBarcode()));


            if (!Objects.isNull(serviceOne)) {


                throw new CoolException("托盘任务执行中，不能重复创建！");


            }


//            Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, loc.getBarcode()));


//            if (!Objects.isNull(serviceOne)) {


//                throw new CoolException("托盘任务执行中，不能重复创建！");


//            }




            if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {


            if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK) || map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {


                Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;


                if (orgQty.compareTo(useQty) > 0) {


                    //拣料出库


@@ -140,6 +158,7 @@


                }


                task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());


            }




            if (!taskService.save(task)) {


                throw new CoolException("任务创建失败！！");


            }


@@ -186,13 +205,19 @@


                        .setBatch(item.getBatch())


                        .setUpdateBy(loginUserId)


                        .setCreateBy(loginUserId)


                        .setSource(item.getId())


                        .setSourceId(item.getLocId())


                        .setSourceCode(item.getLocCode())


                        .setCreateTime(new Date())


                        .setUpdateTime(new Date())


                        .setOrderType(OrderType.ORDER_OUT.type)


                        .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));


               if (map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {


                    taskItem.setWkType(Short.parseShort(order.getWkType()))


                            .setSourceCode(order.getCode())


                            .setSourceId(order.getId());


               } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {


                   taskItem.setSource(item.getId())


                           .setSourceId(item.getLocId())


                           .setSourceCode(item.getLocCode());


               }


                taskItems.add(taskItem);




                Double qty = Math.round((item.getWorkQty() + item.getOutQty()) * 10000) / 10000.0;


@@ -222,8 +247,6 @@


                throw new CoolException("任务明细生成失败！！");


            }


        });




        return R.ok("任务生成完成！!");


    }




    /**