From 25e6a77fdca15feccadb9d4ccf5baf83e1bfd62a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 14:04:25 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 2f80733..7b37390 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -62,7 +62,7 @@
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)));
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("STATUS",0)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -145,9 +145,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();
}
@@ -163,13 +176,13 @@
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
- for (List<Integer> node : shelves.nodes){
- if (node.contains(r)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
- break;
- }
- }
+// Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
+// for (List<Integer> node : shelves.nodes){
+// if (node.contains(r)) {
+// crnNo = shelves.nodes.indexOf(node) + 1;
+// break;
+// }
+// }
Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
--
Gitblit v1.9.1