From e9152bae00b01fc80000d44f726f337084215748 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 21 五月 2025 10:19:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 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 e1951f7..c733f13 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -12,10 +12,8 @@
import com.core.common.R;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
-import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
-import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -27,8 +25,6 @@
@Autowired
private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -138,6 +134,30 @@
return R.ok();
}
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
+ public R update(LocMast locMast){
+ 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);
+ return R.ok();
+ }
+
@RequestMapping(value = "/locMast/init/auth")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
@@ -150,13 +170,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);
@@ -177,7 +197,6 @@
}
}
locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
--
Gitblit v1.9.1