From 6ee5f8a9a8cbec6bfe559debfc08ad4b8035add5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 14:11:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 4b17fd5..ae31ef8 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -19,6 +19,7 @@
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -30,6 +31,14 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Value("${channel.equipmentRow}")
+ private Integer equipmentRow;
+ @Value("${channel.quietRow}")
+ private Integer quietRow;
+ @Value("${channel.equipmentCount}")
+ private Integer equipmentCount;
+ @Value("${channel.channelMax}")
+ private Integer channelMax;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -195,11 +204,20 @@
locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
+ if (r==equipmentRow){
+ locMast.setChannel(l+(b-2)*param.getEndLev());
+ locMast.setLocType1((short)1);
+ int i = (locMast.getChannel() - 1) / (channelMax / equipmentCount) + 1;
+ locMast.setLocType2((short)i);
+ }
+ if (r==quietRow){
+ locMast.setLocType1((short)2);
+ }
list.add(locMast);
}
}
}
-// locMastService.delete(new EntityWrapper<>());
+ locMastService.delete(new EntityWrapper<>());
locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
@@ -216,13 +234,15 @@
}
private R updateAll(String param,String locSts){
- List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ List<LocMast> locMasts = JSONArray.parseArray(param, LocMast.class);
+ if (Cools.isEmpty(locMasts)){
return R.error();
}
int locType2=99;
- for (LocMast locMast : list){
- if (!locMast.getLocSts().equals(locSts)){
+ for (LocMast locMast : locMasts){
+ if (Cools.isEmpty(locMast.getLocType2()) || locMast.getLocType2() == 0){
+ return R.error("璇烽�夋嫨娴嬭瘯搴撲綅");
+ }else if (!locMast.getLocSts().equals(locSts)){
if (locSts.equals("O")){
return R.error("姝よ澶囦笅鏈夊簱浣嶉潪绌�,搴撲綅鍙凤細"+locMast.getLocNo()+"\t璇锋煡鐪嬪簱浣�");
}else if (locSts.equals("X")){
@@ -239,7 +259,7 @@
}else if (locSts.equals("X")){
locSts="O";
}
- for (LocMast locMast : list){
+ for (LocMast locMast : locMasts){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error("搴撲綅鍙蜂负绌猴細"+locMast);
}
--
Gitblit v1.9.1