From 92596fe28d064ad7b9897a44927498306a3f3c85 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 21 十二月 2023 08:51:34 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 132 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 125 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 81f7717..84fe873 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -13,6 +13,7 @@ import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.WrkDetlLogAllViewParam; import com.zy.asrs.entity.result.LocDetlAll; import com.zy.asrs.entity.result.LocDetlDTO; import com.zy.asrs.mapper.LocDetlMapper; @@ -26,7 +27,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.math.BigDecimal; import java.net.URLEncoder; +import java.time.LocalDate; import java.util.*; @RestController @@ -42,6 +45,14 @@ private MatService matService; @Autowired private ManLocDetlService manLocDetlService; + @RequestMapping(value = "/locDetl/list/barcode") + public R getBarcodeList(@RequestParam String barcode) { + List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", barcode)); + if (Cools.isEmpty(manLocDetls)){ + return R.error("鎵樼洏鐮佹暟鎹负绌�"); + } + return R.ok(manLocDetls); + } @RequestMapping(value = "/locDetl/update") public R update1() { @@ -268,6 +279,30 @@ } return R.ok().add(stockStatis); } + @RequestMapping(value = "/locDetl/ownerStatis/auth") + @ManagerAuth + public R statis2(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam Map<String, Object> param) { + + Object owner = param.get("owner"); + if (!Cools.isEmpty(owner)){ + LocOwner owner1 = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", owner.toString())); + + param.put("owner",owner1.getId()); + }else { + param.remove("owner"); + } + + Page<LocDetlAll> stockStatis = locDetlService.getOwnerStatisAll(toPage(curr, limit, param, LocDetlAll.class)); + for (LocDetlAll locDetlAll : stockStatis.getRecords()) { + Mat mat = matService.selectByMatnr(locDetlAll.getMatnr()); + if (mat != null) { + locDetlAll.sync(mat); + } + } + return R.ok().add(stockStatis); + } @Autowired private LocDetlMapper LocDetlMapper; @@ -338,22 +373,30 @@ @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ + Integer owner = null; + Integer payment = null; if (param.get("owner$") != null && param.get("owner$") != ""){ - LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$"))); + LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$"))); if(locOwner == null){ return R.error("鍙傛暟鏈夎锛�"); } param.remove("owner$"); - param.put("owner",locOwner.getId()); + owner = locOwner.getId(); + } + if (param.get("payment$") != null && param.get("payment$") != ""){ + if ( param.get("payment$").equals("浠撳偍") ){ + payment = 1; + } else if (param.get("payment$").equals("浠i噰")) { + payment = 0; + } + param.remove("payment$"); } LocDetlDTO locDetlDTO = new LocDetlDTO(); locDetlDTO.setPageSize(limit); locDetlDTO.setPageNumber(curr); String locNo = String.valueOf(param.get("locNo")); - String owner = String.valueOf(param.get("owner")); String matnr = String.valueOf(param.get("matnr")); - String payment = String.valueOf(param.get("payment")); if (!Cools.isEmpty(locNo) && !locNo.equals("null")) { locDetlDTO.setLocNo(locNo); } @@ -381,20 +424,20 @@ @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ + Integer owner = null; if (param.get("owner$") != null && param.get("owner$") != ""){ - LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$"))); + LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$"))); if(locOwner == null){ return R.error("鍙傛暟鏈夎锛�"); } param.remove("owner$"); - param.put("owner",locOwner.getId()); + owner = locOwner.getId(); } LocDetlDTO locDetlDTO = new LocDetlDTO(); locDetlDTO.setPageSize(limit); locDetlDTO.setPageNumber(curr); String locNo = String.valueOf(param.get("locNo")); - String owner = String.valueOf(param.get("owner")); String matnr = String.valueOf(param.get("matnr")); if (!Cools.isEmpty(locNo) && !locNo.equals("null")) { locDetlDTO.setLocNo(locNo); @@ -431,5 +474,80 @@ return R.ok("褰撳墠搴撲綅鏄┖搴撲綅"); } + @RequestMapping(value = "/asr/wrk/out/in/all/view/auth") + @ManagerAuth + public R outInAllView(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam Map<String, Object> param) { + excludeTrash(param); + if (!Cools.isEmpty(param.get("matnr"))){ + Page<WrkDetlLogAllViewParam> wrkDetlLogAllViewParamPageM = locDetlService.selectAllWrkDetlLogAllViewParamByMatnr(toPage(curr, limit, param, WrkDetlLogAllViewParam.class)); + return R.ok().add(wrkDetlLogAllViewParamPageM); + }else { + Page<WrkDetlLogAllViewParam> wrkDetlLogAllViewParamPage = locDetlService.selectAllWrkDetlLogAllViewParam(toPage(curr, limit, param, WrkDetlLogAllViewParam.class)); + return R.ok().add(wrkDetlLogAllViewParamPage); + } + } + + @RequestMapping(value = "/asr/wrk/out/in/all/count/view/auth") + @ManagerAuth + public R outInAllCountView(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam Map<String, Object> param) { + excludeTrash(param); + LocalDate localDate = LocalDate.now(); + int year = localDate.getYear(); + int month = localDate.getMonthValue(); + int day = localDate.getDayOfMonth(); + param.put("year",year); + param.put("month",month); + param.put("day",day); + param.put("kun","All"); + param.put("upDown","鍑哄簱"); + List<WrkDetlLogAllViewParam> excel = locDetlService.selectAllWrkDetlLogAllViewParamE(param); + Double a=0.0; + for (WrkDetlLogAllViewParam wrkDetlLogAllViewParam:excel + ) { + a=wrkDetlLogAllViewParam.getAnfme()+a; + } + + param.put("upDown","鍏ュ簱"); + List<WrkDetlLogAllViewParam> excel2 = locDetlService.selectAllWrkDetlLogAllViewParamE(param); + Double b=0.0; + for (WrkDetlLogAllViewParam wrkDetlLogAllViewParam:excel2 + ) { + b=wrkDetlLogAllViewParam.getAnfme()+b; + } + + Map<String, Object> map2 = new HashMap<>(); + map2.put("a", a); + map2.put("b", b); + + return R.ok(map2); + } + + @RequestMapping(value = "/asr/wrk/out/in/all/view/export") +// @ManagerAuth + public void outInAllExport(HttpServletResponse response, + @RequestParam Map<String, Object> param) throws IOException { + List<WrkDetlLogAllViewParam> excel = new ArrayList<>(); + excludeTrash(param); + param.put("kun","All"); + if (!Cools.isEmpty(param.get("matnr"))){ + excel = locDetlService.selectAllWrkDetlLogAllViewParamByMatnrE(param); + + }else { + excel = locDetlService.selectAllWrkDetlLogAllViewParamE(param); + + } + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + String fileName = URLEncoder.encode("鍑哄叆搴撴槑缁嗙粺璁�", "UTF-8"); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + EasyExcel.write(response.getOutputStream(), WrkDetlLogAllViewParam.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .sheet("琛�1") + .doWrite(excel); + } } -- Gitblit v1.9.1