From cd545f5e82fe484b90c1faa73149b4179f034655 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 29 十一月 2022 12:29:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/result/InOutCountDto.java | 13 +++++++++++++
src/main/java/com/zy/asrs/service/WrkMastService.java | 3 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 11 +++++++++++
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 6 ++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 4 ++++
src/main/resources/mapper/WrkMastMapper.xml | 3 +++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 ++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 4 ++++
8 files changed, 54 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 ea5f3d4..8992331 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -122,6 +122,13 @@
}
}
+ /******************************************************* 鏁板瓧瀛敓 *******************************************************/
+
+ @PostMapping("/wrkdetl")
+ public R getInOutDetl(){
+ return openService.getInOutDetl();
+ }
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
@@ -161,4 +168,8 @@
System.out.println(JSON.toJSONString(param1));
}
+
+
+
+
}
diff --git a/src/main/java/com/zy/asrs/entity/result/InOutCountDto.java b/src/main/java/com/zy/asrs/entity/result/InOutCountDto.java
new file mode 100644
index 0000000..d4c4fb6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/InOutCountDto.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class InOutCountDto {
+ private Integer ioType;
+ private Date appeTime;
+ private String matnr;
+ private Double anfme;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 37e384b..af926a6 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.result.InOutCountDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -18,4 +19,7 @@
List<WrkMast> selectToBeHistoryData();
Integer checkFinishByOrder(@Param("orderNo") String orderNo);
+
+ List<InOutCountDto> selectTop100();
+
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index ed67a84..2b3375a 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -43,4 +44,7 @@
* @param param
*/
void syncMat(MatSyncParam param);
+
+ R getInOutDetl();
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 8116e57..0620a9a 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.result.InOutCountDto;
import java.util.List;
@@ -24,4 +25,6 @@
Boolean checkFinishByOrder(String orderNo);
+ List<InOutCountDto> selectTop100();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b485a88..d72b653 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.InOutCountDto;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
@@ -48,6 +50,8 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private WrkMastService wrkMastService;
@Override
@Transactional
@@ -551,4 +555,10 @@
}
+ @Override
+ public R getInOutDetl() {
+ List<InOutCountDto> top100 = wrkMastService.selectTop100();
+ return R.ok().add(top100);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 08d614d..30043c7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.result.InOutCountDto;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
@@ -50,4 +51,9 @@
return this.baseMapper.checkFinishByOrder(orderNo) <= 0;
}
+ @Override
+ public List<InOutCountDto> selectTop100() {
+ return this.baseMapper.selectTop100();
+ }
+
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7a419f1..d58a13d 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -77,5 +77,8 @@
<select id="checkFinishByOrder" resultType="java.lang.Integer">
select Count(*) FROM asr_wrk_detl d left join asr_wrk_mast m on d.wrk_no = m.wrk_no WHERE d.order_no = #{orderNo} and m.wrk_sts < 14
</select>
+ <select id="selectTop100" resultType="com.zy.asrs.entity.result.InOutCountDto">
+ SELECT TOP 100 m.io_type as ioType,m.appe_time as appeTime, d.matnr, d.anfme FROM asr_wrk_detl_log d left join asr_wrk_mast_log m on d.wrk_no = m.wrk_no
+ </select>
</mapper>
--
Gitblit v1.9.1