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/BasArmController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmController.java b/src/main/java/com/zy/asrs/controller/BasArmController.java
index 1714902..c663167 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(BasArm.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("arm_no",true);
return R.ok(basArmService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -60,14 +61,14 @@
}
@RequestMapping(value = "/basArm/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板鏈烘鑷傜浉鍏抽厤缃�")
public R add(BasArm basArm) {
basArmService.insert(basArm);
return R.ok();
}
@RequestMapping(value = "/basArm/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼鏈烘鑷傜浉鍏抽厤缃�")
public R update(BasArm basArm){
if (Cools.isEmpty(basArm) || null==basArm.getId()){
return R.error();
@@ -77,7 +78,7 @@
}
@RequestMapping(value = "/basArm/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鏈烘鑷傜浉鍏抽厤缃�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basArmService.deleteById(id);
@@ -86,7 +87,7 @@
}
@RequestMapping(value = "/basArm/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀵煎嚭鏈烘鑷傜浉鍏抽厤缃�")
public R export(@RequestBody JSONObject param){
EntityWrapper<BasArm> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
--
Gitblit v1.9.1