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 | 362 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 318 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4f2b253..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
@@ -125,6 +128,23 @@
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());
+ }
+ }
+
@@ -153,6 +173,7 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("[auth] cache: {}", obj == null ? "null" : JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -398,8 +419,12 @@
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
-
+ public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param,
+ HttpServletRequest request) {
+ if (request != null) {
+ log.info("[syncMatInfoV2] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
System.out.println(param);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -424,16 +449,24 @@
* return
*/
@PostMapping("/station/all")
- public synchronized R stationAll(){
+ public synchronized R stationAll(HttpServletRequest request) {
+ if (request != null) {
+ String cachePayload = JSON.toJSONString(Collections.singletonMap("op", "stationAll"));
+ log.info("[stationAll] cache: {}", cachePayload);
+ request.setAttribute("cache", cachePayload);
+ }
return openService.stationAll();
}
/**
- * 缁勬墭淇℃伅涓嬪彂
- * return
+ * 7.3 缁勬墭淇℃伅涓嬪彂
*/
@PostMapping("/comb/auth")
- public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[comb] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
List<MesToCombParam> errorComb = Lists.newArrayList();
List<MesToCombParam> validComb = Lists.newArrayList();
for (MesToCombParam mesToCombParam : param) {
@@ -473,41 +506,60 @@
}
/**
- * 鍑哄簱閫氱煡鍗�
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
*/
-
@PostMapping("/outOrder")
public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
+ 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 + "銆嶅簭鍙蜂笉杩炶疮");
+ }
}
}
}
@@ -540,46 +592,86 @@
// }
// }
- List<OutTaskParam> errorOutOrders = Lists.newArrayList();
- List<OutTaskParam> validOutOrders = Lists.newArrayList();
+ List<OutTaskParam> missingStock = Lists.newArrayList();
+ List<OutTaskParam> missingLoc = Lists.newArrayList();
for (OutTaskParam outTaskParam : params) {
- // TODO:寰呮脯瑭︼紝鏍￠搴瓨淇℃伅锛屼笉瀛樺湪鍓囪繑鍥�
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", outTaskParam.getPalletId()));
- if (countLoc == 0){
- errorOutOrders.add(outTaskParam);
+ if (countLoc == 0) {
+ missingStock.add(outTaskParam);
continue;
}
- validOutOrders.add(outTaskParam);
- }
- for (OutTaskParam outTaskParam : validOutOrders) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
if (locMast == null) {
- throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + outTaskParam.getPalletId() + "瀵瑰簲鐨勫簱浣�");
+ missingLoc.add(outTaskParam);
}
}
-
- for (OutTaskParam outTaskParam : validOutOrders) {
- R r = openService.outOrder(outTaskParam,validOutOrders.size());
- if (!r.get("code").equals(200)){
- return r;
+ if (!missingStock.isEmpty()) {
+ List<String> missingPalletIds = new ArrayList<>(missingStock.size());
+ for (OutTaskParam p : missingStock) {
+ String pid = p.getPalletId();
+ missingPalletIds.add(Cools.isEmpty(pid) ? "锛堢┖锛�" : pid);
}
+ return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩橈細" + String.join("锛�", missingPalletIds)).add(missingStock);
}
- if(errorOutOrders.size() > 0) {
- return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩�").add(errorOutOrders);
+ if (!missingLoc.isEmpty()) {
+ List<String> badPalletIds = new ArrayList<>(missingLoc.size());
+ for (OutTaskParam p : missingLoc) {
+ String pid = p.getPalletId();
+ badPalletIds.add(Cools.isEmpty(pid) ? "锛堢┖锛�" : pid);
+ }
+ return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
- return R.ok();
+ return openService.outOrderBatch(params);
+ }
+
+ /**
+ * 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")
- public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
+ public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[pakoutOrderPause] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
return R.error("orderNo is empty");
}
return openService.pakoutOrderPause(param);
+ }
+
+ private String buildOutOrderBatchKey(OutTaskParam param) {
+ return param.getOrderId() + "#" + param.getBatchSeq();
}
@@ -630,17 +722,77 @@
}
}
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);
}
map.put("rows",list);
+ return R.ok(map);
+ }
+
+ /**
+ * 鍏ュ嚭搴撴寜灏忔椂鎶樼嚎锛氭í杞翠负銆屽綋鍓嶆暣鐐硅捣鍚戝墠鍏� 12 灏忔椂銆嶆粴鍔ㄧ獥鍙ｏ紝涓庡簱琛� ymd锛坹yyy-MM-dd HH锛夊榻�
+ */
+ @GetMapping("/line/charts/hourly")
+ public R locIoLineChartsHourly() {
+ Map<String, Object> map = new HashMap<>();
+ List<AxisBean> list = new ArrayList<>();
+
+ List<WorkChartAxis> listChart = reportQueryMapper.getChartAxisHourly();
+ if (listChart == null) {
+ listChart = Collections.emptyList();
+ }
+
+ ArrayList<Integer> data1 = new ArrayList<>();
+ ArrayList<Integer> data2 = new ArrayList<>();
+ List<String> categories = new ArrayList<>();
+
+ final int n = 12;
+ SimpleDateFormat sfKey = new SimpleDateFormat("yyyy-MM-dd HH");
+ 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, -(n - 1));
+
+ for (int i = 0; i < n; i++) {
+ String key = sfKey.format(calendar.getTime());
+ categories.add(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)));
+
+ int inV = 0;
+ int outV = 0;
+ for (WorkChartAxis w : listChart) {
+ if (w.getYmd() != null && key.equals(w.getYmd().trim())) {
+ inV = w.getInqty();
+ outV = w.getOutqty();
+ break;
+ }
+ }
+ data1.add(inV);
+ data2.add(outV);
+ calendar.add(Calendar.HOUR_OF_DAY, 1);
+ }
+
+ AxisBean inqty = new AxisBean();
+ inqty.setName("鍏ュ簱鎵樼洏鏁�");
+ Integer[] array1 = new Integer[data1.size()];
+ inqty.setData(data1.toArray(array1));
+ list.add(inqty);
+
+ AxisBean outqty = new AxisBean();
+ outqty.setName("鍑哄簱TU");
+ Integer[] array2 = new Integer[data2.size()];
+ outqty.setData(data2.toArray(array2));
+ list.add(outqty);
+
+ map.put("categories", categories);
+ map.put("rows", list);
return R.ok(map);
}
@@ -697,7 +849,11 @@
* 浠诲姟鏌ヨ鎺ュ彛
*/
@PostMapping("/queryTask")
- public synchronized R queryTask(@RequestBody QueryTaskParam param) {
+ public synchronized R queryTask(@RequestBody QueryTaskParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[queryTask] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -710,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