From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/asrs/controller/WaitPakinLogController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index ab32674..d0d8bc2 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -45,7 +45,7 @@
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
else {
- wrapper.orderBy("id", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -73,7 +73,7 @@
@RequestMapping(value = "/waitPakinLog/update/auth")
@ManagerAuth
public R update(WaitPakinLog waitPakinLog){
- if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
+ if (Cools.isEmpty(waitPakinLog)){
return R.error();
}
waitPakinLogService.updateById(waitPakinLog);
@@ -113,8 +113,8 @@
List<Map<String, Object>> result = new ArrayList<>();
for (WaitPakinLog waitPakinLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakinLog.getId());
- map.put("value", waitPakinLog.getId());
+ map.put("id", waitPakinLog.getZpallet());
+ map.put("value", waitPakinLog.getZpallet());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1