From 32a0c497d0c939b57ba4ac12f6e0bd8cedad5a4e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 04 一月 2026 13:42:21 +0800
Subject: [PATCH] #getArmType$
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
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 bb47980..e2ba776 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -641,7 +641,45 @@
param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
}
List<ViewOrderParam> asrOrderView = reportQueryMapper.getAsrOrderView(param.getStartDate(), param.getEndDate());
- param.setViewOrderParamList(asrOrderView);
+ List<DigitalTwinRecentOrderParam.DataCode> dataCodes = new ArrayList<>();
+ for (ViewOrderParam view : asrOrderView) {
+ DigitalTwinRecentOrderParam.DataCode dataCode = new DigitalTwinRecentOrderParam.DataCode();
+ dataCode.setOrderDate(view.getYmd());
+ dataCode.setOrderNum(view.getQty());
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
+ return param;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinRecentIdleLocParam digitalTwinRecentIdleLoc(DigitalTwinRecentIdleLocParam 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());
+ }
+// List<ViewLocDailyLogParam> asrLocDailyLogO = reportQueryMapper.getAsrLocDailyLogO(param.getAreaId(), param.getStartDate(), param.getEndDate());
+ List<ViewLocDailyLogParam> asrLocDailyLogO = reportQueryMapper.getAsrLocDailyLog2(param.getAreaId(), param.getStartDate(), param.getEndDate());
+ List<DigitalTwinRecentIdleLocParam.DataCode> dataCodes = new ArrayList<>();
+ for (ViewLocDailyLogParam view : asrLocDailyLogO) {
+ DigitalTwinRecentIdleLocParam.DataCode dataCode = new DigitalTwinRecentIdleLocParam.DataCode();
+ dataCode.setLocDate(view.getYmd());
+ dataCode.setIdleNum(view.getQty());
+ dataCode.setAreaId(view.getArea());
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
return param;
}
--
Gitblit v1.9.1