Changes

mrzhssss

2022-04-11 d2adac4e369165ec523c23e7ffd19fc5775d43b5

 src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java

@@ -40,7 +40,7 @@
        return R.ok(receiveDetlService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/receiveDetl/list/auth")
    @RequestMapping(value ="/receiveDetl/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
@@ -48,10 +48,11 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<ReceiveDetl> wrapper = new EntityWrapper<>();
        param.values();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper));
        return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper.orderBy("id",false)));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -141,7 +142,7 @@
        /**
         * 控管与数据初始化
         */
        if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getBatch(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
        if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
            return R.error("输入数据有误,请重新输入");
        }
        Date date = new Date();
@@ -153,8 +154,6 @@
        }
        Node targetLoc = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("id", putShelfDTO.getSelect()));


        /**
         * 更新库存
         */
@@ -190,10 +189,43 @@

        ReceiveDetl targetRece = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>()
                .eq("id", putShelfDTO.getId()));
        targetRece.setInQty((int) (targetRece.getInQty() + remain));
        targetRece.setInQty((targetRece.getInQty() + remain));
        receiveDetlService.update(targetRece,new EntityWrapper<ReceiveDetl>()
                .eq("id",targetRece.getId()));
        /**
         * 反写订单状态
         */
        if(!Cools.isEmpty(putShelfDTO.getOrderNo())){
            List<ReceiveDetl> list = receiveDetlService.selectList(new EntityWrapper<ReceiveDetl>().eq("order_no",putShelfDTO.getOrderNo()));
            boolean flag = true;

            if(list.size()>0){
                for (ReceiveDetl receiveDetl : list){
                    if(receiveDetl.getInQty() < receiveDetl.getCount()){
                        flag = false;
                        break;
                    }
                }
            }

            if(flag){
                Receive receive = receiveService.selectOne(new EntityWrapper<Receive>().eq("order_no",putShelfDTO.getOrderNo()));
                receive.setSettle(Long.valueOf(4));
                receiveService.updateById(receive);
            }
//            ReceiveDetl receiveDetl = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>().eq("order_no",putShelfDTO.getOrderNo()).eq("matnr",putShelfDTO.getMatnr()));
//            for(int i=0;i<list.size();i++){
//                if(list.get(i).getMatnr().equals(receiveDetl.getMatnr())){
//                    if(list.get(i).getInQty()>=list.get(i).getCount()){
//                        Receive receive = receiveService.selectOne(new EntityWrapper<Receive>().eq("order_no",putShelfDTO.getOrderNo()));
//                        receive.setSettle(Long.valueOf(4));
//                        receiveService.updateById(receive);
//                        break;
//                    }
//                }
//            }

        }
        /**
         * 上架完成之后,存放数据至上架统计表 man_receive_log
         */
@@ -241,7 +273,7 @@
                .eq("matnr", receiveDetl.getMatnr())
                .eq("batch", receiveDetl.getBatch())
                .eq("io_type", 1));
        if (!Cools.isEmpty(receiveLogs)) {
        if (Cools.isEmpty(receiveLogs)) {
            return R.error("找不到入库记录");
        }
        for (ReceiveLog receiveLog : receiveLogs) {
@@ -258,14 +290,11 @@
        /**
         * 反写回入库档
         */
        receiveDetl.setInQty(0);
        receiveDetl.setInQty(0.0);
        receiveDetl.setUpdateTime(new Date());
        receiveDetl.setUpdateBy(getUserId());
        receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
                .eq("id",receiveDetl.getId()));



        return R.ok("撤回成功");
    }