From 3c714a53d5cc4c61815870bef0385b7108181773 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 14 一月 2026 13:31:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasArmMastController.java | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
index a68630b..f016af6 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -38,14 +38,97 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
+
+ EntityWrapper<BasArmMast> wrapper = new EntityWrapper<>();
+
+ // ===================== 1. 鎵嬪姩澶勭悊 binding_tags 鐨勭簿纭尮閰嶏紙瀛楃涓插舰寮忥級 =====================
+ if (param.containsKey("binding_tags")) {
+ String tag = String.valueOf(param.get("binding_tags")).trim();
+ if (!tag.isEmpty()) {
+ wrapper.eq("binding_tags", tag);
+ System.out.println("鎵嬪姩娣诲姞绮剧‘鏉′欢: binding_tags = " + tag);
+ }
+ // 鍙�夛細绉婚櫎鍘� param锛岄槻姝� allLike 鍐嶆骞叉壈锛堝鏋� allLike 浼氶噸澶嶅姞鏉′欢锛�
+ // param.remove("binding_tags");
+ }
+
+ // ===================== 2. 鍏朵粬鍘熸湁澶勭悊閫昏緫锛堟ā绯婃悳绱㈢瓑锛� =====================
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasArmMast.class, param.keySet(), wrapper, condition);
+
+ // 鎺掑簭
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 鍒嗛〉鏌ヨ
+ Page<BasArmMast> page = new Page<>(curr, limit);
+ Page<BasArmMast> resultPage = basArmMastService.selectPage(page, wrapper);
+
+ // ===================== 3. 杩斿洖鏁版嵁澶勭悊锛堣浆瀛楃涓诧紝闃叉鍓嶇绮惧害涓㈠け锛� =====================
+ List<Map<String, Object>> newRecords = new ArrayList<>();
+ for (BasArmMast item : resultPage.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", item.getId() != null ? item.getId().toString() : null); // 寤鸿杞瓧绗︿覆
+ map.put("armNo", item.getArmNo());
+ map.put("armDirection", item.getArmDirection());
+ map.put("staNo", item.getStaNo());
+ map.put("sortingLine", item.getSortingLine());
+ map.put("bindingTags", item.getBindingTags() != null ? item.getBindingTags().toString() : null);
+ map.put("priority", item.getPriority());
+ map.put("status", item.getStatus());
+ map.put("matnr", item.getMatnr());
+ map.put("sku", item.getSku());
+ map.put("po", item.getPo());
+ map.put("upc", item.getUpc());
+ map.put("supplier", item.getSupplier());
+ map.put("orderNo", item.getOrderNo());
+ map.put("ctns", item.getCtns());
+ map.put("createTime", item.getCreateTime() != null ? item.getCreateTime().toString() : null);
+ map.put("armError", item.getArmError() != null ? item.getArmError().toString() : null); // 寤鸿杞�
+ map.put("armMsg", item.getArmMsg());
+ map.put("barcode", item.getBarcode());
+ map.put("status$", item.getStatus$());
+
+ newRecords.add(map);
+ }
+
+ // 鏋勯�犺繑鍥炵粨鏋�
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("total", resultPage.getTotal());
+ resultMap.put("size", resultPage.getSize());
+ resultMap.put("current", resultPage.getCurrent());
+ resultMap.put("pages", resultPage.getPages());
+ resultMap.put("records", newRecords);
+
+ return R.ok(resultMap);
+ }
+ @RequestMapping(value = "/basArmMast/listArm/auth")
+ @ManagerAuth
+ public R listArm(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasArmMast> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasArmMast.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("create_time",false);
- return R.ok(basArmMastService.selectPage(new Page<>(curr, limit), wrapper));
+
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 濡傛灉涓嶉渶瑕佸垎椤碉紝浣跨敤 selectList() 鑾峰彇鎵�鏈夋暟鎹�
+ List<BasArmMast> allData = basArmMastService.selectList(wrapper);
+
+ return R.ok(allData); // 鐩存帴杩斿洖鎵�鏈夋暟鎹�
}
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -54,6 +137,9 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("binding_tags")){
+ long aLong = Long.parseLong(val);
+ wrapper.ge(entry.getKey(), aLong);
} else {
wrapper.like(entry.getKey(), val);
}
--
Gitblit v1.9.1