# 调拨单同步锁

whycq

2024-05-29 f1a1915b575c435f7172fdb59d48e13726ff4ff0

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

@@ -41,6 +41,8 @@
    private AgvLocDetlService agvLocDetlService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;
    @Autowired
    private AgvWrkDetlService agvWrkDetlService;


    /*
@@ -62,7 +64,7 @@
    }

    /*
    绑定托盘条码与暂存位
    绑定货架条码与暂存位
     */
    @PostMapping("/combBinging/auth")
    public R combBinding(@RequestBody Map<String,Object> map){
@@ -70,7 +72,7 @@
        String stationCode = map.get("stationCode").toString();
        Short containerType = Short.valueOf(barcode.substring(0,2));
        agvMobileService.combBinding(barcode,stationCode,containerType);
        return R.ok("托盘绑定站点成功");
        return R.ok("货架绑定站点成功");
    }

    /*
@@ -116,6 +118,7 @@
    @PostMapping("/start/pakin/auth")
    @Synchronized
    @Transactional
    @ManagerAuth(memo = "启动入库")
    public R startPakin(@RequestBody AgvMobileStartPakin params){
        // 组托
        params.getCombParams().forEach(combParam -> {
@@ -132,6 +135,7 @@
     */
    @PostMapping("/pakin/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板入库")
    public R pakinEmpty(@RequestBody AgvMobileStartParam params){

        for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -147,6 +151,7 @@
     */
    @PostMapping("/pakout/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板出库")
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params){

        for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -157,7 +162,7 @@
    }

    /*
    空板出库容器码选择
    空板出库货架码选择
     */
    @PostMapping("/pakout/empty/container/selector/auth")
    public R containerType(@RequestBody HashMap<String,String> params){
@@ -213,6 +218,8 @@
    盘点接口
     */
    @PostMapping("/check/detl/v1")
    @ManagerAuth(memo = "库存盘点")
    @Synchronized
    public R checkLocDetl(@RequestBody HashMap<String,String> param){

        String locNo = param.get("locNo");
@@ -240,6 +247,8 @@
    盘点库位错乱维护接口
     */
    @PostMapping("/update/detl/v1")
    @ManagerAuth(memo = "纠正库位")
    @Synchronized
    public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
        String locNo = param.get("locNo");
        String containerCode = param.get("containerCode");
@@ -321,7 +330,7 @@
        }

        if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
            return R.ok("该库位与容器库存一致，无需维护");
            return R.ok("该库位与货架库存一致，无需维护");
        }


@@ -362,6 +371,7 @@
    @PostMapping("/agv/v1/locMove")
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    @Synchronized
    public R agvLocMove(@RequestBody HashMap<String,Object> params){
        String fl = String.valueOf(params.get("floor"));
        short floor =(short)Integer.parseInt(fl.substring(0, 1));
@@ -398,6 +408,7 @@
    @PostMapping("/agv/v2/locMove")
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    @Synchronized
    public R agvLocMove2(@RequestBody HashMap<String,Object> params){
        Date now = new Date();
        String fl = String.valueOf(params.get("floor"));
@@ -416,36 +427,27 @@
        }
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
            String barcode = map.get("barcode");
            //生成工作档
            AgvWrkMast mast = new AgvWrkMast();
            //工作状态
            mast.setWrkSts(22L);
            //入出库类型
            mast.setIoType(ioType);
            mast.setIoTime(now);
            //优先级
            mast.setIoPri(300.0);
            //源站点
            mast.setSourceLocNo(locNo);
            //目标站点
            mast.setLocNo("");
            //容器编码
            mast.setBarcode(barcode);
            //容器类型
            mast.setWhsType(30);
            // 目标楼层
            mast.setCrnNo(floor);
            mast.setAppeUser(getUserId());
            mast.setAppeTime(now);
            mast.setModiUser(getUserId());
            mast.setModiTime(now);
            if (!agvWrkMastService.insertByIncrease(mast)) {
                throw new CoolException("保存工作档失败");
            String barcode = map.get("suppCode");
            AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
            if (!Cools.isEmpty(source_loc_no)) {
                throw new CoolException("当前库位已生成任务！");
            }
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                AgvWrkDetl wrkDetl = new AgvWrkDetl();
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.sync(agvLocDetl);
                wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
                wrkDetl.setIoTime(now);
                wrkDetl.setAppeUser(getUserId());
                wrkDetl.setAppeTime(now);
                wrkDetl.setModiUser(getUserId());
                wrkDetl.setModiTime(now);
                if (!agvWrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作明细失败");
                }
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
@@ -454,7 +456,9 @@
                }
            }
            // 更新源库位

            AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
            locMast.setLocSts("R");
            agvLocMastService.updateById(locMast);
        }
        return R.ok();
    }
@@ -462,6 +466,7 @@
    @PostMapping("/hand/control/locMove")
    @Transactional
    @ManagerAuth(memo = "手动库位转移")
    @Synchronized
    public R handControlLocMove(@RequestBody LocMoveParam param){
        agvMobileService.handControlLocMove(param, getUserId());
        return R.ok();
@@ -470,6 +475,7 @@
    @PostMapping("/hand/control/allocationOut")
    @Transactional
    @ManagerAuth(memo = "调拨离场")
    @Synchronized
    public R allocationOut(@RequestBody AgvMobileStartPakin param){
        agvMobileService.allocationOut(param, getUserId());
        return R.ok();
@@ -478,8 +484,27 @@
    @PostMapping("/hand/control/allocationIn")
    @Transactional
    @ManagerAuth(memo = "调拨进场")
    @Synchronized
    public R allocationIn(@RequestBody AgvMobileStartPakin param){
        agvMobileService.allocationIn(param, getUserId());
        return R.ok();
    }

    @PostMapping("/hand/control/doBack")
    @Transactional
    @ManagerAuth(memo = "站点回退")
    @Synchronized
    public R doBack(@RequestBody AgvMobileStartPakin param){
        agvMobileService.doBack(param, getUserId());
        return R.ok();
    }

    @PostMapping("/hand/control/handBack")
    @Transactional
    @ManagerAuth(memo = "转手动回流")
    @Synchronized
    public R handBack(@RequestBody AgvMobileStartPakin param){
        agvMobileService.handBack(param, getUserId());
        return R.ok();
    }

@@ -501,5 +526,41 @@

        System.out.println(agvLocDetls22.equals(agvLocDetls2));
    }
    /*
   生成工作档
    */
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType,int floor){
        AgvWrkMast wrkMast = new AgvWrkMast();
        //工作状态
        wrkMast.setWrkSts(wrkSts);
        //入出库类型
        wrkMast.setIoType(ioType);
        wrkMast.setIoTime(now);
        //优先级
        wrkMast.setIoPri(300.0);
        //源站点
        wrkMast.setSourceLocNo(sourceLocNo);
        //目标站点
        wrkMast.setLocNo(locNo);
        //货架编码
        wrkMast.setBarcode(barcode);
        //货架类型
        wrkMast.setWhsType(containerType);
        // 目标楼层
        wrkMast.setCrnNo(floor);

        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);

        if (!agvWrkMastService.insertByIncrease(wrkMast)) {
            throw new CoolException("保存工作档失败");
        }

        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));

        return wrkMast;
    }

}