#平库下架

zjj

2023-11-07 beb2ef6184aa6eeef9e9605e7625dec6638d30b1

#平库下架

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

@@ -386,7 +386,7 @@
    }

    @RequestMapping("/manDetl/in/origin")
    @ManagerAuth(memo = "订单上架(托盘码)")
    @ManagerAuth(memo = "平库上架")
    public R manDetlin(@RequestBody JSONObject json){
        if (json == null){
            return R.error("传入数据为空");
@@ -394,5 +394,14 @@
        return mobileService.manDetlOrigin(json,getUser());
    }

    @RequestMapping("/manDetl/out/origin")
    @ManagerAuth(memo = "平库下架")
    public R manDetlout(@RequestBody JSONObject json){
        if (json == null){
            return R.error("传入数据为空");
        }
        return mobileService.manDetlOriginOut(json,getUser());
    }


}

 src/main/java/com/zy/asrs/service/MobileService.java

@@ -50,4 +50,6 @@
    R adjustNew(MobileAdjustNewParam combParam, Long userId);

    R manDetlOrigin(JSONObject json, User user);

    R manDetlOriginOut(JSONObject json, User user);
}

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

@@ -984,31 +984,73 @@
            if (Cools.isEmpty(node)){
                return R.error("未查询到库位信息");
            }
            Date now = new Date();
            ManLocDetl manLocDetl = new ManLocDetl();  //初始化库存实体类
            manLocDetl.setLocNo(node.getName());
            manLocDetl.setNodeId(node.getId());
//            manLocDetl.setZpallet(waitPakin.getZpallet());
            manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
            manLocDetl.setMatnr(jsonOriginDetl.getMatnr());
            manLocDetl.setMaktx(code);
            manLocDetl.setWeight(Double.valueOf( weight));
            manLocDetl.setUnit(date);
            manLocDetl.setStatus(1);
            manLocDetl.setCreateBy(user.getId());
            manLocDetl.setCreateTime(now);
            manLocDetl.setUpdateBy(user.getId());
            manLocDetl.setModiTime(now);
           // manLocDetl.setOrderNo(waitPakin.getOrderNo());
            manLocDetl.setStockFreeze(1);
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
            ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
            if(!Cools.isEmpty(manLocDetl1)){
                BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
                BigDecimal anfme = BigDecimal.valueOf(manLocDetl1.getAnfme());

            if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
                return R.error("物料信息入库失败");
                BigDecimal sum = anfme.add(inAnfme);
                manLocDetl1.setAnfme(sum.doubleValue());
                if (!manLocDetlService.update(manLocDetl1,manLocDetlWrapper)) {
                    return R.error("物料信息上架失败");
                }

            }else {
                Date now = new Date();
                ManLocDetl manLocDetl = new ManLocDetl();  //初始化库存实体类
                manLocDetl.setLocNo(node.getName());
                manLocDetl.setNodeId(node.getId());
//            manLocDetl.setZpallet(waitPakin.getZpallet());
                manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
                manLocDetl.setMatnr(jsonOriginDetl.getMatnr());
                manLocDetl.setMaktx(code);
                manLocDetl.setWeight(Double.valueOf( weight));
                manLocDetl.setUnit(date);
                manLocDetl.setCustName(jsonOriginDetl.getOrigin());
                manLocDetl.setStatus(1);
                manLocDetl.setCreateBy(user.getId());
                manLocDetl.setCreateTime(now);
                manLocDetl.setUpdateBy(user.getId());
                manLocDetl.setModiTime(now);
                // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                manLocDetl.setStockFreeze(1);

                if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
                    return R.error("物料信息入库失败");
                }
            }

        }
        return R.ok();
    }

    @Override
    public R manDetlOriginOut(JSONObject json, User user) {
        String jsonLocNo = (String) json.get("locNo"); //获取库位码

        JSONArray combMats = json.getJSONArray("combMats");
        for (int i = 0; i < combMats.size(); i++) {
            DetlOriginDTO jsonOriginDetl = combMats.getObject(i, DetlOriginDTO.class);
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
            ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
            BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
            BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());

            if (manLocDetl.getAnfme() > jsonOriginDetl.getAnfme()){
                BigDecimal num = anfme.subtract(outAnfme);
                manLocDetl.setAnfme(num.doubleValue());


                if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
                    return R.error("物料信息下架失败");
                }

            }else if (manLocDetl.getAnfme().equals(jsonOriginDetl.getAnfme())) {
                if (!manLocDetlService.delete(manLocDetlWrapper)) {
                    return R.error("物料信息删除失败");
                }
            }


        }