#

Administrator

2026-04-16 fce0a67f5dff3537194d52a8d0f26c4b7fb3dc90

#

 src/main/java/com/zy/api/controller/HmesApiController.java

@@ -117,6 +117,7 @@
    @ApiOperation("空桶/余料回库")
    @PostMapping("/work/back/loc")
    public R backLoc(@RequestBody HmesBackLocParams params) {
        log.info(JSONObject.toJSONString(params));
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }

 src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java

@@ -334,10 +334,10 @@

        WrkMast mast = findBackLocWrkMast(params);
        if (Objects.isNull(mast)) {
            return R.error("未查询到可回库的任务档");
            return R.error("已回库，请勿重复操作");
        }
        if (!Objects.equals(mast.getWrkSts(), 15L)) {
            return R.error("当前任务状态不能执行回库！");
            return R.error("当前任务状态不是15.出库更新完成,不能执行回库！");
        }

        workService.updateWrkIsSuplus(String.valueOf(mast.getWrkNo()), HMES_USER_ID, backType);

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -441,7 +441,7 @@
                        }
                        Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
                        if (!Cools.isEmpty(weight)) {
                            Double val = Math.round((weight - 2.5) * 10000) / 10000.0;
                            Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
                            //称重后，计算出真实长度
                            realQty = val * matnr.getVolume();
                            if (realQty<matnr.getSafeQty()){

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

@@ -1503,6 +1503,10 @@
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto locNo = commonService.getLocNo1(locMast1.getCrnNo());

        if(Cools.isEmpty(locNo)) {
            return R.error("没有空库位");
        }

        Date now = new Date();
        // 堆垛机站点(目标站)
        Integer staNo = staDesc.getCrnStn();

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -106,16 +106,16 @@
                    }
                    Integer crnNo = wrkMast.getCrnNo();
                    //如果任务是移库任务时：该堆垛机已经下发任务给wcs后不再下发新的搬运任务
                    if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
                        if (!Cools.isEmpty(locMast)) {
                            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", 12L,13L,14L));
                            if (!wrkMasts1.isEmpty()) {
                                continue;
                            }
                        }

                    }
//                    if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
//                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
//                        if (!Cools.isEmpty(locMast)) {
//                            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", 12L,13L,14L));
//                            if (!wrkMasts1.isEmpty()) {
//                                continue;
//                            }
//                        }
//
//                    }

                    //源库位为冻结库位时禁止下发搬运任务给堆垛机
                    if (!Cools.isEmpty(wrkMast.getSourceLocNo())) {

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

@@ -92,7 +92,7 @@
            String threeCode = param.getBarcode();
            param.setBarcode(barcode);
            //实际称重数量
            Double m = param.getWeight() -2.45;
            Double m = param.getWeight() -2.4;


            WrkMast wrkMast1 = wrkMastService.selectByBarcode(barcode);
@@ -135,16 +135,16 @@
                return R.error("物料已到达上限禁止入库");
            }
            //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
            Config config = configService.selectConfigByCode("SimulationInbound");
            if (config != null && config.getValue().equals("Y")) {
                WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
                if (Cools.isEmpty(waitPakin1)) {
                    WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
                    if (waitPakin != null) {
                        waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
                    }
                }
            }
//            Config config = configService.selectConfigByCode("SimulationInbound");
//            if (config != null && config.getValue().equals("Y")) {
//                WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
//                if (Cools.isEmpty(waitPakin1)) {
//                    WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
//                    if (waitPakin != null) {
//                        waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
//                    }
//                }
//            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());