From 4c51dcc99e41edfb4fdc198aa740fa52d29bf641 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 16:26:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/TimeSelectParam.java | 9 ++++
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 31 +++++++++++++++
src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java | 16 ++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 1
5 files changed, 72 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 e273006..f8829d5 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -33,6 +33,21 @@
@Autowired
private OpenService openService;
+
+
+ @PostMapping("/locDetl/select/time/v1")
+ @AppAuth(memo = "鏃堕棿鑾峰彇搴撳瓨淇℃伅")
+ public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) TimeSelectParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<LocDetlByTimeDTO> locDetlByTimeDTOS = openService.selectTimeLocDetl(param);
+ return R.ok(locDetlByTimeDTOS);
+ }
+
@PostMapping("/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java b/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java
new file mode 100644
index 0000000..7590828
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class LocDetlByTimeDTO {
+ private String locNo;
+ private String matnr;
+ private String batch;
+ private Double anfme;
+ private String orderNo;
+ private String orderType;
+ private String date;
+ private String warehouse;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TimeSelectParam.java b/src/main/java/com/zy/asrs/entity/param/TimeSelectParam.java
new file mode 100644
index 0000000..bddad41
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TimeSelectParam.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class TimeSelectParam {
+ private String startTime;
+ private String endTime;
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 93ff722..2b59fdf 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -46,4 +46,5 @@
boolean agvHaiKang(String wrkNo);
+ List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param);
}
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 34b6159..6ce0ea6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -554,6 +555,36 @@
@Override
+ public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
+ ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
+ EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
+ locDetlEntityWrapper.ge("create_time",param.getStartTime());
+ locDetlEntityWrapper.le("create_time",param.getEndTime());
+ List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper);
+ if (!Cools.isEmpty(locDetls)) {
+ for (LocDetl locDetl : locDetls) {
+ LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
+ if (!Cools.isEmpty(locDetl.getOrderNo())){
+ Order order = orderService.selectByNo(locDetl.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ locDetlByTimeDTO.setDate(order.getOrderTime());
+ locDetlByTimeDTO.setWarehouse(order.getItemName());
+ locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ }
+ }
+
+ locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
+ locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
+ locDetlByTimeDTO.setBatch(locDetl.getBatch());
+ locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
+ locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
+ locDetlByTimeDTOS.add(locDetlByTimeDTO);
+ }
+ }
+ return locDetlByTimeDTOS;
+ }
+
+ @Override
@Transactional
public boolean agvHaiKang(String wrkNo) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Long.parseLong(wrkNo)));
--
Gitblit v1.9.1