#增加堆垛机12物料衔接类型

lty

2 天以前 2c799e6d26c726e3943f24e61c84f7d562087cfc

#增加堆垛机12物料衔接类型

 license.lic

Binary files differ

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

@@ -199,6 +199,14 @@
        return R.ok("组托成功");
    }

    @RequestMapping("/combAuto/auth")
    @ManagerAuth(memo = "组托")
    public R combAuto(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/kitting/query/auth")
    @ManagerAuth(memo = "齐套入库查询")
    public R kittingQuery(@RequestBody CombParam combParam){

 src/main/java/com/zy/asrs/entity/TransplantWork.java

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

import lombok.Data;

@Data
public class TransplantWork {
    private Integer workNo;
    private String barcode;
    private Integer sourceStaNo;
    private Integer staNo;
}

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -21,6 +21,8 @@
    @Select("select count(1) from asr_wrk_mast where 1=1 and io_type = #{ioType} and sta_no = #{staNo}")
    int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);

    WrkMast selectWrkMast(Integer workNo,String barcode);

    List<WrkMast> selectWrkMastWrkDetl(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("brand") String brand
            , @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
            , @Param("boxType1")String boxType1, @Param("boxType2")String boxType2, @Param("boxType3")String boxType3, @Param("crnNo") Integer crnNo);

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

@@ -27,4 +27,6 @@

    List<WrkMast> selectWrkMastWrkDetl(Integer ioType, FindLocNoAttributeVo findLocNoAttributeVo, Integer crnNo);

    WrkMast selectWrkMast(Integer workNo,String barcode);

}

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

@@ -58,4 +58,9 @@
                ,findLocNoAttributeVo.getBoxType1(),findLocNoAttributeVo.getBoxType2(),findLocNoAttributeVo.getBoxType3()
                ,crnNo);
    }

    @Override
    public WrkMast selectWrkMast(Integer workNo, String barcode) {
        return this.baseMapper.selectWrkMast(workNo, barcode);
    }
}

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -424,7 +424,7 @@
        Date now = new Date();
        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
        try {
            if (null == locMast) {
            if (null == locMast && wrkMast.getIoType() !=12) {
//                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg("工作档库位号错误; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -532,6 +532,9 @@
                        }
                    }
                    break;
                //3号堆垛机衔接
                case 12:
                    break;
                default:
                    break;
            }

 src/main/java/com/zy/common/web/WcsController.java

@@ -155,6 +155,53 @@
        return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
    }


    @PostMapping("/auto/Transplanting/v1")
    @ResponseBody
    public R autoTransplanting(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
        if(wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode()) == null){
            return  R.error("无该盘点移栽任务");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
        Date now = new Date();
        int workNo = commonService.getWorkNo(2);

        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L);
        wrkMast.setIoPri(14D);
        wrkMast.setIoType(12);
        wrkMast.setCrnNo(3);
        wrkMast.setBarcode(transplantWork.getBarcode());
        wrkMast.setSourceStaNo(transplantWork.getSourceStaNo());
        wrkMast.setStaNo(transplantWork.getStaNo());
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setMemo("自动3号堆垛机移栽");
        for (WrkDetl item : wrkDetls) {
            WrkDetl newDetl = new WrkDetl();
            newDetl.sync(item); // 假设 sync 是深拷贝属性
            newDetl.setWrkNo(wrkMast.getWrkNo());
            newDetl.setIoTime(wrkMast.getIoTime());
            newDetl.setAppeTime(now);
            newDetl.setModiTime(now);
            if (!wrkDetlService.insert(newDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }
        return wrkMastService.insert(wrkMast) ? R.ok("自动3号堆垛机移栽成功,工作号:"+wrkMast.getWrkNo()) : R.error("生成自动3号堆垛机移栽失败");
    }

    /**
     * 全板入库
     */
@@ -163,10 +210,10 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
//        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
//        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
//        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();

 src/main/resources/mapper/WrkMastMapper.xml

@@ -75,6 +75,12 @@
        order by io_time,wrk_no asc
    </select>

    <select id="selectWrkMast" resultMap="BaseResultMap">
        select top 1 *
        from asr_wrk_mast
        where wrk_no = #{workNo} and barcode = #{barcode}
    </select>

    <select id="selectWrkMastWrkDetl" resultMap="BaseResultMap">
        select m.* from asr_wrk_mast m,asr_wrk_detl d
        where 1=1