空板回库称重再校验

skyouc

1 天以前 029ffbf20db7196d4f460bc741fd5f36a80689ae

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -10,15 +10,18 @@
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -41,6 +44,8 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;

    /**
     * 通知WCS锁定库位，及禁止当前库位的一切操作
@@ -214,25 +219,57 @@
        } else if (params.getNotifyType().equals("weight")) {
            //称重
            if (mast.getWrkSts() == 2) {
                WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
                if (Objects.isNull(wrkDetl)) {
                    throw new CoolException("数据错误，任务明细不存在！！");
                }
                Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", wrkDetl.getMatnr()));
                if (Objects.isNull(matnr)) {
                    throw new CoolException("物料基础信息不存在！！");
                }
                Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
                if (val.compareTo(0.0) > 0) {
                    //余料长度
                    wrkDetl.setRealQty(val * matnr.getVolume());
                if (mast.getIoType() == 10) {
                    //空板入库任务档
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", mast.getSourceLocNo()));
                    if (Objects.isNull(locDetl)) {
                        throw new CoolException("明细数据不存在！！");
                    }
                    Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", locDetl.getMatnr()));
                    if (Objects.isNull(matnr)) {
                        throw new CoolException("物料基础信息不存在！！");
                    }
                    Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
                    if (val.compareTo(0.0) > 0) {
                        WrkDetl wrkDetl = new WrkDetl();
                        BeanUtils.copyProperties(locDetl, wrkDetl);
                        wrkDetl.setWrkNo(mast.getWrkNo());
                        wrkDetl.setIoTime(new Date());
                        wrkDetl.setWeight(params.getWeight());
                        //余料长度
                        wrkDetl.setRealQty(val * matnr.getVolume());
                        mast.setIoType(1);
                        mast.setIsSuplus(1);
                        if (!wrkMastService.updateById(mast)) {
                            throw new CoolException("主档状态修改失败");
                        }
                        if (!wrkDetlService.insert(wrkDetl)) {
                            throw new CoolException("明细保存失败！！");
                        }
                    }
                } else {
                    //空板
                    wrkDetl.setRealQty(0.0);
                }
                wrkDetl.setWeight(params.getWeight());
                if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
                    throw new CoolException("任务档明细修改失败！！");
                    WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
                    if (Objects.isNull(wrkDetl)) {
                        throw new CoolException("数据错误，任务明细不存在！！");
                    }
                    Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", wrkDetl.getMatnr()));
                    if (Objects.isNull(matnr)) {
                        throw new CoolException("物料基础信息不存在！！");
                    }
                    Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
                    if (val.compareTo(0.0) > 0) {
                        //余料长度
                        wrkDetl.setRealQty(val * matnr.getVolume());

                    } else {
                        //空板
                        wrkDetl.setRealQty(0.0);
                    }

                    wrkDetl.setWeight(params.getWeight());
                    if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
                        throw new CoolException("任务档明细修改失败！！");
                    }
                }
            } else {
                throw new CoolException("数据错误，当前任务状态有误 ！");