#

18516761980

2022-04-07 ae5928177e910e882ba37a953bcd52ae503f8c30

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

@@ -11,7 +11,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,9 @@

    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocMastService locMastService;

    @RequestMapping(value = "/locDetl/update")
    public R update1() {
@@ -58,6 +63,7 @@
    @ManagerAuth
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
//                          @RequestParam(required = false)String condition,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
@@ -104,6 +110,34 @@
        }
    }


    @RequestMapping(value = "/locDetl/list/sts")
    @ManagerAuth
    public R stsList(@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){
        excludeTrash(param);
        String value= null;
        for (String s : param.keySet()) {
            value= (String) param.get(s);
        }
        LocMast loc_no = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", value));
        if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("D")||loc_no.getLocSts().equals("F")){
            EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
            convert(param, wrapper);
            allLike(LocDetl.class, param.keySet(), wrapper, condition);
            if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
            return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
        }else {
            return R.error("该库位当前状态不能调整");
        }
    }



    @RequestMapping(value = "/locDetl/add/auth")
    @ManagerAuth(memo = "库位明细添加")
    public R add(LocDetl locDetl) {