更新为正式部署许可证

zyh

昨天 3bf6f972604761c9ac59a2cb9ea01eeacaec2189

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

@@ -10,6 +10,7 @@
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.*;
@@ -33,6 +34,8 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

@@ -82,6 +85,8 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private CanFinMapper canFinMapper;

    @Autowired
    private AdjDetlService adjDetlService;
@@ -563,7 +568,8 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void comb(CombParam param, Long userId) {
    public void
    comb(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
@@ -726,11 +732,20 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                if (!detlDto.getStandby1().isEmpty() && detlDto.getStandby1() != null && !detlDto.getStandby1().equals("")){
                waitPakin.setStandby1(detls.getStandby1());//配盘号
                }

                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
            }

//            Date date1 = now;
//            CanFin canFin = new CanFin();
//            canFin.setApplyTime(date1);
//            canFin.setAgvType("agv-in");
//            canFinMapper.insert(canFin);

            Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
            stringSet.forEach(orderNo -> {
@@ -1365,6 +1380,12 @@
        // 生成工作档
        int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
        WrkMast wrkMast = new WrkMast();
        if (agvTaskNo!=null){
            wrkMast.setUserNo(agvTaskNo);
        }else {
            Date date = new Date();
            wrkMast.setUserNo(staNo + "aa" + date.getTime());
        }
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
@@ -1379,14 +1400,16 @@
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("N");
        wrkMast.setUserNo(agvTaskNo);
        wrkMast.setUserNo(String.valueOf(agvTaskNo));
        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);
        canFinMapper.insert(canFin);

        // 更新库位状态
        if (locMast.getLocSts().equals("D")) {