From 2f328c198aa83fa274c91fa70cf955abbe336c07 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 13 六月 2024 09:57:54 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 2 +- src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 4 ++++ src/main/java/com/zy/asrs/controller/AgvMobileController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index dda8c4c..6f5929e 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -189,6 +189,52 @@ String matnr = params.get("matnr"); String floor = params.get("floor"); + Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1); + + +// wrapper.eq("orderNo",orderNo); + + wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode); + + if (threeCode.substring(0,2).equals(30)) { + wrapper.isNull("specs").or().eq("specs","").eq("floor",1); + } + List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper); + List<AgvLocDetl> locDetls = new ArrayList<>(); + for (AgvLocDetl agvLocDetl : agvLocDetls) { + AgvLocMast agvLocMast = new AgvLocMast(); + if (Cools.isEmpty(floor)) { + agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1")); + } else { + // 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛� + if ("JG".equals(orderNo.substring(0,2))) { + agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor)); + } else { + agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor)); + } + } + + if (Cools.isEmpty(agvLocMast)) continue; + agvLocDetl.setLocSts(agvLocMast.getLocSts()); + agvLocDetl.setLocSts$(agvLocMast.getLocSts$()); + locDetls.add(agvLocDetl); + } + + + return R.ok(locDetls); + } + + /* + 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙� + */ + @PostMapping("/query/locDetl/v2") + public R queryAgvLocDetl2(@RequestBody HashMap<String,String> params){ + + String orderNo = params.get("orderNo"); + String threeCode = params.get("threeCode"); + String matnr = params.get("matnr"); + String floor = params.get("floor"); + Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr); diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java index cd14b80..26a6af2 100644 --- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java @@ -28,7 +28,7 @@ @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts = 1") Double selectSumAnfmeByMatnrProcess(@Param("matnr") String matnr,@Param("threeCode") String threeCode); - @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor = #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode}") + @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor = #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1") Double selectSumAnfmeByMatnr2(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor); @Select("SELECT SUM(anfme) FROM agv_loc_detl") diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java index 9453e7a..08963bf 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java @@ -68,6 +68,10 @@ wapperSetCondition(wrapper,"three_code",csocode); wapperSetCondition(wrapper,"dead_time",isoseq); + if ("JG".equals(orderNo.substring(0,2))) { + wapperSetCondition(wrapper,"process_sts","1"); + } + List<AgvLocDetl> agvLocDetls = this.selectList(wrapper); for (AgvLocDetl agvLocDetl: agvLocDetls) { -- Gitblit v1.9.1