From ce02c16c7c8cf643dda9eade8e958ab2183384b7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 24 十月 2023 15:07:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index af143d0..df6f1bc 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -15,10 +15,12 @@
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -37,6 +39,12 @@
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")
@@ -59,15 +67,25 @@
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){
+ boolean sign = false;
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 if (entry.getKey().equals("loc_no")){
+ wrapper.like(entry.getKey(), val);
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ if (entry.getKey().equals("loc_type1")){
+ sign=true;
+ }
+ wrapper.eq(entry.getKey(), val);
}
+ }
+ if (sign){
+ wrapper.and().ne("loc_sts","Y");
}
}
@@ -89,9 +107,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()));
}
}
@@ -170,20 +191,21 @@
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);
list.add(locMast);
}
}
@@ -193,4 +215,56 @@
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
+
+ @RequestMapping(value = "/locMast/convert/size/auth")
+ @ManagerAuth(memo = "澶у皬搴撲綅杞崲")
+ @Transactional
+ public R convertSize(@RequestParam String param) {
+ List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (LocMast entity : list){
+ if (!entity.getCrnNo().equals(1) && !entity.getCrnNo().equals(4)){
+ return R.error("璇烽�夋嫨1鍙枫��4鍙峰爢鍨涙満鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細"+entity.getLocNo());
+ }
+ if (!entity.getLocSts().equals("O") && !entity.getLocSts().equals("Y")){
+ return R.error("璇烽�夋嫨绌洪棽銆佽鍚堝苟鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細"+entity.getLocNo());
+ }
+ }
+ List<String> innermostSideLoc = Utils.getInnermostSideLoc(list);
+ StringBuilder msg=new StringBuilder();
+ for (String locNo : innermostSideLoc){
+ String innermostSideLocLBR = Utils.getInnermostSideLocLBR(locNo);
+ LocMast locMast1 = locMastService.selectById(innermostSideLocLBR);//娴�
+ if (Cools.isEmpty(locMast1)){
+ msg.append("璇烽�夋嫨娴呭簱浣嶅瓨鍦ㄧ殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(innermostSideLocLBR).append("/n");
+ continue;
+ }
+ if (!locMast1.getLocSts().equals("O")){
+ msg.append("璇烽�夋嫨娴呭簱浣嶇┖闂茬殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(locMast1.getLocNo()).append("/n");
+ continue;
+ }
+ LocMast locMast = locMastService.selectById(locNo);//娣�
+ if (Cools.isEmpty(locMast)){
+ msg.append("璇烽�夋嫨娣卞簱浣嶅瓨鍦ㄧ殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(locNo).append("/n");
+ continue;
+ }
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("O")){
+ locMast1.setLocType1((short)2);
+ locMast.setLocType1((short)2);
+ locMast.setLocSts("Y");
+ }else if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("Y")){
+ locMast1.setLocType1((short)1);
+ locMast.setLocType1((short)1);
+ locMast.setLocSts("O");
+ }else {
+ msg.append("璇烽�夋嫨娣卞簱浣嶅簱浣嶇┖闂层�佽鍚堝苟鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細").append(locMast.getLocNo()).append("/n");
+ continue;
+ }
+ locMastService.updateById(locMast1);
+ locMastService.updateById(locMast);
+ }
+ return R.ok(msg);
+ }
}
--
Gitblit v1.9.1