#

Junjie

2024-08-17 b591d3396c94e0ca3496d2bac280d106438c75e9

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java

@@ -1,7 +1,7 @@
package com.zy.asrs.wms.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
@@ -21,10 +21,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
@RequestMapping("/api")
@@ -67,6 +64,14 @@
    }

    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @GetMapping("/locDetl/locId/{locId}")
    public R list(@PathVariable("locId") Long locId) {
        List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, locId));
        List<LocDetl> locDetls = locDetlService.parseLocDetl(list);
        return R.ok().add(locDetls);
    }

    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @GetMapping("/locDetl/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(locDetlService.getById(id));
@@ -104,7 +109,11 @@
    @PreAuthorize("hasAuthority('asrs:locDetl:update')")
    @OperationLog("修改库存明细")
    @PostMapping("/locDetl/update")
    public R update(@RequestBody LocDetl locDetl) {
    public R update(@RequestBody HashMap<String,Object> param) {
        LocDetl locDetl = JSON.parseObject(JSON.toJSONString(param), LocDetl.class, Feature.DisableCircularReferenceDetect);
        //设置扩展字段
        setLocDetlField(param, locDetl);

        if (!locDetlService.updateById(locDetl)) {
            return R.error("修改失败");
        }
@@ -138,7 +147,32 @@
    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(locDetlService.list(), LocDetl.class), response);
        List<LocDetl> locDetls = locDetlService.parseLocDetl(locDetlService.list());
        List<MatField> locFields = matFieldService.getLocFields();
        ExcelUtil.build(ExcelUtil.create(locDetls, LocDetl.class, locFields), response);
    }

    private void setLocDetlField(HashMap<String, Object> param, LocDetl locDetl) {
        //获取扩展字段
        List<MatField> matFields = matFieldService.list(new LambdaQueryWrapper<MatField>().eq(MatField::getFieldType, 1));
        for (MatField matField : matFields) {
            if (param.containsKey(matField.getName())) {
                LocDetlField fieldValue = locDetlFieldService.getOne(new LambdaQueryWrapper<LocDetlField>()
                        .eq(LocDetlField::getDetlId, locDetl.getId())
                        .eq(LocDetlField::getFieldId, matField.getId()));
                if (fieldValue == null) {
                    fieldValue = new LocDetlField();
                    fieldValue.setDetlId(locDetl.getId());
                    fieldValue.setFieldId(matField.getId());
                    fieldValue.setName(matField.getName());
                    fieldValue.setValue(param.get(matField.getName()).toString());
                    locDetlFieldService.save(fieldValue);
                }else {
                    fieldValue.setValue(param.get(matField.getName()).toString());
                    locDetlFieldService.updateById(fieldValue);
                }
            }
        }
    }

}