From e28217b3effeb811484f1acd596966ce91c7bb57 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期五, 26 七月 2024 13:28:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/result/LocDetlMesVo.java      |   19 +++++++++++++++++++
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java            |    3 +++
 src/main/java/com/zy/asrs/service/LocDetlService.java          |    3 +++
 src/main/java/com/zy/asrs/controller/OpenController.java       |   14 ++++++++++++++
 src/main/resources/mapper/LocDetlMapper.xml                    |    3 +++
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |    9 +++++++++
 6 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cf3b4b0..bb5e9db 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -9,6 +9,7 @@
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.BasJar;
 import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.LocDetlMesVo;
 import com.zy.asrs.entity.vo.JarStateTableVo;
 import com.zy.asrs.service.*;
 import com.zy.common.model.DetlDto;
@@ -45,6 +46,8 @@
     private BasCrnpService basCrnpService;
     @Autowired
     private BasJarService basJarService;
+    @Autowired
+    private LocDetlService locDetlService;
 
     @PostMapping("/order/matSync/default/v1")
     @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -383,6 +386,17 @@
         }
         return R.ok().add(list);
     }
+
+    //璁惧鐘舵�佹煡璇㈡帴鍙�
+    @PostMapping("/mesLocStatus")
+    @AppAuth(memo = "搴撳瓨淇℃伅鏌ヨ鎺ュ彛")
+    @Transactional
+    public R mesLocStatus(@RequestHeader String appkey,
+                       HttpServletRequest request) {
+        auth(appkey, "搴撳瓨淇℃伅鏌ヨ鎺ュ彛", request);
+        List<LocDetlMesVo> list = locDetlService.selectLocDetlMesAll();
+        return R.ok().add(list);
+    }
     /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
 
 }
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlMesVo.java b/src/main/java/com/zy/asrs/entity/result/LocDetlMesVo.java
new file mode 100644
index 0000000..554c17f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlMesVo.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2022/4/9
+ */
+@Data
+public class LocDetlMesVo {
+
+    private String matnr;
+
+    private String batch;
+
+    private Integer batchNum;
+
+    private Double weight;
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index ff155f3..1bc1f9f 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlMesVo;
 import com.zy.asrs.entity.result.StockVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -72,4 +73,6 @@
 
     void updateMatTurn(@Param("matnrOld")String matnrOld,@Param("matnr")String matnr);
 
+    List<LocDetlMesVo> selectLocDetlMesAll();
+
 }
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index a809089..b5df8af 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlMesVo;
 import com.zy.asrs.entity.result.StockVo;
 
 import java.util.List;
@@ -64,4 +65,6 @@
      * @return locNo 搴撲綅鍙�
      */
     List<String> getSameDetlToday2(String matnr, String batch, Integer start, Integer end);
+
+    List<LocDetlMesVo> selectLocDetlMesAll();
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index d43e920..c6ece89 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -3,10 +3,12 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlMesVo;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Set;
@@ -126,4 +128,11 @@
     public void updateMatTurn(String matnrOld,String matnr){
         this.baseMapper.updateMatTurn(matnrOld,matnr);
     }
+
+    @Override
+    @Transactional
+    public List<LocDetlMesVo> selectLocDetlMesAll() {
+        return this.baseMapper.selectLocDetlMesAll();
+    }
+
 }
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index adb8138..faf332f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -336,5 +336,8 @@
         INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
     </update>
 
+    <select id="selectLocDetlMesAll" resultType="com.zy.asrs.entity.result.LocDetlMesVo">
+        select DISTINCT matnr,weight, count(*) as batchNum from asr_loc_detl where 1=1 GROUP BY matnr,weight
+    </select>
 
 </mapper>

--
Gitblit v1.9.1