自动化立体仓库 - WMS系统
pang.jiabao
1 天以前 4725ab4c1f4d0560097ae3469a42de23eb459056
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -17,12 +17,10 @@
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -67,6 +65,9 @@
        excludeTrash(param);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if(!Cools.isEmpty(param.get("loc_sts")) && param.get("loc_sts").equals("D")) {
            wrapper.last("ORDER BY CASE WHEN row1 IN (2,3,6,7) THEN 1 WHEN row1 IN (1,4,5,8) THEN 2 ELSE 3 END, row1 ASC");
        }
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }