添加工厂判断逻辑及优化库位查找

zhangc

2024-12-25 aa3476e8ff45d168f0bb9376ed3a114610a65f12

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

@@ -1,22 +1,24 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.WrkMastDetlLog;
import com.zy.asrs.service.WrkMastDetlLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WrkMastDetlLog;
import com.zy.asrs.service.WrkMastDetlLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class WrkMastDetlLogController extends BaseController {
@@ -32,25 +34,49 @@

    @RequestMapping(value = "/wrkMastDetlLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(WrkMastDetlLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        wrapper.orderBy("io_time", false);
        return R.ok(wrkMastDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
        Page<WrkMastDetlLog> wrkMastDetlLogPage = wrkMastDetlLogService.selectPage(new Page<>(curr, limit), wrapper);
        List<WrkMastDetlLog> records = wrkMastDetlLogPage.getRecords();
        HashMap<String, Double> count = new HashMap<>();
        for (WrkMastDetlLog record : records) {
            String ioType = record.getIoType$();
            if (!Cools.isEmpty(ioType) && !"null".equalsIgnoreCase(ioType)) {
                if (!"53.拣料再入库".equalsIgnoreCase(ioType)) {
                    if ("103.拣料出库".equalsIgnoreCase(ioType)) {
                        ioType = "101.出库";
                    }
                    String[] split = ioType.split("\\.");
                    Double l = count.get(split[1]);
                    if (l == null) {
                        count.put(split[1], record.getAnfme());
                    } else {
                        count.put(split[1], l + record.getAnfme());
                    }
                }
            }
        }
        R ok = R.ok(wrkMastDetlLogPage);
        ok.put("count", count);
        return ok;
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -72,10 +98,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/wrkMastDetlLog/update/auth")
   @ManagerAuth
    public R update(WrkMastDetlLog wrkMastDetlLog){
        if (Cools.isEmpty(wrkMastDetlLog)){
    @RequestMapping(value = "/wrkMastDetlLog/update/auth")
    @ManagerAuth
    public R update(WrkMastDetlLog wrkMastDetlLog) {
        if (Cools.isEmpty(wrkMastDetlLog)) {
            return R.error();
        }
        wrkMastDetlLogService.updateById(wrkMastDetlLog);
@@ -84,8 +110,8 @@

    @RequestMapping(value = "/wrkMastDetlLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            wrkMastDetlLogService.deleteById(id);
        }
        return R.ok();
@@ -93,7 +119,7 @@

    @RequestMapping(value = "/wrkMastDetlLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastDetlLog"));
@@ -110,7 +136,7 @@
        wrapper.like("id", condition);
        Page<WrkMastDetlLog> page = wrkMastDetlLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (WrkMastDetlLog wrkMastDetlLog : page.getRecords()){
        for (WrkMastDetlLog wrkMastDetlLog : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", wrkMastDetlLog.getWrkNo());
            map.put("value", wrkMastDetlLog.getWrkNo());
@@ -123,7 +149,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<WrkMastDetlLog> wrapper = new EntityWrapper<WrkMastDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != wrkMastDetlLogService.selectOne(wrapper)){
        if (null != wrkMastDetlLogService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(WrkMastDetlLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();