From 4375f7c1ccd8d6b7b3cfb4f641a3ce84b0907594 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 21 四月 2025 16:36:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 02f7233..b56e0dd 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -58,11 +58,40 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- excludeTrash(param);
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
+
+ try{
+ String locNo = null;
+ long whsType = 0L;
+ Integer crnNo = 0;
+ Integer row1 = 0;
+ Integer bay1 = 0;
+ Integer lev1 = 0;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (entry.getKey().equals("whsType")) {
+ whsType = Long.getLong(val);
+ }else if (entry.getKey().equals("locNo")) {
+ locNo = val;
+ }else if (entry.getKey().equals("crnNo")) {
+ crnNo = Integer.getInteger(val);
+ }else if (entry.getKey().equals("row1")) {
+ row1 = Integer.getInteger(val);
+ }else if (entry.getKey().equals("bay1")) {
+ bay1 = Integer.getInteger(val);
+ }else if (entry.getKey().equals("lev1")) {
+ lev1 = Integer.getInteger(val);
+ }
+ }
+ List<LocMast> locMastList = locMastService.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,0,10);
+ Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList);
+ page.setTotal(locMastService.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1));
+ return R.ok(page);
+ }catch (Exception e){
+ return R.error("寮傚父" + e);
+ }
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -116,15 +145,19 @@
@RequestMapping(value = "/locMastQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
- wrapper.like("loc_no", condition);
- Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
+
+ List<LocMast> locMastList = locMastService.selectLocMastList(condition,0,10);
+ Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList);
+ page.setTotal(locMastService.selectLocMastListTotal(condition));
+
List<Map<String, Object>> result = new ArrayList<>();
for (LocMast locMast : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locMast.getLocNo());
- map.put("value", locMast.getLocNo());
- result.add(map);
+ if (!Cools.isEmpty(locMast)){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", locMast.getLocNo());
+ map.put("value", locMast.getLocNo());
+ result.add(map);
+ }
}
return R.ok(result);
}
@@ -145,9 +178,22 @@
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
+ if (!Cools.isEmpty(locMast.getContainerCode())){
+ locMast.setBarcode(locMast.getContainerCode());
+ }
+
+ if (locMast.getEmptyContainer$().equals("N") ){
+ if (locMast.getContainerCode().isEmpty() || locMast.getContainerTypeCode().isEmpty()){
+ return R.error("瀹瑰櫒缂栫爜鎴栧鍣ㄧ被鍨嬫湁璇�");
+ }
+ }
+ if (locMast.getLocSts().equals("O")){
+ locMast.setBarcode(null);
+ }
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
+ locMastService.toWmsLocStatus(locMast);
return R.ok();
}
--
Gitblit v1.9.1