From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 56cda69..4c0fd91 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -40,15 +40,19 @@
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
if (Cools.isEmpty(pwd)) {
- return R.error("璇疯緭鍏ュ彛浠�");
+ return R.error("response.input_password");
}
- return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
+ R r = R.ok();
+ r.put("data",Parameter.get().getLocMastInitPwd().equals(pwd));
+ return r;
}
@PostMapping(value = "/group/empty/stock")
- @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
+ @ManagerAuth(memo = "response.get_group_empty_stock")
public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
- return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
+ R r = R.ok();
+ r.put("data", locMastService.queryGroupEmptyStock(sourceLocNo));
+ return r;
}
@RequestMapping(value = "/locMast/{id}/auth")
@@ -67,6 +71,7 @@
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ wrapper.orderBy("modi_time",true);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -94,25 +99,25 @@
}
@RequestMapping(value = "/locMast/add/auth")
- @ManagerAuth(memo = "搴撲綅娣诲姞")
+ @ManagerAuth(memo = "response.loc_mast_add")
public R add(LocMast locMast) {
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMast.setAppeUser(getUserId());
locMast.setAppeTime(new Date());
locMastService.insert(locMast);
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth(memo = "搴撲綅淇敼")
+ @ManagerAuth(memo = "response.loc_mast_update")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
- return R.error();
+ return R.error("response.param_error");
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
- return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ return R.error("response.operation_blocked_contact_admin");
}
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
@@ -123,24 +128,24 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/locMast/delete/auth")
- @ManagerAuth(memo = "搴撲綅鍒犻櫎")
+ @ManagerAuth(memo = "response.loc_mast_delete")
public R delete(@RequestParam String param){
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (LocMast entity : list){
locMastService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/locMast/export/auth")
- @ManagerAuth(memo = "搴撲綅瀵煎嚭")
+ @ManagerAuth(memo = "response.loc_mast_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
@@ -171,20 +176,34 @@
public R query(@RequestBody JSONObject param) {
Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != locMastService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(LocMast.class, String.valueOf(param.get("key"))));
+ return r;
}
- return R.ok();
+ return R.ok("response.operation_success");
+ }
+
+ @PostMapping(value = "/locMast/batchUpdateArea/auth")
+ @ManagerAuth
+ public R batchUpdateArea(@RequestBody JSONObject param) {
+ List<String> locNos = param.getJSONArray("locNos").toJavaList(String.class);
+ Integer areaId = param.getInteger("areaId");
+ if (Cools.isEmpty(locNos) || areaId == null) {
+ return R.error("response.param_error");
+ }
+ locMastService.batchUpdateArea(locNos, areaId.shortValue());
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/locMast/init/auth")
- @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+ @ManagerAuth(memo = "response.loc_mast_init")
// @Transactional
public R init(LocMastInitParam param) {
try{
List<LocMast> list = new ArrayList<>();
BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
if (Cools.isEmpty(basWhs)){
- return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
+ return R.error("response.whs_type_not_exist");
}
for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
@@ -193,27 +212,24 @@
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- if (basWhs.getIdentifying().equals("1") || basWhs.getIdentifying().equals("3")){
- try{
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
- for (List<Integer> node : shelves.nodes){
+ try{
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
+ for (List<Integer> node : shelves.nodes){
- if (node.contains(r)) {
- if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
- crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
- }else {
- crnNo = shelves.nodes.indexOf(node) + 1;
- }
-
- break;
+ if (node.contains(r)) {
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
}
+
+ break;
}
- }catch (Exception e){
- throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
- }else {
- crnNo = param.getStaCrn();
+ }catch (Exception e){
+ throw new Exception("response.crn_parse_error");
}
+
Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
@@ -221,7 +237,7 @@
locMast.setRow1(r); // 鎺�
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
- locMast.setGro1(0); // 缁�
+ locMast.setGro1(r); // 缁�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
locMast.setLocType2(param.getLocType2());
@@ -239,9 +255,9 @@
locMastService.delete(new EntityWrapper<>());
}
locMastService.insertBatch(list);
- return R.ok("鍒濆鍖栨垚鍔�");
+ return R.ok("response.init_success");
}catch (Exception e){
- return R.error("鍒濆鍖栧け璐�===>"+e.getMessage());
+ return R.error("response.init_failed");
}
}
}
--
Gitblit v1.9.1