#修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复

skyouc

6 天以前 014270352f8e19b51bbb4367ae2ff256050a30a2

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java

@@ -37,36 +37,36 @@
public class OutStockItemController extends BaseController {

    @Autowired
    private OutStockItemService asnOrderItemService;
    private OutStockItemService outStockItemService;

    @Autowired
    private CompanysService companysService;

//    @PreAuthorize("hasAuthority('manager:outStockItem:list')")
//    @ApiOperation("分页获取列表")
//    @PostMapping("/outStockItem/page")
//    public R page(@RequestBody Map<String, Object> map) {
//        BaseParam baseParam = buildParam(map, BaseParam.class);
//        PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
//        return R.ok().add(asnOrderItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
//    }
    @PreAuthorize("hasAuthority('manager:outStockItem:list')")
    @ApiOperation("分页获取列表")
    @PostMapping("/outStockItem/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
        return R.ok().add(outStockItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:outStockItem:list')")
    @PostMapping("/outStockItem/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(asnOrderItemService.list());
        return R.ok().add(outStockItemService.list());
    }

    @PreAuthorize("hasAuthority('manager:outStockItem:list')")
    @PostMapping({"/outStockItem/many/{ids}", "/outStockItems/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(asnOrderItemService.listByIds(Arrays.asList(ids)));
        return R.ok().add(outStockItemService.listByIds(Arrays.asList(ids)));
    }

    @PreAuthorize("hasAuthority('manager:outStockItem:list')")
    @GetMapping("/outStockItem/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(asnOrderItemService.getById(id));
        return R.ok().add(outStockItemService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:outStockItem:save')")
@@ -79,7 +79,7 @@
        params.put("createBy", getLoginUserId());
        params.put("updateBy", getLoginUserId());

        if (!asnOrderItemService.fieldsSave(params)) {
        if (!outStockItemService.fieldsSave(params)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success");
@@ -100,7 +100,7 @@
                asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
            }
        }
        if (!asnOrderItemService.updateById(asnOrderItem)) {
        if (!outStockItemService.updateById(asnOrderItem)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(asnOrderItem);
@@ -110,7 +110,7 @@
    @OperationLog("Delete 出库单明细")
    @PostMapping("/outStockItem/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!asnOrderItemService.removeByIds(Arrays.asList(ids))) {
        if (!outStockItemService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
@@ -124,7 +124,7 @@
        if (!Cools.isEmpty(condition)) {
            wrapper.like(AsnOrderItem::getId, condition);
        }
        asnOrderItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
        outStockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
@@ -138,14 +138,14 @@
        if (!Objects.isNull(map.get("ids"))) {
            List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
            if (!ids.isEmpty()) {
                orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                        .in(AsnOrderItem::getId, ids)
                        .eq(AsnOrderItem::getStatus, 1));
            } else {
                orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
                orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
            }
        } else {
            orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
            orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
        }

        ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
@@ -164,7 +164,7 @@
            R.error("文件不能为空！！");
        }
        HashMap<String, Object> hashMap = new HashMap<>();
        return asnOrderItemService.excelImport(file, hashMap, getLoginUserId());
        return outStockItemService.excelImport(file, hashMap, getLoginUserId());
    }

    /**