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/BasArmMastLogController.java | 64 +++++++++++++++
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 5
src/main/java/com/zy/asrs/controller/BasArmMastController.java | 65 +++++++++++++++
src/main/java/com/zy/asrs/controller/BasArmMastSignController.java | 54 ++++++++++++
4 files changed, 177 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
index ac73fc1..f016af6 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -38,13 +38,72 @@
@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);
- 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);
+
+ // 鍒嗛〉鏌ヨ
+ 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
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
index 127f80c..95fecd8 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
@@ -39,12 +39,70 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<BasArmMastLog> 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(BasArmMastLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("create_time",false);
- return R.ok(basArmMastLogService.selectPage(new Page<>(curr, limit), wrapper));
+
+ // 鎺掑簭
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 鍒嗛〉鏌ヨ
+ Page<BasArmMastLog> page = new Page<>(curr, limit);
+ Page<BasArmMastLog> resultPage = basArmMastLogService.selectPage(page, wrapper);
+
+ // ===================== 3. 杩斿洖鏁版嵁澶勭悊锛堣浆瀛楃涓诧紝闃叉鍓嶇绮惧害涓㈠け锛� =====================
+ List<Map<String, Object>> newRecords = new ArrayList<>();
+ for (BasArmMastLog 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);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
index 7ea6ad3..2a7d114 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
@@ -39,12 +39,60 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<BasArmMastSign> wrapper = new EntityWrapper<>();
+
+ // ===================== 1. 鎵嬪姩澶勭悊 binding_tags 鐨勭簿纭尮閰嶏紙瀛楃涓插舰寮忥級 =====================
+ if (param.containsKey("create_time")) {
+ String tag = String.valueOf(param.get("create_time")).trim();
+ if (!tag.isEmpty()) {
+ wrapper.eq("create_time", tag);
+ System.out.println("鎵嬪姩娣诲姞绮剧‘鏉′欢: create_time = " + tag);
+ }
+ // 鍙�夛細绉婚櫎鍘� param锛岄槻姝� allLike 鍐嶆骞叉壈锛堝鏋� allLike 浼氶噸澶嶅姞鏉′欢锛�
+ // param.remove("binding_tags");
+ }
+
+ // ===================== 2. 鍏朵粬鍘熸湁澶勭悊閫昏緫锛堟ā绯婃悳绱㈢瓑锛� =====================
excludeTrash(param);
convert(param, wrapper);
allLike(BasArmMastSign.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("create_time",false);
- return R.ok(basArmMastSignService.selectPage(new Page<>(curr, limit), wrapper));
+
+ // 鎺掑簭
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 鍒嗛〉鏌ヨ
+ Page<BasArmMastSign> page = new Page<>(curr, limit);
+ Page<BasArmMastSign> resultPage = basArmMastSignService.selectPage(page, wrapper);
+
+ // ===================== 3. 杩斿洖鏁版嵁澶勭悊锛堣浆瀛楃涓诧紝闃叉鍓嶇绮惧害涓㈠け锛� =====================
+ List<Map<String, Object>> newRecords = new ArrayList<>();
+ for (BasArmMastSign item : resultPage.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", item.getId() != null ? item.getId().toString() : null); // 寤鸿杞瓧绗︿覆
+ 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("createTime", item.getCreateTime() != null ? item.getCreateTime().toString() : null);
+ 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);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 5a150a1..d619f65 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -94,7 +94,7 @@
}
private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType, SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
- List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
+ List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id",order.getId()));
if (kingDeeUtilType == null || kingDeeUtilType.formId == null) {
log.warn("kingDeeUtilType 涓虹┖锛屽凡璺宠繃鏈鍚屾锛�");
return null;
@@ -102,7 +102,6 @@
switch (kingDeeUtilType.formId) {
case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗�
path = imPurinbillAdd;
- JSONArray billentryLkArray = new JSONArray();
JSONArray billentryArray = new JSONArray(); // 鐢ㄤ簬瀛樺偍 billentry 瀵硅薄
String suppCode = null; // 渚涘簲鍟�
String boxType2 = null; // 璐т富/璐ф簮
@@ -115,6 +114,8 @@
}
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
Double qty = orderDetl.getQty()*mat.getSafeQty();
+ JSONArray billentryLkArray = new JSONArray();
+
// Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
// JSONArray idArr = new JSONArray();
// idArr.add(0L);
--
Gitblit v1.9.1