#

whycq

2023-07-21 8ac14b7579587a35476e6892f9a2b1ee90a78957

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

@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
@@ -447,6 +448,7 @@
    @Override
    @Transactional
    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
        Integer basDevp = staNo.getDevNo();
        Date now = new Date();
        // 合并同类项
        Set<String> locNos = new HashSet<>();
@@ -573,6 +575,10 @@
                        if (Cools.isEmpty(mat)) {
                            throw new CoolException(locDetl.getMatnr() + "商品档案不存在");
                        }
                        int zpallet = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", locDetl.getZpallet()));
                        if (zpallet>0) {
                            throw new CoolException(locDetl.getZpallet() + "入库通知档中已存在");
                        }
                        WaitPakin waitPakin = new WaitPakin();
                        waitPakin.sync(mat);
                        waitPakin.setBatch("");
@@ -624,13 +630,27 @@
            //-----------------2023.6.2出库兼容代码-----------------------
            if (ioType!=107){
                List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
                if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
                    //单品区域出库物料大于1种，强制变成101全板出库
                    ioType = 101;
                //if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
                //    //单品区域出库物料大于1种，强制变成101全板出库
                //    ioType = 101;
                //    if (staNo.getDevNo()==300){
                //        staNo.setDevNo(200);
                //    }
                //}
                if (ioType == 101) {
                    if (staNo.getDevNo()==300){
                        staNo.setDevNo(200);
                        if(locMast.getCrnNo() == 1) {
                            staNo.setDevNo(100);
                        } else {
                            staNo.setDevNo(200);
                        }

                    }
                } else {
                    staNo.setDevNo(basDevp);
                }


            }
            //-----------------2023.6.2出库兼容代码end-----------------------

@@ -1418,6 +1438,8 @@
        if (!wrkMastRes || !locMastRes) {
            throw new CoolException("保存数据失败");
        }
        WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
        waitPakinService.delete(new EntityWrapper<>(waitPakin));
    }

    @Override