From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案， 如何实现，对现有找库位规则进行整改，数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位，离线设备不分配 3、库位分配要均衡到每一个设备 4、库位高度需要匹配到对应库位信息，低库位能向上兼容 5、空托盘优先放在locType2库位=1的库位，没有这种库位了，允许放到其他库位 6、给入库站点设置有限去那些堆垛机，其次去那些堆垛机，弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置，当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频，如果是高频则从前往后找库位，如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用
---
src/main/java/com/zy/asrs/controller/OpenController.java | 156 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 147 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9cfad2a..63a7a86 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());
+ }
}
@@ -702,12 +722,12 @@
}
}
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("鍑哄簱TU");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -717,7 +737,7 @@
}
/**
- * 杩�24灏忔椂鍏ュ嚭搴撴姌绾匡紙妯酱灏忔椂锛夛紝涓庢寜鏃� {@link #locIoLineCharts()} 鏁版嵁鍙ｅ緞涓嶅悓锛屼緵鐢佃鏈恒�屼綔涓氭晥鐜囥�嶄娇鐢�
+ * 鍏ュ嚭搴撴寜灏忔椂鎶樼嚎锛氭í杞翠负銆屽綋鍓嶆暣鐐硅捣鍚戝墠鍏� 12 灏忔椂銆嶆粴鍔ㄧ獥鍙ｏ紝涓庡簱琛� ymd锛坹yyy-MM-dd HH锛夊榻�
*/
@GetMapping("/line/charts/hourly")
public R locIoLineChartsHourly() {
@@ -733,17 +753,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;
@@ -760,13 +780,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("鍑哄簱TU");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -846,12 +866,130 @@
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(param.getTaskNo()));
+ String costTime = resolveCostTime(wrkMast, wrkDetls);
HashMap<String, Object> map = new HashMap<>();
map.put("taskNo", param.getTaskNo());
map.put("ioType", wrkMast.getIoType());
+ map.put("costTime", costTime);
map.put("wrkDetls", wrkDetls);
+
return R.ok().add(map);
}
+
+ private String resolveCostTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ Date createTime = resolveOrderCreateTime(resolveOrderNo(wrkMast, wrkDetls));
+ if (createTime == null) {
+ 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 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)))
+ );
+ if (historyCreateTime != null) {
+ return historyCreateTime;
+ }
+
+ return minDate(
+ minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", orderNo))),
+ minCreateTime(wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)))
+ );
+ }
+
+ 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 firstDate(wrkMast.getAppeTime(), wrkMast.getIoTime(), wrkMast.getModiTime());
+ }
+
+ private Date firstDate(Date... dates) {
+ if (dates == null || dates.length == 0) {
+ return null;
+ }
+ for (Date date : dates) {
+ if (date != null) {
+ return date;
+ }
+ }
+ return null;
+ }
+
+ 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 firstDate(wrkMast.getAppeTime(), wrkMast.getIoTime(), wrkMast.getModiTime());
+ }
+ if (item instanceof WrkMastLog) {
+ WrkMastLog wrkMastLog = (WrkMastLog) item;
+ return firstDate(wrkMastLog.getAppeTime(), wrkMastLog.getIoTime(), wrkMastLog.getModiTime());
+ }
+ if (item instanceof WrkDetl) {
+ WrkDetl wrkDetl = (WrkDetl) item;
+ return firstDate(wrkDetl.getAppeTime(), wrkDetl.getIoTime(), wrkDetl.getModiTime());
+ }
+ if (item instanceof WrkDetlLog) {
+ WrkDetlLog wrkDetlLog = (WrkDetlLog) item;
+ return firstDate(wrkDetlLog.getAppeTime(), wrkDetlLog.getIoTime(), wrkDetlLog.getModiTime());
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1