From 13b2580541535eba89a363da83501d034892a8b3 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 21:16:33 +0800
Subject: [PATCH] 电视机数据对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 301 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 273 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0578025..8364138 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());
+ }
}
@@ -439,8 +459,7 @@
}
/**
- * 缁勬墭淇℃伅涓嬪彂
- * return
+ * 7.3 缁勬墭淇℃伅涓嬪彂
*/
@PostMapping("/comb/auth")
public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param, HttpServletRequest request) {
@@ -487,9 +506,8 @@
}
/**
- * 鍑哄簱閫氱煡鍗�
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
*/
-
@PostMapping("/outOrder")
public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
@@ -497,32 +515,51 @@
}
log.info("[outOrder] cache: {}", JSON.toJSONString(params));
request.setAttribute("cache", params);
- Set<String> orderIds = new LinkedHashSet<>();
+ Map<String, List<OutTaskParam>> linesByBatch = new LinkedHashMap<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
return R.error("鍑哄簱鍗曞彿涓嶈兘涓虹┖");
}
- orderIds.add(outTaskParam.getOrderId());
+ if (Cools.isEmpty(outTaskParam.getBatchSeq())) {
+ outTaskParam.setBatchSeq(outTaskParam.getOrderId());
+ }
+ if (Cools.isEmpty(outTaskParam.getStationId())) {
+ return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶅嚭搴撳彛缂栫爜涓嶈兘涓虹┖");
+ }
+ linesByBatch.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
}
- Map<String, List<OutTaskParam>> linesByOrder = new LinkedHashMap<>();
- for (OutTaskParam outTaskParam : params) {
- linesByOrder.computeIfAbsent(outTaskParam.getOrderId(), k -> new ArrayList<>()).add(outTaskParam);
- }
- for (Map.Entry<String, List<OutTaskParam>> entry : linesByOrder.entrySet()) {
- String oid = entry.getKey();
+ for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatch.entrySet()) {
List<OutTaskParam> lines = entry.getValue();
- List<Integer> seqs = new ArrayList<>(lines.size());
+ OutTaskParam head = lines.get(0);
+ String oid = head.getOrderId();
+ String batchSeq = head.getBatchSeq();
+ boolean hasZero = false;
+ boolean hasPositive = false;
+ List<Integer> orderedSeqs = new ArrayList<>(lines.size());
for (OutTaskParam line : lines) {
if (line.getSeq() == null) {
- return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉鑳戒负绌�");
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶆壒娆°��" + batchSeq + "銆嶅簭鍙蜂笉鑳戒负绌�");
}
- seqs.add(line.getSeq());
+ if (line.getSeq() < 0) {
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶆壒娆°��" + batchSeq + "銆嶅簭鍙蜂笉鑳藉皬浜�0");
+ }
+ if (line.getSeq() == 0) {
+ hasZero = true;
+ } else {
+ hasPositive = true;
+ orderedSeqs.add(line.getSeq());
+ }
}
- Collections.sort(seqs);
- for (int i = 0; i < seqs.size(); i++) {
- if (!String.valueOf(seqs.get(i)).equals(String.valueOf(i + 1))) {
- return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炶疮");
+ if (hasZero && hasPositive) {
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶆壒娆°��" + batchSeq + "銆嶅簭鍙蜂笉鑳芥贩鐢ㄦ棤搴忓拰鏈夊簭");
+ }
+ if (!hasZero) {
+ Collections.sort(orderedSeqs);
+ for (int i = 0; i < orderedSeqs.size(); i++) {
+ if (!Objects.equals(orderedSeqs.get(i), i + 1)) {
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶆壒娆°��" + batchSeq + "銆嶅簭鍙蜂笉杩炶疮");
+ }
}
}
}
@@ -589,6 +626,36 @@
}
/**
+ * 7.9 鍑哄簱寮傚父鍙樺姩涓婃姤
+ */
+ @PostMapping("/order/pakout/abnormal/report/v1")
+ public synchronized R outOrderAbnormalReport(@RequestBody OutOrderAbnormalReportParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[outOrderAbnormalReport] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getPalletId())) {
+ return R.error("palletId涓嶈兘涓虹┖");
+ }
+ return openService.outOrderAbnormalReport(param);
+ }
+
+ /**
+ * 7.10 鍑哄簱寮傚父鍙樺姩澶勭悊
+ */
+ @PostMapping("/order/pakout/abnormal/handle/v1")
+ public synchronized R outOrderAbnormalHandle(@RequestBody OutOrderAbnormalHandleParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[outOrderAbnormalHandle] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getPalletId())) {
+ return R.error("palletId涓嶈兘涓虹┖");
+ }
+ return openService.outOrderAbnormalHandle(param);
+ }
+
+ /**
* pause out order
*/
@PostMapping("/order/pakout/pause/default/v1")
@@ -601,6 +668,10 @@
return R.error("orderNo is empty");
}
return openService.pakoutOrderPause(param);
+ }
+
+ private String buildOutOrderBatchKey(OutTaskParam param) {
+ return param.getOrderId() + "#" + param.getBatchSeq();
}
@@ -651,22 +722,33 @@
}
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("鍏ュ簱鎵樼洏鏁�");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("鍑哄簱鎵樼洏鏁�");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
+
+ AxisBean teu= new AxisBean();
+ teu.setName("TEU");
+ List<WorkTeuTotalAxis> workTeuTotalAxes = reportQueryMapper.getteuTotal();
+ ArrayList<Integer> data3 = new ArrayList<>();
+ for (WorkTeuTotalAxis w : workTeuTotalAxes) {
+ data3.add(w.getTeu_total());
+ }
+ Integer[] array3 = new Integer[data3.size()];
+ teu.setData(data3.toArray(array3));
+ list.add(teu);
}
map.put("rows",list);
return R.ok(map);
}
/**
- * 杩�24灏忔椂鍏ュ嚭搴撴姌绾匡紙妯酱灏忔椂锛夛紝涓庢寜鏃� {@link #locIoLineCharts()} 鏁版嵁鍙ｅ緞涓嶅悓锛屼緵鐢佃鏈恒�屼綔涓氭晥鐜囥�嶄娇鐢�
+ * 鍏ュ嚭搴撴寜灏忔椂鎶樼嚎锛氭í杞翠负銆屽綋鍓嶆暣鐐硅捣鍚戝墠鍏� 12 灏忔椂銆嶆粴鍔ㄧ獥鍙ｏ紝涓庡簱琛� ymd锛坹yyy-MM-dd HH锛夊榻�
*/
@GetMapping("/line/charts/hourly")
public R locIoLineChartsHourly() {
@@ -682,17 +764,17 @@
ArrayList<Integer> data2 = new ArrayList<>();
List<String> categories = new ArrayList<>();
+ final int n = 12;
SimpleDateFormat sfKey = new SimpleDateFormat("yyyy-MM-dd HH");
- SimpleDateFormat sfLabel = new SimpleDateFormat("HH:00");
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
- calendar.add(Calendar.HOUR_OF_DAY, -23);
+ calendar.add(Calendar.HOUR_OF_DAY, -(n - 1));
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i < n; i++) {
String key = sfKey.format(calendar.getTime());
- categories.add(sfLabel.format(calendar.getTime()));
+ categories.add(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)));
int inV = 0;
int outV = 0;
@@ -709,13 +791,13 @@
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("鍏ュ簱鎵樼洏鏁�");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("鍑哄簱鎵樼洏鏁�");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -800,7 +882,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