更新为正式部署许可证

zyh

14 小时以前 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -8,8 +8,8 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -22,6 +22,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +30,6 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;

@@ -114,6 +113,10 @@
    private BasStationService basStationService;
    @Autowired
    private BasContainerService basContainerService;
    @Autowired
    private ConfigServiceImpl configService;
    @Autowired
    private CanFinMapper canFinMapper;

    @Override
    @Transactional
@@ -606,9 +609,9 @@
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
                    throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty());
                }
//                if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
//                    throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty());
//                }
                WaitPakin waitPakin = new WaitPakin();
                BeanUtils.copyProperties(mat, waitPakin);
                waitPakin.setBatch(detlDto.getBatch());
@@ -622,6 +625,15 @@
                waitPakin.setModiTime(now);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }else {
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                            .eq("barcode", param.getBarcode())
                            .eq("io_type",110));
                    if (wrkMast != null) {
                        wrkMast.setWrkSts(15L);//空板出库任务转历史档
                        wrkMast.setModiTime(new Date());
                        wrkMastService.updateById(wrkMast);
                    }
                }
            }
            // 关联组托
@@ -695,6 +707,9 @@
//                if (suplus < 0) {
//                    throw new CoolException("物料：" + detlDto.getMatnr() + ", 超出当前托盘装载上限！！");
//                }
                OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
                        .eq("order_no", param.getOrderNo())
                        .eq("matnr", detlDto.getMatnr()));

                WaitPakin waitPakin = new WaitPakin();
                BeanUtils.copyProperties(mat, waitPakin);
@@ -710,6 +725,7 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setStandby1(detls.getStandby1());//配盘号
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -720,8 +736,52 @@
                Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
                OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
            });
        }
            if(!Cools.isEmpty(param.getRsta()) && param.getRsta().contains("-")){
                //生成AGV搬运任务
                //生成AGV搬运出库任务
                // 保存工作档
                Task task = new Task();
                Date date = new Date();
                String s = "";
                if (param.getBarcode().charAt(0) == '3'){
                    s = "307";
                }else if (param.getBarcode().charAt(0) == '4'){
                    s = "402";
                }else if (param.getBarcode().charAt(0) == '5'){
                    s = "401";
                }
                String TaskNo = param.getBarcode()+"aa"+date.getTime();
                task.setWrkNo((int) date.getTime())
                        .setTaskNo(TaskNo)
                        .setIoTime(date)
                        .setWrkSts(301L) // 工作状态：301.任务下发
                        .setIoType(3) // 入出库状态： 3.站到站
                        .setTaskType("agv")
                        .setIoPri(10D)
                        .setFullPlt("Y") // 满板：Y
                        .setPicking("N") // 拣料
                        .setExitMk("N")// 退出
                        .setStaNo(s)
                        .setSourceStaNo(param.getRsta())//agv取货位
                        .setEmptyMk("N")// 空板
                        .setBarcode(param.getBarcode())// 托盘码
                        .setLinkMis("N")
                        .setAppeUser(9945L)
                        .setAppeTime(date)
                        .setModiUser(9945L)
                        .setModiTime(date);
                if (taskService.insert(task)) {
                    CanFin canFin = new CanFin();
                    canFin.setApplyTime(now);
                    canFin.setAgvType("agv-in");
                    canFin.setInNo(detlDtos.get(0).getOrderNo());
                    canFinMapper.insert(canFin);
                }else {
                    throw new CoolException("保存工作档失败");
                }
            }

        }
    }

    // 商品上架
@@ -1274,19 +1334,31 @@

    @Override
    @Transactional
    public R callEmptyBinOutBound(String staNo, String locType, Long userId) {
    public R callEmptyBinOutBound(String staNo, String locType, Long userId, String agvTaskNo) {
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", 'D').eq("loc_type2", locType));
        if(locMast == null) {
            return R.parse("该类型：" + locType +"空托盘不存在");
        }
        String sta="";
        //滑块库
        if(locMast.getLocType3()==1){
            if(locMast.getLocType2()==1){
                sta = "402";
            }else if(locMast.getLocType2()==2){
                sta = "401";
            }
        }else if(locMast.getLocType3()==2){
            sta="307";
        }

        // 获取路径
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", 110)
                .eq("stn_no", staNo)
                .eq("stn_no", sta)
                .eq("crn_no", locMast.getCrnNo());
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (staDesc == null) {
            R.parse("出库路径不存在,站点：" + staNo);
            R.parse("出库路径不存在,站点：" + sta);
        }
        Date now = new Date();
        // 生成工作档
@@ -1297,8 +1369,8 @@
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(110); // 入出库状态： 110.空板出库
        wrkMast.setIoPri(10D);
        wrkMast.setSourceStaNo(staDesc.getCrnStn$()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo$()); // 目标站
        wrkMast.setSourceStaNo(sta); // 源站
        wrkMast.setStaNo(sta); // 目标站
        wrkMast.setCrnNo(staDesc.getCrnNo());
        wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
        wrkMast.setFullPlt("N"); // 满板：Y
@@ -1306,11 +1378,23 @@
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("N");
        if (agvTaskNo!=null){
            wrkMast.setUserNo(agvTaskNo);
        }else {
            Date date = new Date();
            wrkMast.setUserNo(staNo + "aa" + date.getTime());
        }
        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setMemo(staNo);
        wrkMastService.insert(wrkMast);
        CanFin canFin = new CanFin();
        canFin.setAgvType("agv-out");
        canFin.setApplyTime(now);
        canFin.setOutNo(wrkMast.getUserNo());
        canFinMapper.insert(canFin);

        // 更新库位状态
        if (locMast.getLocSts().equals("D")) {
@@ -1481,3 +1565,4 @@
        }
    }
}