完善出入库日志记录

pang.jiabao

2024-02-28 a8ab542c3f3bbb304f6fd7e66897433df65a2b3e

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

@@ -55,6 +55,12 @@
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<Pla> wrapper = new EntityWrapper<>();

        if(!Cools.isEmpty(param.get("brand"))){
            wrapper.eq("brand",param.get("brand"));
            param.remove("brand");
        }

        convert(param, wrapper);
        wrapper.orderBy("modify_time",false);
        allLike(Pla.class, param.keySet(), wrapper, condition);
@@ -198,7 +204,8 @@
            pla.setModifyTime(new Date());
            pla.setWeightAnfme(0.0);
            plaService.updateById(pla);
            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),anfme,getUser().getUsername());
            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
        });

        return R.ok();
@@ -263,6 +270,17 @@
        return R.ok(result);
    }

    @RequestMapping(value = "/pla/statis/auth")
    @ManagerAuth
    public R statis(@RequestParam(defaultValue = "1")Integer curr,
                    @RequestParam(defaultValue = "10")Integer limit,
                    @RequestParam Map<String, Object> param) {

        Page<Pla> stockStatis = plaService.getStockStatisAll(toPage(curr, limit, param, Pla.class));

        return R.ok().add(stockStatis);
    }

    /**
     * excel导入模板下载
     */
@@ -288,7 +306,8 @@
        try {
            EasyExcel.read(file.getInputStream(), PlaExcel.class, listener).sheet().doRead();
        }catch (Exception e){
            throw new CoolException("导入的数据格式错误，原因：" + e.getMessage());
            e.printStackTrace();
            throw new CoolException("导入的数据格式错误，原因：" + e.getMessage() + "，第" + listener.getIndex() + "，数据格式不对");
        }
        return R.ok("成功同步"+listener.getTotal()+"条pla物料数据");
    }
@@ -332,7 +351,7 @@
        manPakOut.setMaktx(plaQty.getBrand());
        manPakOut.setLocNo(plaQty.getLocNo());
        manPakOut.setBatch(plaQty.getBatch());
        manPakOut.setBarcode(plaQty.getPackageNo());
        manPakOut.setBarcode(plaQty.getPackageNo() + "");
        manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
        manPakOut.setCreateTime(new Date());
        manPakOut.setUpdateTime(new Date());
@@ -341,6 +360,7 @@
        manPakOut.setStatus(0);
        manPakOut.setDocId(plaQty.getOrderDetlId());
        manPakOut.setNodeId(plaQty.getId());
        manPakOut.setCustName(plaQty.getCustomer());
        //manPakOut.setNodeId(plaQty.getOrderDetlId());
        manPakOutService.insert(manPakOut);
        return R.ok();