From e4a7d5239f176c5cf5ba95b52c88366908d2ecfa Mon Sep 17 00:00:00 2001 From: L <L@123> Date: 星期三, 16 七月 2025 15:30:00 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 2f91219..feda529 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -13,9 +13,11 @@ import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.LocDetl; +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.ManLocDetlService; import com.zy.asrs.service.MatService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +33,7 @@ @Autowired private LocDetlService locDetlService; + @Autowired private LocDetlMapper locDetlMapper; @Autowired @@ -80,10 +83,14 @@ param.remove("modi_time"); } } - return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); + Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)); + if (stockOut.getRecords().size()==0){ + stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class)); + } + return R.ok(stockOut); } - @RequestMapping(value = "/locDetl/list/auth") + @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂 @ManagerAuth public R list(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @@ -113,6 +120,7 @@ // } return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper)); } + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ @@ -145,12 +153,18 @@ @RequestMapping(value = "/locDetl/update/auth") @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼") public R update(LocDetl locDetl){ - if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){ + if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){ return R.error(); } - locDetl.setModiUser(getUserId()); - locDetl.setModiTime(new Date()); - locDetlService.updateById(locDetl); + LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch())); + if (Cools.isEmpty(locDetl1) ){ + return R.error(); + } + locDetl1.setModiUser(getUserId()); + locDetl1.setModiTime(new Date()); + locDetl1.setDanger(locDetl.getDanger()); + locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch())); +// locDetlService.updateById(locDetl1); return R.ok(); } -- Gitblit v1.9.1