#删除uuid

zjj

2023-06-09 3e015fc9d05c451d34fd33e846349d4b2bd7b600

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

@@ -13,10 +13,12 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
@@ -33,7 +35,8 @@

    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocOwnerService locOwnerService;
    @Autowired
    private LocDetlMapper locDetlMapper;
    @Autowired
@@ -83,7 +86,7 @@
                param.remove("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"2"));
    }

    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
@@ -281,4 +284,33 @@
        return R.ok(sum);
    }


    @RequestMapping(value = "/turn/over/list/auth")
    @ManagerAuth
    public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("modi_time");
            }
        }
        if (!Cools.isEmpty(param.get("owner"))){
            List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<LocOwner>().eq("owner", param.get("owner")));
            if (Cools.isEmpty(locOwners) || locOwners.size()>1){
                return R.error();
            }else {
                param.remove("owner");
                param.put("owner", locOwners.get(0).getId());
            }
        }

        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"1"));
    }


}