#

whycq

2025-02-13 6041287f587b119e993976d79ec59a9b69bf2c19

#

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

@@ -7,10 +7,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocTypeDto;
@@ -95,6 +92,8 @@
    private WrkChargeMapper wrkChargeMapper;
    @Autowired
    private BasDevpMapper basDevpMapper;
    @Autowired
    private WaitPakinMapper waitPakinMapper;

    /**
     * 组托
@@ -1548,9 +1547,11 @@
                } else {
                    List<String> shallowLocs = Utils.getShallowLocs(wrkMast.getSourceLocNo());
                    if (!Cools.isEmpty(shallowLocs)) {
                        // 浅库位组有货
                        for (String shallowLocNo : shallowLocs) {
                            LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                            // 浅库位在作业中
                            if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
                                if (Cools.isEmpty(waitWrkMast)){
                                    News.error("库位异常");
@@ -1578,7 +1579,8 @@
                                        break;
                                    }
                                }
                            }else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                            // 浅库位组有货，且没有在作业中
                            } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                                if (null == waitWrkMast) {
                                    // 生成一笔移库任务工作档、改变浅库位的源库/目标库 库位状态
                                    // 没有作业中的出库任务时，才能生成移库任务
@@ -4631,7 +4633,8 @@
            }
            LocMast loc = null;

            if(shallowLoc.getLocType2() == 3){ //低频混直接出库
            if(shallowLoc.getLocType2() == 3 || shallowLoc.getLocType2() == 1){
                //低频混直接出库
                // 获取工作号
                int workNo = commonService.getWorkNo(0);
                Date now = new Date();
@@ -4676,13 +4679,20 @@
                        WrkDetl wrkDetl = new WrkDetl();
                        wrkDetl.sync(locDetl);
                        wrkDetl.setWrkNo(workNo);
                        wrkDetl.setIoTime(new Date());
                        wrkDetl.setIoTime(now);
                        wrkDetl.setAnfme(locDetl.getAnfme());
                        wrkDetl.setAppeTime(new Date());
                        wrkDetl.setModiTime(new Date());
                        wrkDetl.setAppeTime(now);
                        wrkDetl.setModiTime(now);
                        if (!wrkDetlService.insert(wrkDetl)) {
                            throw new CoolException("保存工作档明细失败");
                        }
                        // 生成对应的组托档
                        WaitPakin waitPakin = new WaitPakin();
                        waitPakin.sync(wrkDetl);
                        waitPakin.setModiTime(now);
                        waitPakin.setAppeTime(now);
                        waitPakinMapper.insert(waitPakin);

                    }
                }
                // 修改源库位状态