Merge remote-tracking branch 'origin/wms-dev' into wms-dev

ZY

2024-08-16 57e23c353a177b9c003a2f524a2adeaf641e2e4c

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

@@ -7,6 +7,7 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.mapper.LocDetlMapper;
import com.zy.asrs.wms.asrs.service.LocDetlFieldService;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.common.annotation.OperationLog;
@@ -33,6 +34,8 @@
    private MatFieldService matFieldService;
    @Autowired
    private LocDetlFieldService locDetlFieldService;



    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/page")
@@ -147,7 +150,9 @@
    @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) {