Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-17 06346cdbdebfd83750aceb879664b72f0484cab0

 src/main/java/com/zy/asrs/task/handler/FireOutHandler.java

@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -72,15 +73,19 @@
                }
                // 生成工作档明细
                LocDetl detlDto=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(detlDto);
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                wrkDetl.setAnfme(1.0); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setModiTime(now);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                if (Cools.isEmpty(detlDto)){
                    log.error("库位:"+locMast.getLocNo()+"\t没有明细");
                }else {
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetl.sync(detlDto);
                    wrkDetl.setWrkNo(workNo);
                    wrkDetl.setIoTime(now);
                    wrkDetl.setAnfme(1.0); // 数量
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setModiTime(now);
                    if (!wrkDetlService.insert(wrkDetl)) {
                        log.error("库位:"+locMast.getLocNo()+"\t保存工作档明细失败");
                    }
                }
                // 修改库位状态:   F.在库 ====>>> R.出库预约
                if (locMast.getLocSts().equals("F")) {