From 00d29e3c9fd6692fc9c91f9782b13269e2835bfd Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 16 四月 2026 11:54:51 +0800
Subject: [PATCH] 电视机数据对接--12小时显示新增体积
---
src/main/java/com/zy/asrs/controller/OpenController.java | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 251 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8179f5e..6f6cf15 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -49,6 +50,8 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -123,6 +126,23 @@
HttpServletRequest request) {
auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
+ }
+
+ /**
+ * 鎵樼洏鍏ュ簱鍘嗗彶璁板綍閲嶆姤ERP
+ */
+ @PostMapping("/order/pakin/erp/report/v1")
+// @AppAuth(memo = "鍏ュ簱鍘嗗彶閲嶆姤ERP")
+ public synchronized R reportPakinHistoryToErp(@RequestBody(required = false) List<String> barcodes) {
+// auth(appkey, barcodes, request);
+ if (Cools.isEmpty(barcodes)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ try {
+ return openService.reportPakinHistoryToErp(barcodes);
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
}
@@ -678,8 +698,8 @@
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
if(listChart!=null) {
- ArrayList<Integer> data1 = new ArrayList<Integer>();
- ArrayList<Integer> data2 = new ArrayList<Integer>();
+ ArrayList<Number> data1 = new ArrayList<Number>();
+ ArrayList<Number> data2 = new ArrayList<Number>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
@@ -703,14 +723,58 @@
}
AxisBean inqty = new AxisBean();
inqty.setName("鍏ュ簱鎵樼洏鏁�");
- Integer[] array1 = new Integer[data1.size()];
+ Number[] array1 = new Number[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱TU");
- Integer[] array2 = new Integer[data2.size()];
+ outqty.setName("鍑哄簱鎵樼洏鏁�");
+ Number[] array2 = new Number[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
+
+ AxisBean teu= new AxisBean();
+ teu.setName("TEU");
+ List<WorkTeuTotalAxis> workTeuTotalAxes = reportQueryMapper.getteuTotal();
+ ArrayList<Number> data3 = new ArrayList<Number>();
+ for (WorkTeuTotalAxis w : workTeuTotalAxes) {
+ data3.add(w.getTeu_total());
+ }
+ Number[] array3 = new Number[data3.size()];
+ teu.setData(data3.toArray(array3));
+ list.add(teu);
+
+ AxisBean cube5 = new AxisBean();
+ cube5.setName("鍏ュ簱浣撶Н");
+ AxisBean cube15 = new AxisBean();
+ cube15.setName("鍑哄簱浣撶Н");
+ List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getCubeTotal();
+ Map<String, WorkCubeTotalAxis> cubeMap = new HashMap<String, WorkCubeTotalAxis>();
+ if (workCubeTotalAxes != null) {
+ for (WorkCubeTotalAxis w : workCubeTotalAxes) {
+ if (w.getYmd() != null) {
+ cubeMap.put(w.getYmd(), w);
+ }
+ }
+ }
+ ArrayList<Number> data4 = new ArrayList<Number>();
+ ArrayList<Number> data5 = new ArrayList<Number>();
+ SimpleDateFormat sfCube = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendarCube = Calendar.getInstance();
+ calendarCube.add(Calendar.DATE, -12);
+ for (int i = 0; i < 12; i++) {
+ calendarCube.add(Calendar.DATE, 1);
+ String str = sfCube.format(calendarCube.getTime());
+ WorkCubeTotalAxis cubeAxis = cubeMap.get(str);
+ data4.add(cubeAxis == null || cubeAxis.getCube5Total() == null ? 0 : cubeAxis.getCube5Total());
+ data5.add(cubeAxis == null || cubeAxis.getCube15Total() == null ? 0 : cubeAxis.getCube15Total());
+ }
+ Number[] array4 = new Number[data4.size()];
+ cube5.setData(data4.toArray(array4));
+ list.add(cube5);
+ Number[] array5 = new Number[data5.size()];
+ cube15.setData(data5.toArray(array5));
+ list.add(cube15);
+
}
map.put("rows",list);
return R.ok(map);
@@ -731,6 +795,8 @@
ArrayList<Integer> data1 = new ArrayList<>();
ArrayList<Integer> data2 = new ArrayList<>();
+ ArrayList<Double> data3 = new ArrayList<>();
+ ArrayList<Double> data4 = new ArrayList<>();
List<String> categories = new ArrayList<>();
final int n = 12;
@@ -747,10 +813,14 @@
int inV = 0;
int outV = 0;
+ double inC = 0;
+ double outC = 0;
for (WorkChartAxis w : listChart) {
if (w.getYmd() != null && key.equals(w.getYmd().trim())) {
inV = w.getInqty();
outV = w.getOutqty();
+ inC = w.getCube_inqty();
+ outC = w.getCube_outqty();
break;
}
}
@@ -766,10 +836,22 @@
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱TU");
+ outqty.setName("鍑哄簱鎵樼洏鏁�");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
+
+ AxisBean cubeInqty = new AxisBean();
+ cubeInqty.setName("鍏ュ簱浣撶Н");
+ Integer[] array3 = new Integer[data3.size()];
+ cubeInqty.setData(data3.toArray(array3));
+ list.add(cubeInqty);
+
+ AxisBean cubeOutqty = new AxisBean();
+ cubeOutqty.setName("鍑哄簱浣撶Н");
+ Integer[] array4 = new Integer[data4.size()];
+ cubeOutqty.setData(data4.toArray(array4));
+ list.add(cubeOutqty);
map.put("categories", categories);
map.put("rows", list);
@@ -851,7 +933,170 @@
map.put("taskNo", param.getTaskNo());
map.put("ioType", wrkMast.getIoType());
map.put("wrkDetls", wrkDetls);
+ Integer count = 0;
+ String supp = "";
+ //璇ヨ鍗曠疮璁″叆鍑哄簱浠舵暟
+ List<WrkMast> orderNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()));
+ List<WrkMastLog> userNo = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", wrkMast.getUserNo()).eq("wrk_sts",15L));
+ Integer ioType = wrkMast.getIoType();
+ if (ioType != null && ioType < 100) {
+ if (orderNo != null && orderNo.size() > 0) {
+ count = orderNo.size();
+ }
+ if (userNo != null && userNo.size() > 0) {
+ count = userNo.size()+count+1;
+ }
+ supp = count + "";
+ }else {
+ if (userNo != null && userNo.size() > 0) {
+ count = userNo.size()+1;
+ }
+ supp = count + "";
+ }
+ map.put("supp", supp);
+
+ //鑰楁椂
+ String costTime = resolveCostTime(wrkMast, wrkDetls);
+ map.put("costTime", costTime);
+
return R.ok().add(map);
}
+
+ private String resolveCostTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ if (wrkMast == null || wrkMast.getIoType() == null) {
+ return "0";
+ }
+
+ Date createTime;
+ if (wrkMast.getIoType() < 100) {
+ createTime = resolveInboundTaskCreateTime(wrkMast, wrkDetls);
+ } else {
+ createTime = resolveTaskCreateTime(wrkMast);
+ }
+
+ if (createTime == null) {
+ return "0";
+ }
+
+ long minutes = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - createTime.getTime());
+ if (minutes < 0L) {
+ minutes = 0L;
+ }
+ return String.valueOf(minutes);
+ }
+
+ private Date resolveInboundTaskCreateTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ if (wrkMast == null) {
+ return null;
+ }
+
+ if (!Cools.isEmpty(wrkMast.getUserNo())) {
+ Date userNoCreateTime = resolveUserNoCreateTime(wrkMast.getUserNo());
+ if (userNoCreateTime != null) {
+ return userNoCreateTime;
+ }
+ }
+
+ String orderNo = resolveOrderNo(wrkMast, wrkDetls);
+ if (Cools.isEmpty(orderNo)) {
+ return null;
+ }
+ return resolveOrderCreateTime(orderNo);
+ }
+
+ private Date resolveUserNoCreateTime(String userNo) {
+ if (Cools.isEmpty(userNo)) {
+ return null;
+ }
+ return minDate(
+ minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", userNo))),
+ minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", userNo)))
+ );
+ }
+
+ private String resolveOrderNo(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ if (wrkMast != null && !Cools.isEmpty(wrkMast.getUserNo())) {
+ return wrkMast.getUserNo();
+ }
+ if (Cools.isEmpty(wrkDetls)) {
+ return null;
+ }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getOrderNo())) {
+ return wrkDetl.getOrderNo();
+ }
+ }
+ return null;
+ }
+
+ private Date resolveOrderCreateTime(String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ return null;
+ }
+
+ Date historyCreateTime = minDate(
+ minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", orderNo))),
+ minCreateTime(wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("order_no", orderNo)))
+ );
+ Date currentCreateTime = minDate(
+ minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", orderNo))),
+ minCreateTime(wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)))
+ );
+ return minDate(historyCreateTime, currentCreateTime);
+ }
+
+ private Date minDate(Date first, Date second) {
+ if (first == null) {
+ return second;
+ }
+ if (second == null) {
+ return first;
+ }
+ return first.before(second) ? first : second;
+ }
+
+ private Date resolveTaskCreateTime(WrkMast wrkMast) {
+ if (wrkMast == null) {
+ return null;
+ }
+ return minDate(minDate(wrkMast.getAppeTime(), wrkMast.getIoTime()), wrkMast.getModiTime());
+ }
+
+ private Date minCreateTime(List<?> list) {
+ if (Cools.isEmpty(list)) {
+ return null;
+ }
+ Date min = null;
+ for (Object item : list) {
+ Date createTime = resolveCreateTime(item);
+ if (createTime == null) {
+ continue;
+ }
+ if (min == null || createTime.before(min)) {
+ min = createTime;
+ }
+ }
+ return min;
+ }
+
+ private Date resolveCreateTime(Object item) {
+ if (item instanceof WrkMast) {
+ WrkMast wrkMast = (WrkMast) item;
+ return minDate(minDate(wrkMast.getAppeTime(), wrkMast.getIoTime()), wrkMast.getModiTime());
+ }
+ if (item instanceof WrkMastLog) {
+ WrkMastLog wrkMastLog = (WrkMastLog) item;
+ return minDate(minDate(wrkMastLog.getAppeTime(), wrkMastLog.getIoTime()), wrkMastLog.getModiTime());
+ }
+ if (item instanceof WrkDetl) {
+ WrkDetl wrkDetl = (WrkDetl) item;
+ return minDate(minDate(wrkDetl.getAppeTime(), wrkDetl.getIoTime()), wrkDetl.getModiTime());
+ }
+ if (item instanceof WrkDetlLog) {
+ WrkDetlLog wrkDetlLog = (WrkDetlLog) item;
+ return minDate(minDate(wrkDetlLog.getAppeTime(), wrkDetlLog.getIoTime()), wrkDetlLog.getModiTime());
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1