From c288681650513acfd04fa43902f66593cd8f3c6d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 04 一月 2026 15:00:12 +0800
Subject: [PATCH] #getArmType$
---
src/main/java/com/zy/asrs/entity/param/DigitalTwinRecentInAndOutBoundParam.java | 35 +++++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 ++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 1
4 files changed, 84 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 cda9d2d..464ded3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -258,4 +258,19 @@
return R.ok().add(openService.digitalTwinRecentIdleLoc(param));
}
+
+ /**
+ * 杩戞湡鍑哄簱鍏ュ簱
+ */
+ @RequestMapping("/digitalTwin/recentInAndOutBound")
+ public R digitalTwinRecentInAndOutBound(@RequestHeader(required = false) String appkey,
+ @RequestBody DigitalTwinRecentInAndOutBoundParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.digitalTwinRecentInAndOutBound(param));
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/DigitalTwinRecentInAndOutBoundParam.java b/src/main/java/com/zy/asrs/entity/param/DigitalTwinRecentInAndOutBoundParam.java
new file mode 100644
index 0000000..7fb66a7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/DigitalTwinRecentInAndOutBoundParam.java
@@ -0,0 +1,35 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/13
+ */
+@Data
+public class DigitalTwinRecentInAndOutBoundParam {
+ private int areaId;
+
+ // 寮�濮嬫棩鏈燂紝鏍煎紡锛�20251022銆備笉浼犻粯璁�7澶┿��
+ private String startDate;
+
+ // 缁撴潫鏃ユ湡锛屾牸寮忥細20251022銆傞厤鍚坰tartDate浣跨敤銆�
+ private String endDate;
+
+ private String memo;
+
+ private List<DataCode> dataCodeList;
+
+ @Data
+ public static class DataCode {
+ // 搴撳瓨鏃ユ湡锛屾牸寮忥細2025-10-22
+ private String boundDate;
+ // 鍏ュ簱鏁伴噺
+ private Long inBoundNum;
+ // 鏁板瓧 鍑哄簱鏁伴噺
+ private Long outBoundNum;
+
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 1ace063..66a4002 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -51,4 +51,5 @@
ViewStockUseBeanDigitalTwin digitalTwinOverview();
DigitalTwinRecentOrderParam digitalTwinRecentOrder(DigitalTwinRecentOrderParam digitalTwinRecentOrderParam);
DigitalTwinRecentIdleLocParam digitalTwinRecentIdleLoc(DigitalTwinRecentIdleLocParam digitalTwinRecentIdleLocParam);
+ DigitalTwinRecentInAndOutBoundParam digitalTwinRecentInAndOutBound(DigitalTwinRecentInAndOutBoundParam digitalTwinRecentIdleLocParam);
}
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 e2ba776..d628199 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -683,4 +683,37 @@
return param;
}
+ @Override
+ @Transactional
+ public DigitalTwinRecentInAndOutBoundParam digitalTwinRecentInAndOutBound(DigitalTwinRecentInAndOutBoundParam param) {
+ Date date = new Date();
+ if (Cools.isEmpty(param.getStartDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getStartDate(), DateUtils.yyyyMMdd) || TimeCalculatorUtils.isFutureDate(param.getStartDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("寮�濮嬫棩鏈熷紓甯� 锛�"+param.getStartDate());
+ String timeFrontSevenYesterday = new SimpleDateFormat(DateUtils.yyyyMMdd).format(TimeCalculatorUtils.timeFrontSevenYesterday6(date));//涓冨ぉ鍓�
+ param.setStartDate(timeFrontSevenYesterday);
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ } else if (Cools.isEmpty(param.getEndDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getEndDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("缁撴潫鏃ユ湡寮傚父 锛�"+param.getEndDate());
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ }
+ ViewInOutBean viewInOutBean = new ViewInOutBean();
+ viewInOutBean.setBegin_date(param.getStartDate());
+ viewInOutBean.setEnd_date(param.getEndDate());
+ List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(viewInOutBean);
+ List<DigitalTwinRecentInAndOutBoundParam.DataCode> dataCodes = new ArrayList<>();
+ for (ViewInOutBean view : list) {
+ DigitalTwinRecentInAndOutBoundParam.DataCode dataCode = new DigitalTwinRecentInAndOutBoundParam.DataCode();
+ dataCode.setBoundDate(view.getYmd());
+ dataCode.setOutBoundNum(view.getRet_qty());
+ dataCode.setInBoundNum(view.getSto_qty());
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
+ return param;
+ }
+
}
--
Gitblit v1.9.1