From 172506c26d7d1759f9ec3d5dd7c3897793343d07 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 九月 2024 16:58:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 301 +++++++++++++++++++++----------------------------
1 files changed, 129 insertions(+), 172 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3dd5b72..195fe0d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -508,21 +508,18 @@
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
for (int i = times; i < crnNumber*2; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+ rowCount = locNecessaryParameters[0];
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
- if (basCrnpService.checkSiteError(crnNo, true)) {
- rowCount = locNecessaryParameters[0];
- nearRow = locNecessaryParameters[3];
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- if (locMasts.size()<=5){
- times++;
- continue;
- }
- break;
- } else {
+ nearRow = locNecessaryParameters[3];
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
+ if (locMasts.size()<=5){
times++;
+ continue;
}
+ break;
+
}
if (crnNo == 0) {
throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
@@ -572,7 +569,7 @@
}
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInShuttleF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
//鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣嶅瓨鍦�&&闈炴渶澶栦晶搴撲綅&&鍏ュ簱鐘舵��
if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))){
@@ -582,13 +579,13 @@
if (!Cools.isEmpty(wrkDetl) && matnr.equals(wrkDetl.getMatnr())
&& batch.equals(batch.isEmpty() ? "":wrkDetl.getBatch())
&& grade.equals(grade.isEmpty()? "":wrkDetl.getBrand())){
- int row2=0;
- if (Utils.getRow(locMast2.getLocNo())>nearRowW){
- row2=Utils.getRow(locMast2.getLocNo())-1;
+ int bay2=0;
+ if (Utils.getBay(locMast2.getLocNo())>nearRowW){
+ bay2=Utils.getBay(locMast2.getLocNo())-1;
} else {
- row2=Utils.getRow(locMast2.getLocNo())+1;
+ bay2=Utils.getBay(locMast2.getLocNo())+1;
}
- String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
+ String targetLocNo = locMast2.getLocNo().substring(0,2) +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
if (Cools.isEmpty(locMast)){
continue;
@@ -606,6 +603,8 @@
int nearbay = 0;
int nearlev = 0;
for (WrkMast wrkMast:wrkMasts){
+ int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+ int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
if (Cools.isEmpty(wrkMast.getLocNo())){
continue;
}
@@ -625,122 +624,86 @@
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMastGro,rowLastnoType.getType().longValue());
-
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRow && locMast2.getLocSts().equals("S")){
- int row2=0;
- if (Utils.getRow(locMast2.getLocNo())>nearRow){
- row2=Utils.getRow(locMast2.getLocNo())-1;
+ for (int i = 0; i < crnNumber*2; i++) {
+ if (!(Utils.getRow(locMastGro.getLocNo())>nearRowW && Utils.getRow(locMastGro.getLocNo())<=curRowW) && !(Utils.getRow(locMastGro.getLocNo())<nearRowW && Utils.getRow(locMastGro.getLocNo())>=curRowW) ){
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+ curRowW = locNecessaryParameters[1];
+ nearRowW = locNecessaryParameters[3];
}else {
- row2=Utils.getRow(locMast2.getLocNo())+1;
+ break;
}
- String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo));
+ }
+
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInShuttleF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
+ int bay2=0;
+ if (Utils.getBay(locMast2.getLocNo())>nearRowW){
+ bay2=Utils.getBay(locMast2.getLocNo())-1;
+ } else {
+ bay2=Utils.getBay(locMast2.getLocNo())+1;
+ }
+ String targetLocNo = locMast2.getLocNo().substring(0,2) +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
+ if (Cools.isEmpty(locMast)){
+ continue;
+ }
break;
}
}
}
- boolean signRule1 = false;
- boolean signRule2 = false;
-
-
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
-// signRule1 = true;
- }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
- if (!Cools.isEmpty(matnr) && staDescId == 1) {
- signRule2 = true;
- }
-
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
- signRule1 = true;
- }
- }
-
- if (signRule1){
- if (nearRow!=curRow){
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- for (LocMast locMast1:locMasts){
- //鑾峰彇宸烽亾
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
- if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())
- && batch.equals(batch.isEmpty() ? "" : locDetl.getBatch())
- && grade.equals(grade.isEmpty() ? "" : locDetl.getBrand())) {
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- break;
- }
- }
- }
- }
- }else if (signRule2){
- List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
- for (String locNo : locNos) {
- if (Utils.isShallowLoc(slaveProperties, locNo)) {
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
+ if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ int nearbay = 0;
+ int nearlev = 0;
+ for (LocMast locMastSign:locMasts){
+ int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+ int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+ if (Cools.isEmpty(locMastSign.getLocNo())){
continue;
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
+ if (Utils.getRow(locMastSign.getLocNo())==nearRow){
+ continue;
+ }
+ if (Utils.getBay(locMastSign.getLocNo())==nearbay && Utils.getLev(locMastSign.getLocNo())==nearlev){
+ continue;
+ }else {
+ nearbay=Utils.getBay(locMastSign.getLocNo());
+ nearlev=Utils.getLev(locMastSign.getLocNo());
+ }
+// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+ LocMast locMastGro = locMastService.selectById(locMastSign.getLocNo());
+
+ for (int i = 0; i < crnNumber*2; i++) {
+ if (!(Utils.getRow(locMastGro.getLocNo())>nearRowW && Utils.getRow(locMastGro.getLocNo())<=curRowW) && !(Utils.getRow(locMastGro.getLocNo())<nearRowW && Utils.getRow(locMastGro.getLocNo())>=curRowW) ){
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+ curRowW = locNecessaryParameters[1];
+ nearRowW = locNecessaryParameters[3];
+ }else {
+ break;
}
}
- }
- }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
- if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- for (LocMast locMast1:locMasts){
- //鑾峰彇宸烽亾
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("D")){
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInShuttleF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
+ int bay2=0;
+ if (Utils.getBay(locMast2.getLocNo())>nearRowW){
+ bay2=Utils.getBay(locMast2.getLocNo())-1;
+ } else {
+ bay2=Utils.getBay(locMast2.getLocNo())+1;
+ }
+ String targetLocNo = locMast2.getLocNo().substring(0,2) +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
+ if (Cools.isEmpty(locMast)){
+ continue;
+ }
break;
}
}
}
-
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
-// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
-// if (locMasts.size() > 0) {
-// for (LocMast loc : locMasts) {
-// if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
-// continue;
-// }
-// String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
-// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
-// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
-// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-// if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
-// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
-// locMast = shallowLoc;
-// crnNo = locMast.getCrnNo();
-// break;
-// }
-// }
-// }
-// }
-// }
-// }
Wrapper<StaDesc> wrapper = null;
StaDesc staDesc = null;
@@ -754,14 +717,12 @@
.eq("crn_no", crnNo);
staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
crnNo = 0;
}else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
@@ -779,23 +740,49 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
+ .eq("bay1", nearRow)
.eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",true));//鏈�娴呭簱浣�
+ .orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
+ if (locMast != null){
+ break;
+ }
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
-// String shallowLoc = Utils.getDeepLocYTl(slaveProperties, locMast1.getLocNo());
-// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
-// .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
- locMast = locMast2;
- break;
+// LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+// if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
+// locMast = locMast2;
+// break;
+// }
+ List<LocMast> locMasts1 = null;
+ if (curRow < nearRow){
+ locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("gro1", locMast1.getGro1())
+ .orderBy("bay1",true));
+ if(locMasts1.size() == 3 || (curRow>20 && locMasts1.size() == 2)){
+ locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("gro1", locMast1.getGro1())
+ .orderBy("bay1",false));
+ }
+ }else {
+ locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("gro1", locMast1.getGro1())
+ .orderBy("bay1",false));
}
+ if (Cools.isEmpty(locMasts1)) {
+ continue;
+ }
+ for (LocMast locMastGro1 : locMasts1) {
+ if (locMastGro1.getLocSts().equals("O")){
+ locMast = locMastGro1;
+ break;
+ }
+ }
+
+
}
}
@@ -830,21 +817,6 @@
}
}
}
-
-// //鏈壘鍒� 鎵剧涓�鎺�
-// if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
-// locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("row1", 1)
-// .eq("loc_sts", "O")
-// .orderBy("lev1",true).orderBy("bay1",true));
-// for (LocMast locMast1 : locMasts) {
-// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
-// continue;
-// }
-// locMast = locMast1;
-// break;
-// }
-// }
}
// 閫掑綊鏌ヨ
@@ -854,12 +826,6 @@
times = times + 1;
return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
}
-// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
-// if (locTypeDto.getLocType1() < 2) {
-// int i = locTypeDto.getLocType1() + 1;
-// locTypeDto.setLocType1((short)i);
-// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
-// }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -913,21 +879,11 @@
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
- curRow = locNecessaryParameters[1];
- crnNo = locNecessaryParameters[2];
- if (basCrnpService.checkSiteError(crnNo, true)) {
- rowCount = locNecessaryParameters[0];
- nearRow = locNecessaryParameters[3];
- break;
- } else {
- times++;
- }
- }
- if (crnNo == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
- }
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+ curRow = locNecessaryParameters[1];
+ crnNo = locNecessaryParameters[2];
+ rowCount = locNecessaryParameters[0];
+ nearRow = locNecessaryParameters[3];
Wrapper<StaDesc> wrapper = null;
StaDesc staDesc = null;
@@ -973,14 +929,14 @@
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
- locMast = locMast2;
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+// LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+// if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
+ locMast = locMast1;
break;
- }
- }
+// }
+// }
}
}
@@ -989,6 +945,7 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount*2) {
times = times + 1;
+
return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
--
Gitblit v1.9.1