feat: 部门退回/报废公用接口

cy

2023-12-01 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3

 consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java

@@ -761,7 +761,7 @@
                "   AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
                "   AND A.WAREHOUSE_ID = :WAREHOUSE_ID";

        List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getWarehouseId()));
        List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getOutWarehouseId()));
        for (Map _map : list) {
            SuperMap map = new SuperMap(_map);

@@ -792,8 +792,8 @@
                his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
                his.setInitialCount(result.getInitial_count());
                his.setEndCount(result.getEnd_count());
                his.setWarehouseId(scrapped.getWarehouseId());
                his.setWarehouseName(scrapped.getWarehouseName());
                his.setWarehouseId(scrapped.getOutWarehouseId());
                his.setWarehouseName(scrapped.getOutWarehouseName());
                his.setDepartmentId(scrapped.getDepartmentId());
                his.setDepartmentName(scrapped.getDepartmentName());
                insert(his);
@@ -804,14 +804,14 @@
                model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
                model.setScrappedCode(map.getString("SCRAPPED_CODE"));
                model.setScrappedName(map.getString("SCRAPPED_NAME"));
                model.setUsingGoodsHisId(his.getId());
                model.setDepFormScrappedId(scrapped.getId());
                model.setWhGoodsId(his.getWhGoodsId());
                model.setScrappedCounts(his.getThisCount());
                model.setInitCount(his.getInitialCount());
                model.setDepFormLendingModelId(his.getDepFormLendingModelId());
                model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
                model.setDepFormLendingId(his.getDepFormLendingId());
//                model.setUsingGoodsHisId(his.getId());
//                model.setDepFormScrappedId(scrapped.getId());
//                model.setWhGoodsId(his.getWhGoodsId());
//                model.setScrappedCounts(his.getThisCount());
//                model.setInitCount(his.getInitialCount());
//                model.setDepFormLendingModelId(his.getDepFormLendingModelId());
//                model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
//                model.setDepFormLendingId(his.getDepFormLendingId());
                insert(model);
            }
        }