From 351b5e33311a847ad80898a4e29a184a0dbf253a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 19:17:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 86 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 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 8b17005..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) {
@@ -96,9 +105,12 @@
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
- if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) {
- if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) {
+ if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
}
@@ -177,20 +189,30 @@
break;
}
}
+ Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
- locMast.setLocType("O");
+ locMast.setLocSts("O");
locMast.setRow1(r); // 鎺�
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- if (null != param.getWhsType()) {
- locMast.setWhsType(Long.valueOf(param.getWhsType()));
- }
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
locMast.setAppeUser(getUserId());
- locMast.setAppeTime(new Date());
+ locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
- locMast.setModiTime(new Date());
+ 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);
}
}
@@ -200,4 +222,52 @@
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
+ @RequestMapping(value = "/locMast/disableALL/auth")
+ @ManagerAuth(memo = "绂佺敤鎸囧畾璁惧鍙峰簱浣�")
+ public R disableALL(@RequestParam String param){
+ return updateAll(param,"O");
+ }
+ @RequestMapping(value = "/locMast/openAll/auth")
+ @ManagerAuth(memo = "鎵撳紑鎸囧畾璁惧鍙峰簱浣�")
+ public R openAll(@RequestParam String param){
+ return updateAll(param,"X");
+ }
+
+ private R updateAll(String param,String locSts){
+ List<LocMast> locMasts = JSONArray.parseArray(param, LocMast.class);
+ if (Cools.isEmpty(locMasts)){
+ return R.error();
+ }
+ int locType2=99;
+ 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")){
+ return R.error("姝よ澶囦笅鏈夊簱浣嶉潪绂佺敤鐘舵��,搴撲綅鍙凤細"+locMast.getLocNo()+"\t璇锋煡鐪嬪簱浣�");
+ }
+ }else if (locType2==99){
+ locType2 = locMast.getLocType2();
+ }else if(locType2 != locMast.getLocType2()){
+ return R.error("璇烽�夋嫨鍚屼竴璁惧鍙蜂笅鐨勫簱浣�");
+ }
+ }
+ if (locSts.equals("O")){
+ locSts="X";
+ }else if (locSts.equals("X")){
+ locSts="O";
+ }
+ for (LocMast locMast : locMasts){
+ if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
+ return R.error("搴撲綅鍙蜂负绌猴細"+locMast);
+ }
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ locMast.setLocSts(locSts);
+ locMastService.updateById(locMast);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1