#

Junjie

2024-05-23 b2e19766b381215527fb9b13e8cb46a0e68ccabf

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java

@@ -72,6 +72,7 @@
     * 堆垛机站点
     */
    @ApiModelProperty(value= "设备站点")
    @TableField("device_stn")
    private Integer deviceStn;

    /**

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java

@@ -325,7 +325,7 @@
            // 获取库位
            LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
            // 获取路径
            StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getDeviceStn, staNo).eq(StaDesc::getHostId, hostId));
            StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getStnNo, staNo).eq(StaDesc::getHostId, hostId));
            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
@@ -348,6 +348,7 @@
            wrkMast.setModiUser(String.valueOf(userId));
            wrkMast.setModiTime(now);
            wrkMast.setHostId(hostId);
            wrkMast.setCrnNo(staDesc.getDeviceNo());
            if (!wrkMastService.save(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());
            }
@@ -518,6 +519,14 @@
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }

        if (wrkMast.getIoType() == 300) {
            //RGV调度任务
            //删除工作档
            wrkMastService.removeById(wrkMast.getId());
            return;
        }

        String locNo = ""; // 待修改目标库位
        String locSts = ""; // 待修改目标库位状态
        // 入库取消（修改目标库位）