From 6254aca8f1ad7c36b0c9875f99b195dda6edc92f Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期五, 05 一月 2024 08:10:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MatController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java index 3e12304..7e09475 100644 --- a/src/main/java/com/zy/asrs/controller/MatController.java +++ b/src/main/java/com/zy/asrs/controller/MatController.java @@ -10,11 +10,14 @@ import com.core.annotations.ManagerAuth; import com.core.common.*; import com.core.exception.CoolException; +import com.zy.asrs.entity.ManPakOut; import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.MatPrint; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.result.KeyValueVo; +import com.zy.asrs.service.ManPakOutService; import com.zy.asrs.service.MatService; +import com.zy.asrs.service.OrderDetlService; import com.zy.asrs.utils.MatExcelListener; import com.zy.common.CodeRes; import com.zy.common.config.AdminInterceptor; @@ -40,7 +43,11 @@ @Autowired private MatService matService; @Autowired + private OrderDetlService orderDetlService; + @Autowired private SnowflakeIdWorker snowflakeIdWorker; + @Autowired + private ManPakOutService manPakOutService; @RequestMapping(value = "/mat/auto/matnr/auth") public R autoMatnr(){ @@ -57,6 +64,7 @@ return R.ok().add(mats); } + @RequestMapping(value = "/mat/search/pda/auth") @ManagerAuth public R pdaSearch(@RequestParam(required = false)String condition){ @@ -67,6 +75,16 @@ wrapper.orderBy("create_time", false); List<Mat> mats = matService.selectList(wrapper); return R.ok().add(mats); + } + @RequestMapping(value = "/mat/list/pda/page/auth") + @ManagerAuth + public R pdaPageList(@RequestParam(required = true)Long tagId, + @RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit){ + EntityWrapper<Mat> wrapper = new EntityWrapper<>(); + wrapper.eq("tag_id", tagId); + wrapper.orderBy("create_time", false); + return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper)); } @RequestMapping(value = "/mat/{id}/auth") @@ -256,6 +274,44 @@ return R.ok().add(res); } + @RequestMapping(value = "/order/print/auth") + @ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃") + public R orderPrint(@RequestParam(value = "param[]") String[] param) { + if(Cools.isEmpty(param)) { + return R.parse(CodeRes.EMPTY); + } + List<OrderDetl> res = new ArrayList<>(); + for (String orderNo : param){ + res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo)); + } + for (OrderDetl orderDetl: + res) { + orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty()); + } + return R.ok().add(res); + } + + @RequestMapping(value = "/pakOut/print/auth") + @ManagerAuth(memo = "鎷h揣鍗曠紪鐮佹墦鍗�") + public R pakOutPrint(@RequestParam(value = "param[]") String[] param) { + if(Cools.isEmpty(param)) { + return R.parse(CodeRes.EMPTY); + } + List<ManPakOut> res = new ArrayList<>(); + for (String docNum : param){ + ManPakOut manPakOut = manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num", docNum)); + res.add(manPakOut); + break; + } + return R.ok().add(res); + } + @RequestMapping(value = "/pakOut/show") + public R showQR(){ + List<ManPakOut> manPakOuts = manPakOutService.selectList(null); + return R.ok(manPakOuts); + } + + /*************************************** 鏁版嵁鐩稿叧 ***********************************************/ -- Gitblit v1.9.1