From a51465ed73becec5d836f0b01247bdf1c149b709 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 十二月 2024 14:43:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 144 +++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index df6f1bc..2eae903 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,9 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
@@ -32,6 +34,8 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private BasWhsService basWhsService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -176,95 +180,65 @@
@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;
+ try{
+ List<LocMast> list = new ArrayList<>();
+ BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
+ if (Cools.isEmpty(basWhs)){
+ return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
+ }
+ 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;
+ try{
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
+ for (List<Integer> node : shelves.nodes){
+
+ if (node.contains(r)) {
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
+ break;
+ }
+ }
+ }catch (Exception e){
+ throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
+
+ Date now = new Date();
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocSts("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+ locMast.setGro1(r); // 缁�
+ 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);
+ locMast.setWhsType(basWhs.getId());
+ list.add(locMast);
}
- 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);
- list.add(locMast);
}
}
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
+ locMastService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }catch (Exception e){
+ return R.error("鍒濆鍖栧け璐�===>"+e.getMessage());
}
- locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
- 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