From 099f610873497dce15086dfd5b65418e4e0aa003 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 23 十月 2023 14:14:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 5
src/main/java/com/zy/asrs/controller/LocMastController.java | 54 ++++++++++
src/main/java/com/zy/asrs/utils/Utils.java | 184 ++++++++++++++++++++++++++----------
src/main/java/com/zy/asrs/entity/BasDevp.java | 4
src/main/webapp/static/js/locMast/locMast.js | 26 +++++
src/main/java/com/zy/asrs/entity/LocMast.java | 4
src/main/java/com/zy/common/model/LocTypeDto.java | 4
7 files changed, 219 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index e343c2b..d2d4f7d 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.*;
@@ -204,4 +206,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);
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 78ca14c..0e683f1 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -228,9 +228,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "灏忓簱浣�";
case 2:
- return "楂樺簱浣�";
+ return "澶у簱浣�";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..24b93ea 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -215,9 +215,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "灏忓簱浣�";
case 2:
- return "楂樺簱浣�";
+ return "澶у簱浣�";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2b40249..4c80cd8 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,6 +3,8 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
+import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
import java.text.DecimalFormat;
@@ -16,22 +18,22 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static float scale(Float f){
+ public static float scale(Float f) {
if (f == null || f == 0f || Float.isNaN(f)) {
return 0f;
}
return (float) Arith.multiplys(2, f, 1);
}
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
return msg;
- } else if (msg.length() > count){
+ } else if (msg.length() > count) {
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for (int i = 0; i<count-msg.length(); i++){
- msgBuilder.insert(0,"0");
+ for (int i = 0; i < count - msg.length(); i++) {
+ msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
}
@@ -40,7 +42,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return slaveProperties.getDoubleLocs().contains(row);
@@ -52,7 +54,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -63,7 +65,7 @@
/**
* 鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
*/
- public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocsLeft().contains(row);
} else {
@@ -75,7 +77,7 @@
/**
* 鍒ゆ柇鏄惁涓哄彸娣卞簱浣�
*/
- public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocsRight().contains(row);
} else {
@@ -86,7 +88,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return !slaveProperties.getDoubleLocs().contains(row);
@@ -98,7 +100,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return !slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -168,6 +170,26 @@
}
/**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+ */
+ public static int getBay(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(2, 5));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+ */
+ public static int getLev(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(5, 7));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
* 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
*/
public static void toDeepIfEmptyByShallow(String shallowLoc) {
@@ -185,82 +207,136 @@
}
- public static void main(String[] args) {
- SlaveProperties slaveProperties = new SlaveProperties();
- slaveProperties.setDoubleDeep(true);
- List<Integer> list = new ArrayList<>();
- list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
- slaveProperties.setDoubleLocs(list);
- slaveProperties.setGroupCount(4);
- Integer deepRow = getDeepRow(slaveProperties, 6);
- System.out.println(deepRow);
+// public static void main(String[] args) {
+// SlaveProperties slaveProperties = new SlaveProperties();
+// slaveProperties.setDoubleDeep(true);
+// List<Integer> list = new ArrayList<>();
+// list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
+// slaveProperties.setDoubleLocs(list);
+// slaveProperties.setGroupCount(4);
+// Integer deepRow = getDeepRow(slaveProperties, 6);
+// System.out.println(deepRow);
+// }
- }
-
- public static boolean BooleanWhsTypeSta(Integer whsType){
- if (whsType==1){
+ public static boolean BooleanWhsTypeSta(Integer whsType) {
+ if (whsType == 1) {
return true;
}
return false;
}
- public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId){
- if (whsType==1 && staDescId!=11 && staDescId!=111){
+ public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
+ if (whsType == 1 && staDescId != 11 && staDescId != 111) {
return true;
}
return false;
}
- public static int RowCount(Integer whsType,Integer curRow,Integer crnNumber){
- return LocNecessaryParameters(whsType, curRow,crnNumber)[0];
+ public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[0];
}
- public static int getCurRow(Integer whsType,Integer curRow,Integer crnNumber){
- return LocNecessaryParameters(whsType, curRow,crnNumber)[1];
+
+ public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[1];
}
- public static int getCrnNo(Integer whsType,Integer curRow,Integer crnNumber){
- return LocNecessaryParameters(whsType, curRow,crnNumber)[2];
+
+ public static int getCrnNo(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[2];
}
- public static int getNearRow(Integer whsType,Integer curRow,Integer crnNumber){
- return LocNecessaryParameters(whsType, curRow,crnNumber)[3];
+
+ public static int getNearRow(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(Integer whsType,Integer curRow,Integer crnNumber){
- return LocNecessaryParametersDoubleExtension(whsType, curRow,crnNumber);
+ public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber);
}
//缁忓吀鍙屼几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension(Integer whsType,Integer curRow,Integer crnNumber){
- int[] necessaryParameters=new int[]{0,0,0,0};
- if (BooleanWhsTypeSta(whsType)){
+ public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ if (BooleanWhsTypeSta(whsType)) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber*4)){
+ if (curRow.equals(crnNumber * 4)) {
necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
- }else if (curRow.equals(crnNumber*4-3)){
+ } else if (curRow.equals(crnNumber * 4 - 3)) {
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
- }else {
- curRow=curRow+4;
- if (curRow<1 || curRow > (crnNumber*4)){
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
+ } else {
+ curRow = curRow + 4;
+ if (curRow < 1 || curRow > (crnNumber * 4)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow-1)%4==0){
+ if ((curRow - 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow+3)/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- }else if (curRow%4==0){
+ necessaryParameters[2] = (curRow + 3) / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = curRow/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
- }else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
+ necessaryParameters[2] = curRow / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
}
return necessaryParameters;
}
+
+
+ public static void main(String[] args) {
+ List<LocMast> locS = new ArrayList<LocMast>();
+ String locNo = "0000102";
+ for (int i = 1; i < 16; i++) {
+ String s = zerofill(String.valueOf(i), 2) + locNo.substring(2);
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(s);
+ locS.add(locMast);
+ }
+ List<String> innermostSideLoc = getInnermostSideLoc(locS);
+ System.out.println(innermostSideLoc);
+ }
+
+ //杞崲涓哄悇鑷搴旂殑娣卞簱浣�
+ public static List<String> getInnermostSideLoc(List<LocMast> locS) {
+ ArrayList<String> listLocRBL = new ArrayList<>();
+ for (LocMast locMast : locS) {
+ String innermostSideLocRBL = Utils.getInnermostSideLocRBL(locMast.getLocNo());
+ if (Cools.isEmpty(innermostSideLocRBL)) {
+ continue;
+ }
+ if (!listLocRBL.contains(innermostSideLocRBL)) {
+ listLocRBL.add(innermostSideLocRBL);
+ }
+ }
+ return listLocRBL;
+ }
+
+ public static String getInnermostSideLocRBL(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row % 4 == 0 || (row + 3) % 4 == 0) {
+ return zerofill(String.valueOf(row), 2) + locNo.substring(2);
+ } else if ((row + 2) % 4 == 0) {
+ return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2);
+ } else if ((row + 1) % 4 == 0) {
+ return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2);
+ }
+ return null;
+ }
+
+ public static String getInnermostSideLocLBR(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row % 4 == 0) {
+ return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2);
+ } else if ((row + 3) % 4 == 0) {
+ return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2);
+ }
+ return null;
+ }
+
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index c6630aa..08c9f1b 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -30,9 +30,9 @@
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
if (basDevp.getLocType1() == 1) {
- this.locType1 = 1; // 浣庡簱浣�
+ this.locType1 = 1; // 灏忓簱浣�
} else {
- this.locType1 = 2; // 楂樺簱浣�
+ this.locType1 = 2; // 澶у簱浣�
}
log.info(JSON.toJSONString(this));
}
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 54454f9..afe7365 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -229,6 +229,32 @@
})
});
break;
+ case 'convertSize':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾杞崲'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/locMast/convert/size/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
}
});
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 6f4b17d..25692c1 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -76,6 +76,7 @@
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
+ <button class="layui-btn layui-btn-sm" id="btn-convertSize" lay-event="convertSize">澶у皬搴撲綅杞崲</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
@@ -147,8 +148,8 @@
<select name="locType1">
<option style="display: none"></option>
<option value="0">鏈煡</option>
- <option value="1">浣庡簱浣�</option>
- <option value="2">楂樺簱浣�</option>
+ <option value="1">灏忓簱浣�</option>
+ <option value="2">澶у簱浣�</option>
</select>
</div>
</div>
--
Gitblit v1.9.1