From b09865e3b4e43ec7110ca7472188478fcdb6fb0f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 22 三月 2023 09:41:32 +0800
Subject: [PATCH] #库存档案同步上报
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 150 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 7e061ad..ae31ef8 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -5,15 +5,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.service.LocMastService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
+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.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -23,6 +29,30 @@
@Autowired
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) {
+ if (Cools.isEmpty(pwd)) {
+ return R.error("璇疯緭鍏ュ彛浠�");
+ }
+ return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
+ }
+
+ @PostMapping(value = "/group/empty/stock")
+ @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
+ public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
+ return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
+ }
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -44,14 +74,15 @@
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -72,6 +103,16 @@
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
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.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()));
+ }
}
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
@@ -129,4 +170,104 @@
return R.ok();
}
+ @RequestMapping(value = "/locMast/init/auth")
+ @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+// @Transactional
+ public R init(LocMastInitParam param) {
+ List<LocMast> list = new ArrayList<>();
+ for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
+ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ // 鑾峰彇搴撲綅鍙�
+ 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;
+ }
+ }
+ Date now = new Date();
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocSts("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+ locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
+ locMast.setAppeUser(getUserId());
+ 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<>());
+ locDetlService.delete(new EntityWrapper<>());
+ 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