打带获取木箱类型

pang.jiabao

2024-08-19 ff724aea871b8373dce71857024ca62f93bf709f

打带获取木箱类型

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -60,7 +60,7 @@
    }

    @PostMapping("/tb")
    @AppAuth(memo = "一楼贴标")
    @AppAuth(memo = "一楼贴标调用")
    public synchronized R tb(@RequestHeader(required = false) String appkey,
                               @RequestBody TbParam param,
                               HttpServletRequest request) {
@@ -68,6 +68,15 @@
        return openService.tb(param);
    }

    @PostMapping("/dd")
    @AppAuth(memo = "一楼打带调用")
    public synchronized R dd(@RequestHeader(required = false) String appkey,
                             @RequestBody TbParam param,
                             HttpServletRequest request) {
        auth(appkey, param, request);
        return openService.dd(param);
    }

    @PostMapping("/zxrk")
    @AppAuth(memo = "GWCS到达堆垛机入库站点请求ZWCS执行")
    public synchronized R crnExecute(@RequestHeader(required = false) String appkey,

 src/main/java/com/zy/asrs/entity/param/DdParam.java

New file
@@ -0,0 +1,22 @@
package com.zy.asrs.entity.param;

import lombok.Data;

/**
 * @author pang.jiabao
 * @description 打带返回数据
 * @createDate 2024/8/19 11:34
 */
@Data
public class DdParam {

    /**
     * 木箱位置
     */
    private String boxPos;

    /**
     * 木箱类型
     */
    private String boxType;
}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -36,6 +36,11 @@
    R tb(TbParam param);

    /**
     * 一楼打带调用
     */
    R dd(TbParam param);

    /**
     *GWMS到达目标站点请求ZWCS执行入库
     */
    String crnExecute(CrnExecuteParam param);

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

@@ -1084,6 +1084,7 @@

        for (Mat obj : list) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(obj);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setAnfme(1.0);
            // 重新定位木箱位置
@@ -1098,7 +1099,6 @@
                    break;
                }
            }
            wrkDetl.sync(obj);
            wrkDetl.setIoTime(now);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
@@ -1184,6 +1184,22 @@
    }

    @Override
    public R dd(TbParam param) {
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
        if (wrkDetls.isEmpty()) {
            return R.parse("无物料明细信息");
        }
        List<DdParam> collect = wrkDetls.stream().map(wrkDetl -> {
            DdParam ddParam = new DdParam();
            ddParam.setBoxPos(wrkDetl.getOrigin());
            ddParam.setBoxType(wrkDetl.getColor());
            return ddParam;
        }).distinct().collect(Collectors.toList());

        return R.ok(collect);
    }

    @Override
    @Transactional
    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {