出库查询及任务档流程优化

skyouc

19 小时以前 8896a0841940bac10c17b9a02f8d1cd76dd52084

 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,13 +44,16 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;

    /**
     * 通知WCS锁定库位，及禁止当前库位的一切操作
     * @author Ryan
     * @date 2026/1/10 11:18
     *
     * @param params
     * @return com.core.common.R
     * @author Ryan
     * @date 2026/1/10 11:18
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -71,10 +77,11 @@

    /**
     * 余料回库 （搬运余料回库）
     * @author Ryan
     * @date 2026/1/10 13:19
     *
     * @param params
     * @return com.core.common.R
     * @author Ryan
     * @date 2026/1/10 13:19
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -87,9 +94,9 @@
//           throw new CoolException("配对任务编码错误，请检查后重新上传！！");
//       }
        WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getWrkNo()));
       if (Objects.isNull(mast)) {
           throw new CoolException("任务不存在！！");
       }
        if (Objects.isNull(mast)) {
            throw new CoolException("任务不存在！！");
        }
//       if (!mast.getWrkSts().equals(103L)) {
//           throw new CoolException("当前任务并非余料出库任务！！");
//       }
@@ -102,15 +109,16 @@
//       }
        workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());

       return R.ok("接收成功，执行回库中...");
        return R.ok("接收成功，执行回库中...");
    }

    /**
     * 下发任务至WCS
     * @author Ryan
     * @date 2026/1/10 13:58
     *
     * @param params
     * @return com.core.common.R
     * @author Ryan
     * @date 2026/1/10 13:58
     */
    @Override
    public R pubWrkToWcs(WorkTaskParams params) {
@@ -129,7 +137,7 @@
        }
        String response;
        try {
            response =  new HttpHandler.Builder()
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.URL)
                    .setPath(url)
                    .setJson(JSON.toJSONString(params))
@@ -149,9 +157,10 @@

    /**
     * 上报锁定/释放库位信息
     *
     * @param locs
     * @author Ryan
     * @date 2026/1/10 12:50
     * @param locs
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -164,17 +173,17 @@
        }
        String response;
        try {
          response =  new HttpHandler.Builder()
            .setUri(MesConstant.URL)
            .setPath(url)
            .setJson(JSON.toJSONString(locs))
            .build()
            .doPost();
          R result = JSON.parseObject(response, R.class);
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.URL)
                    .setPath(url)
                    .setJson(JSON.toJSONString(locs))
                    .build()
                    .doPost();
            R result = JSON.parseObject(response, R.class);

          if (result.get("code").equals("200")) {
            if (result.get("code").equals("200")) {
                //TODO 上报是否成功
          }
            }
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
@@ -183,10 +192,11 @@

    /**
     * 堆垛机执行状态上报
     * @author Ryan
     * @date 2026/1/10 16:30
     *
     * @param params
     * @return com.core.common.R
     * @author Ryan
     * @date 2026/1/10 16:30
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -201,38 +211,91 @@
        if (Objects.isNull(mast)) {
            throw new CoolException("任务档不存在！！");
        }
        if ( params.getNotifyType().equals("task")) {
        if (params.getNotifyType().equals("task")) {
            //任务
            if (params.getMsgType().equals("task_complete")) {
                mast.setWrkSts(4L);
                if (!wrkMastService.updateById(mast)) {
                    throw new CoolException("任务状态修改失败！！");
                }
            } else if (params.getMsgType().equals("task_cancel")){
            } else if (params.getMsgType().equals("task_cancel")) {

            }
        } 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;
                    Double realQty = val * matnr.getVolume();
//                    if (val.compareTo(0.0) > 0) {
//                        //余料长度
//                        wrkDetl.setRealQty(realQty);
//                    } else {
//                        //空板
//                        wrkDetl.setRealQty(0.0);
//                    }
                    wrkDetl.setAnfme(realQty);
                    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("任务档明细修改失败！！");
                    }
                    // 更新原出库单
                    int indexOf = mast.getWrkCode().indexOf("-1");
                    if (indexOf != -1) {
                        String wrkNo = mast.getWrkCode().substring(0, indexOf);
                        WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
                        if (Objects.isNull(orgWrk)) {
                            throw new CoolException("数据错误，主任务档不存在或已删除！！");
                        }
                        WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
                        if (Objects.isNull(detl)) {
                            throw new CoolException("子任务档明细不存在！！");
                        }
                        Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
                        detl.setRealQty(v);
                        detl.setWeight(params.getWeight());
                        if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
                            throw new CoolException("原任务档明细修改失败！！");
                        }
                    } else {
                        throw new CoolException("任务号截取失败，请检查主任务档任档wrkCode字段");
                    }
                }
            } else {
                throw new CoolException("数据错误，当前任务状态有误 ！");