#

whycq

2024-05-31 0fb180ce609b9a045dacc409975527b7728640fa

#

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

@@ -259,7 +259,7 @@
    拣料/盘点入库
     */
    @RequestMapping(value = "/basDevp/visualized/container/pickIn")
    @ManagerAuth(memo = "再次拣料")
    @ManagerAuth(memo = "已拣料回库")
    public R visualiZedPickIn(@RequestBody Map<String,Object> map){
        List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
        String devNo = map.get("devNo").toString();
@@ -271,11 +271,14 @@
            }
            agvWrkMast.setLocNo(devNo);
            agvWrkMastList.add(agvWrkMast);
            agvWorkService.pickIn(agvWrkMastList);
        } else {
            return R.error("查不到拣料出库任务");
        }

        agvWorkService.pickIn(agvWrkMastList);

        return R.ok("生成拣料出库任务成功");

        return R.ok("生成拣料回库任务成功");
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){

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

@@ -170,6 +170,7 @@
        } else {
            AgvLocDetl agvLocDetl = this.selectOne(wrapper);
            agvLocDetl.setAnfme(anfme);
            agvLocDetl.setModiTime(new Date());
            return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0;
        }
    }

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

@@ -209,20 +209,20 @@
            //List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo()));
            AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo());

            //拣料入库
            if(ioType == 53){
                //修改工作党明细
                //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                //agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
                //修改库存信息
                agvWrkDetlList.forEach(agvWrkDetl -> {
                    AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());

                    //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                    double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
                    agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
                });
            }
            ////拣料入库
            //if(ioType == 53){
            //    //修改工作党明细
            //    //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
            //    //agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
            //    //修改库存信息
            //    agvWrkDetlList.forEach(agvWrkDetl -> {
            //        AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
            //
            //        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
            //        double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
            //        agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
            //    });
            //}
            //修改库位信息
            updateAgvLocMast(agvLocMast,"Q");
            //修改站点信息
@@ -563,6 +563,11 @@
        //修改AGV工作档的工作状态为205.工作完成
        //agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);

        //if (wrkMast.getIoType() == 101) {
        //    agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"手动完成",userId);
        //} else {
        //    agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
        //}
        agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);

        //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
@@ -784,6 +789,7 @@
     */
    private void updateAgvLocMast(AgvLocMast locMast, String locSts){
        locMast.setLocSts(locSts);
        locMast.setModiTime(new Date());
        agvLocMastService.updateById(locMast);
    }

@@ -793,6 +799,7 @@
    private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type){
        locMast.setLocSts(locSts);
        locMast.setLocType2(type);
        locMast.setModiTime(new Date());
        agvLocMastService.updateById(locMast);
    }


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

@@ -168,6 +168,22 @@
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
                    break;
                case 53:
                    //修改工作党明细
                    //修改库存信息
                    List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                    agvWrkDetlList.forEach(agvWrkDetl -> {
                        AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                        if (!Cools.isEmpty(agvLocDetl)) {
                            double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
                            agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
                        }
                        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());

                    });
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
                    break;
                default:
                    return null;
            }

 src/main/java/com/zy/common/config/AspectConfig.java

@@ -49,9 +49,9 @@
            "||@within(org.springframework.stereotype.Controller)")
    public Object after(ProceedingJoinPoint joinPoint) throws Throwable{
        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
        if(requestAttributes != null){
            return joinPoint.proceed();
        }
        //if(requestAttributes != null){
        //    return joinPoint.proceed();
        //}
        HttpServletRequest request = requestAttributes.getRequest();
        long start = System.currentTimeMillis();
        Object result = joinPoint.proceed(joinPoint.getArgs());