From c9e539c01c8c0383b83046168e523ed438618263 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 16:04:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 1155 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 854 insertions(+), 301 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2a10d14..e20d4dd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,26 +3,23 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
@@ -56,9 +53,14 @@
private SlaveProperties slaveProperties;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private MatService matService;
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -71,17 +73,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
while (true) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0){
+ if (workNo > 0) {
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -89,7 +91,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -98,14 +100,14 @@
//鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
@Transactional
- public StartupDto getScanBarcodeEmptyBoard(){
+ public StartupDto getScanBarcodeEmptyBoard() {
StartupDto startupDto = new StartupDto();
Integer staNo = 0;
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
- staNo=216;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216)) < 2) {
+ staNo = 216;
}
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
- staNo=220;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220)) < 2) {
+ staNo = 220;
}
startupDto.setStaNo(staNo);
@@ -115,64 +117,505 @@
/**
* 妫�绱㈠簱浣嶅彿
*
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo( Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
- try{
- Integer whsType = Utils.GetWhsType(sourceStaNo);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
- /**
- * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
- */
- switch (rowLastnoType.getType()){
- case 1:
- return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- case 2:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
- case 3:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
- case 4:
- return getLocNoRun4(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0);
- case 5:
- return getLocNoRun5(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- default:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto, String barcode) {
+ List<Integer> crnList = new ArrayList<>();
+ if (barcode.startsWith("11")) {
+ crnList.add(4);
+ crnList.add(5);
+
+ Config config = configService.selectConfigByCode("11CrnConfig");
+ List<Integer> list = JSON.parseArray(config.getValue(), Integer.class);
+ for (Integer crn : list) {
+ crnList.remove(crn);
}
- }catch (Exception e){
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ if (crnList.isEmpty()) {
+ crnList.add(4);
+ crnList.add(5);
+
+ configService.updateValue("11CrnConfig", "[]");
+ }else {
+ if (!list.isEmpty()) {
+ crnList.addAll(list);
+ }
+ }
+ }else if (barcode.startsWith("13")) {
+ crnList.add(1);
+ crnList.add(2);
+ crnList.add(3);
+
+ Config config = configService.selectConfigByCode("13CrnConfig");
+ List<Integer> list = JSON.parseArray(config.getValue(), Integer.class);
+ for (Integer crn : list) {
+ crnList.remove(crn);
+ }
+
+ if (crnList.isEmpty()) {
+ crnList.add(1);
+ crnList.add(2);
+ crnList.add(3);
+
+ configService.updateValue("13CrnConfig", "[]");
+ }else {
+ if (!list.isEmpty()) {
+ crnList.addAll(list);
+ }
+ }
+
+ if (staDescId != 10) {
+ //妫�娴嬫槸鍚︿负鍛嗘粸鏂�
+ String matnr = findLocNoAttributeVo.getMatnr();
+ Mat mat = matService.selectByMatnr(matnr);
+ if (mat == null) {
+ throw new CoolException(matnr + "鐗╂枡淇℃伅涓嶅瓨鍦�");
+ }
+
+ if (mat.getTscp() != null && mat.getTscp() == 1) {
+ crnList.add(0, 1);
+ }
+ }
+ }else if (barcode.startsWith("16")) {
+ crnList.add(6);
+ }else {
+ throw new CoolException("鎵樼洏鐮�:{}" + barcode + "瑙勫垯閿欒锛屾棤娉曟壘鍒板尮閰嶅爢鍨涙満");
}
- return null;
+
+ StartupDto startupDto = null;
+ StringBuilder builder = new StringBuilder();
+ for (Integer crnNo : crnList) {
+ try {
+ startupDto = searchLocNoByCrnNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto, crnNo);
+ if(startupDto != null) {
+ break;
+ }
+ } catch (Exception e) {
+ builder.append(e.getMessage()).append(",");
+ }
+ }
+
+ if(startupDto == null) {
+ builder.append("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException(builder.toString());
+ }
+
+ Integer crnNo = startupDto.getCrnNo();
+ if (barcode.startsWith("11")) {
+ Config config = configService.selectConfigByCode("11CrnConfig");
+ List<Integer> list = JSON.parseArray(config.getValue(), Integer.class);
+ List<Integer> newList = new ArrayList<>();
+ for (Integer crn : list) {
+ if(crn == crnNo) {
+ continue;
+ }
+ newList.add(crn);
+ }
+ newList.add(crnNo);
+ configService.updateValue("11CrnConfig", JSON.toJSONString(newList));
+ }else if (barcode.startsWith("13")) {
+ Config config = configService.selectConfigByCode("13CrnConfig");
+ List<Integer> list = JSON.parseArray(config.getValue(), Integer.class);
+ List<Integer> newList = new ArrayList<>();
+ for (Integer crn : list) {
+ if(crn == crnNo) {
+ continue;
+ }
+ newList.add(crn);
+ }
+ newList.add(crnNo);
+ configService.updateValue("13CrnConfig", JSON.toJSONString(newList));
+ }
+
+ return startupDto;
}
/**
* 妫�绱㈠簱浣嶅彿
*
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
- matnr = "";
+ public StartupDto searchLocNoByCrnNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto, Integer crnNo) {
+ Config devpTaskStackOverConfig = configService.selectConfigByCode("devpTaskStackOver");
+ int devpTaskStackOver = Integer.parseInt(devpTaskStackOverConfig.getValue());
+ Integer devpWorkingCount = queryDevpWorkingCount();
+ if (devpWorkingCount > devpTaskStackOver) {
+ throw new CoolException("杈撻�佺嚎浠诲姟杩囪浇锛屽綋鍓嶈緭閫佺嚎鎵胯浇鏁伴噺:{}" + devpWorkingCount);
}
- if (Cools.isEmpty(batch)) { //鎵规
- batch = "";
+
+ if (!basCrnpService.checkSiteError(crnNo, true)) {
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満寮傚父");
}
- if (Cools.isEmpty(grade)) { //澶囩敤
- grade = "";
+
+ Config crnSearchDetectTaskCountConfig = configService.selectConfigByCode("crnSearchDetectTaskCount");
+ int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
+
+ Config applyInTaskTotalCountConfig = configService.selectConfigByCode("applyInTaskTotalCount");
+ int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
+
+ Config emptyInKeepLimitConfig = configService.selectConfigByCode("emptyInKeepLimit");
+ int emptyInKeepLimit = Integer.parseInt(emptyInKeepLimitConfig.getValue());
+
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57));
+ if (wrkMasts.size() > crnSearchDetectTaskCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), crnSearchDetectTaskCount);
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒");
}
+
+ List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57, 101, 103, 107, 110));
+ if (wrkMastsList.size() > applyInTaskTotalCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛侊紒锛� 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMastsList.size(), applyInTaskTotalCount);
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛�");
+ }
+
+ List<LocMast> searchLocMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", locTypeDto.getLocType1()).eq("loc_sts", "O").eq("crn_no", crnNo));
+ if (searchLocMasts.size() <= emptyInKeepLimit) {
+ log.error(crnNo + "鍙峰爢鍨涙満鍒拌揪绌哄簱浣嶉鐣欎笂闄愶紒锛侊紒 灏哄瑙勬牸锛� {}", JSON.toJSONString(locTypeDto));
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満鍒拌揪绌哄簱浣嶉鐣欎笂闄愶紒灏哄瑙勬牸锛�" + (locTypeDto.getLocType1() == 1 ? "楂�" : "浣�"));
+ }
+
+ if (crnNo == 1) {
+ if (wrkMasts.size() >= 1) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), 1);
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒");
+ }
+ }
+
+ LocMast locMast = null;
+ if (staDescId == 10) {
+ //鎼滅储绌烘墭鐩�
+ locMast = searchEmptyPallet(crnNo, locTypeDto);
+ }else {
+ //婊℃墭鐩�
+ locMast = searchMaxPallet(crnNo, findLocNoAttributeVo, locTypeDto);
+ }
+
+ if(locMast == null) {
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満鎵句笉鍒扮鍚堝昂瀵哥殑绌哄簱浣�");
+ }
+
+ StartupDto startupDto = new StartupDto();
+
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ } else {
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
+ String locNo = locMast.getLocNo();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+ return startupDto;
+ }
+
+ public Integer queryDevpWorkingCount() {
+ List<WrkMast> wrkMastsIn = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 2, 3, 4, 5));
+
+ List<WrkMast> wrkMastsOut = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 12, 14, 15));
+
+ int count = 0;
+ count += wrkMastsIn.size();
+ count += wrkMastsOut.size();
+ return count;
+ }
+
+ //鎼滅储婊℃墭鐩樺簱浣�
+ public LocMast searchMaxPallet(Integer crnNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ //鑾峰彇鍫嗗灈鏈烘帓
+ List<Integer> rowList = locMastService.selectRowByCrnNo(crnNo);
+ //鑾峰彇娣卞簱浣嶆帓
+ List<Integer> deepRowList = new ArrayList<>();
+ for (Integer row : rowList) {
+ if (Utils.isDeepLoc(slaveProperties, row)) {
+ deepRowList.add(row);
+ }
+ }
+
+ LocMast targetLocMast = null;
+ List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr(), deepRowList);
+ for (String locNo : locNos) {
+ //妫�娴嬪搴旀祬搴撲綅鏄惁鍙敤
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+ targetLocMast = shallowLoc;
+ break;
+ }
+ }
+ }
+
+ if(targetLocMast == null) {
+ if (crnNo == 1) {
+ return searchMaxPalletByOne(crnNo, findLocNoAttributeVo, locTypeDto);
+ }
+
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈡繁搴撲綅鍙敤绌哄簱浣�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo)
+ .eq("loc_sts", "O")
+ .in("row1", deepRowList)
+ .orderBy("lev1", true)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ //娣卞簱浣嶇洿鎺ラ�夋嫨
+ targetLocMast = locMast;
+ break;
+ }
+
+ if(targetLocMast == null) {
+ //娣卞簱浣嶆悳绱㈠け璐ワ紝鎼滅储鍙敤绌哄簱浣�
+ List<LocMast> shallowLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo)
+ .eq("loc_sts", "O")
+ .orderBy("lev1", true)
+ .orderBy("bay1", true));
+ for (LocMast locMast : shallowLocMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ targetLocMast = locMast;
+ break;
+ }
+ }
+
+ }
+
+ return targetLocMast;
+ }
+
+ //1鍙峰爢鍨涙満鎼滅储閫昏緫
+ public LocMast searchMaxPalletByOne(Integer crnNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
+
+ LocMast targetLocMast = null;
+ for (Integer row : nearRowList) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈡繁搴撲綅鍙敤绌哄簱浣�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo)
+ .eq("loc_sts", "O")
+ .eq("row1", row)
+ .orderBy("lev1", true)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ //娣卞簱浣嶇洿鎺ラ�夋嫨
+ targetLocMast = locMast;
+ break;
+ }
+
+ if (targetLocMast != null) {
+ break;
+ }
+ }
+
+ return targetLocMast;
+ }
+
+ //鎼滅储绌烘墭鐩�
+ public LocMast searchEmptyPallet(Integer crnNo, LocTypeDto locTypeDto) {
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ LocMast targetLocMast = null;
+
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "D")
+ .eq("crn_no", crnNo)
+ );
+ 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)) {
+ targetLocMast = shallowLoc;
+ break;
+ }
+ }
+ }
+
+ if (targetLocMast == null) {
+ List<LocMast> locMastsList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("crn_no", crnNo)
+ .orderBy("lev1", false)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMastsList) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ boolean shallowLoc = Utils.isShallowLoc(slaveProperties, locMast.getLocNo());
+ if (shallowLoc) {
+ //娴呭簱浣嶏紝鍏堝垽鏂繁搴撲綅
+ String deepLoc2 = Utils.getDeepLoc2(slaveProperties, locMast.getLocNo());
+ if (!Cools.isEmpty(deepLoc2)) {
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", deepLoc2)
+ .eq("loc_sts", "O")
+ .eq("crn_no", crnNo)
+ );
+ if (!Cools.isEmpty(locMast2)) {
+ targetLocMast = locMast2;
+ break;
+ }
+ }
+ }else {
+ //绌虹殑娣卞簱浣嶇洿鎺ラ�夋嫨
+ targetLocMast = locMast;
+ break;
+ }
+ }
+
+ if(targetLocMast == null) {
+ //娣卞簱浣嶆壘瀹岄兘娌℃壘鍒帮紝鐩存帴鎵炬祬搴撲綅
+ for (LocMast locMast : locMastsList) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ //绌哄簱浣嶇洿鎺ラ�夋嫨
+ targetLocMast = locMast;
+ }
+ }
+ }
+
+ return targetLocMast;
+ }
+
+// /**
+// * 妫�绱㈠簱浣嶅彿
+// *
+// * @param staDescId 璺緞ID
+// * @param sourceStaNo 婧愮珯
+// * @param findLocNoAttributeVo 灞炴��
+// * @param locTypeDto 绫诲瀷
+// * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+// */
+// @Transactional
+// public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+// // try {
+// Integer whsType = Utils.GetWhsType(sourceStaNo);
+// RowLastno rowLastno = rowLastnoService.selectById(whsType);
+// RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+// /**
+// * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
+// */
+// switch (rowLastnoType.getType()) {
+// case 1:
+// Config crnSearchDetectTaskCountConfig = configService.selectConfigByCode("crnSearchDetectTaskCount");
+// int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
+//
+// Config applyInTaskTotalCountConfig = configService.selectConfigByCode("applyInTaskTotalCount");
+// int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
+// int crnNo = 7;
+// boolean flag = true;
+// List<String> data = new ArrayList<>();
+// while (crnNo > 1) {
+// crnNo--;
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", crnNo).eq("whs_type", rowLastnoType.getType().longValue()).eq("loc_type1", locTypeDto.getLocType1()).eq("loc_type2", locTypeDto.getLocType2()));
+// if (locMasts.size() <= 15) {
+// log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}", JSON.toJSONString(locTypeDto));
+// data.add(crnNo + "鍙锋病鏈夌┖搴撲綅;");
+// } else {
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57));
+// if (wrkMasts.size() > crnSearchDetectTaskCount) {
+// log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), crnSearchDetectTaskCount);
+// data.add(crnNo + "鍙峰叆搴撴帶鍒朵笂闄�;");
+// continue;
+// }
+// List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57, 101, 103, 107, 110));
+// if (wrkMastsList.size() > applyInTaskTotalCount) {
+// log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛侊紒锛� 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMastsList.size(), applyInTaskTotalCount);
+// data.add(crnNo + "鍙风敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�;");
+// continue;
+// }
+// flag = false;
+// break;
+// }
+//
+// }
+// if (!flag) {
+// return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+// } else {
+// log.info("鏁版嵁锛歿}", data);
+// throw new CoolException(data.toString());
+// }
+// case 2:
+// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+// break;
+// case 3:
+// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+// break;
+// case 4:
+// return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
+// case 5:
+// return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+// default:
+// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+// break;
+// }
+//
+//// } catch (Exception e) {
+//// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒欙紝{}", sourceStaNo, e.getMessage());
+//// }
+// return null;
+// }
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param moveCrnNo 婧�
+ * @param locTypeDto 绫诲瀷
+ * @param times 杞娆℃暟
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
// 鍒濆鍖栧弬鏁�
int crnNo = 0; //鍫嗗灈鏈哄彿
@@ -198,28 +641,49 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
- if (times==0){
- curRow = moveCrnNo*4-1;
- }else {
- curRow = moveCrnNo*4-2;
+ if (times == 0) {
+ curRow = moveCrnNo * 4 - 1;
+ } else {
+ curRow = moveCrnNo * 4 - 2;
}
}
+
+ Config crnSearchDetectTaskCountConfig = configService.selectConfigByCode("crnSearchDetectTaskCount");
+ int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
+
+ Config applyInTaskTotalCountConfig = configService.selectConfigByCode("applyInTaskTotalCount");
+ int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
+
+ Config crnSearchListConfig = configService.selectConfigByCode("123CrnSearchList");
+ int crnSearchList = Integer.parseInt(crnSearchListConfig.getValue());
+
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
+ 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];
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57));
+ if (wrkMasts.size() > crnSearchDetectTaskCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), crnSearchDetectTaskCount);
+ continue;
+ }
+
+ List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57, 101, 103, 107, 110));
+ if (wrkMastsList.size() > applyInTaskTotalCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛侊紒锛� 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMastsList.size(), applyInTaskTotalCount);
+ continue;
+ }
+
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
- if (locMasts.size()-crnCountO<=2){
- log.error(crnNo+"鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
+ if (locMasts.size() - crnCountO <= 15) {
+ log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
nearRow = 0;
times++;
continue;
@@ -229,53 +693,166 @@
times++;
}
}
+
+ //浼樺寲绯荤粺锛屾彁楂樻悳绱�1鍙峰爢鍨涙満娆℃暟
+ if (crnNo == 2 || crnNo == 3) {
+ if (crnSearchList >= 2) {
+ if (basCrnpService.checkSiteError(1, true)) {
+ boolean flag = true;
+ //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
+ crnNo = 1;
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57));
+ if (wrkMasts.size() > crnSearchDetectTaskCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), crnSearchDetectTaskCount);
+ flag = false;
+ }
+
+ List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57, 101, 103, 107, 110));
+ if (wrkMastsList.size() > applyInTaskTotalCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛侊紒锛� 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMastsList.size(), applyInTaskTotalCount);
+ flag = false;
+ }
+
+ if (flag) {
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
+ for (Integer near : nearRowList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", near).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).eq("loc_type1", locTypeDto.getLocType1()).eq("loc_type2", locTypeDto.getLocType2()));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
+ if (locMasts.size() - crnCountO <= 15) {
+ log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ } else {
+ nearRow = near;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ if (locTypeDto.getLocType2() == 2) {
+ //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
+ crnNo = 1;
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ boolean flag = true;
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57));
+ if (wrkMasts.size() > crnSearchDetectTaskCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), crnSearchDetectTaskCount);
+ flag = false;
+ }
+
+ List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("io_type", 1, 10, 53, 57, 101, 103, 107, 110));
+ if (wrkMastsList.size() > applyInTaskTotalCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛侊紒锛� 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMastsList.size(), applyInTaskTotalCount);
+ flag = false;
+ }
+
+ if (flag) {
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
+ for (Integer near : nearRowList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", near).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).eq("loc_type1", locTypeDto.getLocType1()).eq("loc_type2", locTypeDto.getLocType2()));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
+ if (locMasts.size() - crnCountO <= 15) {
+ log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ } else {
+ nearRow = near;
+ break;
+ }
+ }
+ }
+ }
+
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
+ }
+// else {
+// throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+// }
}
boolean signRule1 = false;
boolean signRule2 = false;
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
- if (!Cools.isEmpty(matnr) && staDescId == 1) {
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
signRule2 = true;
}
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (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 locMastGro = locMastService.selectById(wrkMast.getLocNo());
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
+ 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) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+
+ if (crnNo == 1) {
+ if (locMast1.getRow1() == 1 || locMast1.getRow1() == 6) {
+ locMast = locMast1;//鍗曟繁搴撲綅鐩存帴浣跨敤
+ break;
+ }
+
+ //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("whs_type", rowLastnoType.getType().longValue()).eq("crn_no", locMast1.getCrnNo()).eq("bay1", locMast1.getBay1()).notIn("loc_sts", "O").orderBy("row1", false));
+ if (locMastList.isEmpty()) {
+ locMast = locMast1;
+ break;
+ }
+
+ LocMast locMastF = locMastList.get(0);
+ if (!slaveProperties.getDoubleLocs().contains(locMastF.getRow1())) {
+ continue;
+ }
+
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())) {
+ if (!Cools.isEmpty(locDetl) && findLocNoAttributeVo.beSimilar(locDetl)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, locMastF.getLocNo());
+ LocMast shallowLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ if (shallowLocMast != null) {
+ locMast = shallowLocMast;
+ break;
+ }
+ }
+ continue;
+ }
+
+ //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ 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) && findLocNoAttributeVo.beSimilar(locDetl)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
break;
}
}
}
}
- }else if (signRule2){
- List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
+ } else if (signRule2) {
+ List<String> locNos = locDetlService.getSameDetlToday(findLocNoAttributeVo.getMatnr(), sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
@@ -312,9 +889,8 @@
// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type",rowLastnoType.getType().longValue()));
+ if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type", rowLastnoType.getType().longValue()));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -340,49 +916,27 @@
StaDesc staDesc = null;
BasDevp staNo = null;
+
if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
- // 鑾峰彇鐩爣绔�
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .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("鍏ュ簱璺緞涓嶅瓨鍦�");
- 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());
- }
+
// 鏇存柊搴撲綅鎺掑彿
- if (Cools.isEmpty(locMast)){
+ if (Cools.isEmpty(locMast)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
}
-
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",true));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).ne("inv_wh", 1).orderBy("lev1", true).orderBy("bay1", true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast2;
break;
@@ -395,27 +949,24 @@
}
}
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
String shallowLoc = Utils.getDeepLoc(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.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast2;
break;
} else {
- locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type",rowLastnoType.getType().longValue()));
+ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast1;
break;
} else {
- locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type",rowLastnoType.getType().longValue()));
+ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast1;
break;
@@ -439,9 +990,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
@@ -449,31 +1000,56 @@
// locTypeDto.setLocType1((short)i);
// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
// }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿},{}", JSON.toJSONString(locTypeDto), times, moveCrnNo);
throw new CoolException("娌℃湁绌哄簱浣�");
}
- String locNo = locMast.getLocNo();
+ if (crnNo == 2 || crnNo == 3) {
+ crnSearchList++;
+ configService.updateValue("123CrnSearchList", String.valueOf(crnSearchList));
+ }
+
+ if (crnNo == 1) {
+ configService.updateValue("123CrnSearchList", String.valueOf(0));
+ }
+ //閽堝1鍙峰爢鍨涙満鎵撶殑琛ヤ竵锛岄槻姝㈡壘鍒板簱浣嶆椂锛屾壘鍒版渶娴呭簱浣�
+ String deepLoc2 = Utils.getDeepLoc2(slaveProperties, locMast.getLocNo());
+ if (!Cools.isEmpty(deepLoc2)) {
+ LocMast locMastNew = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", locMast.getCrnNo()).eq("loc_no", deepLoc2).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ if (!Cools.isEmpty(locMastNew)) {
+ locMast = locMastNew;
+ }
+ }
+
+
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ 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());
+ }
+ String locNo = locMast.getLocNo();
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
return startupDto;
}
- public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
- matnr = "";
- }
- if (Cools.isEmpty(batch)) { //鎵规
- batch = "";
- }
- if (Cools.isEmpty(grade)) { //澶囩敤
- grade = "";
- }
+ public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
// 鍒濆鍖栧弬鏁�
int crnNo = 0; //鍫嗗灈鏈哄彿
@@ -498,7 +1074,7 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
// if (times==0){
// curRow = moveCrnNo*4-1;
@@ -508,15 +1084,15 @@
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
+ for (int i = times; i < crnNumber * 2; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
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){
+ 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) {
+ nearRow = 0;
times++;
continue;
}
@@ -529,67 +1105,65 @@
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
//鏌ヨ鐩镐技宸ヤ綔妗ｆ
- List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetl(staDescId, findLocNoAttributeVo, crnNo);
int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
int nearlev = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅灞�
- for (WrkMast wrkMast:wrkMasts){
+ for (WrkMast wrkMast : wrkMasts) {
int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
- if (Cools.isEmpty(wrkMast.getLocNo())){
+ if (Cools.isEmpty(wrkMast.getLocNo())) {
continue;
}
//鐩爣鎺掍负鏈�澶栧眰鎺�
- if (Utils.getRow(wrkMast.getLocNo())==nearRow){
+ if (Utils.getRow(wrkMast.getLocNo()) == nearRow) {
continue;
}
//璧峰绔欎笉涓�鑷�
- if (!wrkMast.getSourceStaNo().equals(sourceStaNo)){
+ if (!wrkMast.getSourceStaNo().equals(sourceStaNo)) {
continue;
}
//鐩稿悓鍒椼�佸眰杩囨护
- if (Utils.getBay(wrkMast.getLocNo())==nearbay && Utils.getLev(wrkMast.getLocNo())==nearlev){
+ if (Utils.getBay(wrkMast.getLocNo()) == nearbay && Utils.getLev(wrkMast.getLocNo()) == nearlev) {
continue;
- }else {
- nearbay=Utils.getBay(wrkMast.getLocNo());
- nearlev=Utils.getLev(wrkMast.getLocNo());
+ } else {
+ nearbay = Utils.getBay(wrkMast.getLocNo());
+ nearlev = Utils.getLev(wrkMast.getLocNo());
}
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(wrkMast.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) ){
+ 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 {
+ } else {
break;
}
}
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
//鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣嶅瓨鍦�&&闈炴渶澶栦晶搴撲綅&&鍏ュ簱鐘舵��
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))){
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))) {
//鑾峰彇搴撳瓨鏄庣粏
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
//鍒ゆ柇鍚岃鏍肩墿鏂�
- 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;
+ if (!Cools.isEmpty(wrkDetl) && findLocNoAttributeVo.beSimilar(wrkDetl)) {
+ int row2 = 0;
+ if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+ row2 = Utils.getRow(locMast2.getLocNo()) - 1;
} else {
- row2=Utils.getRow(locMast2.getLocNo())+1;
+ row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
- if (Cools.isEmpty(locMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ if (Cools.isEmpty(locMast)) {
continue;
}
break;
@@ -601,53 +1175,53 @@
// 鐩镐技宸ヤ綔妗� --- 绌烘墭
if (Cools.isEmpty(locMast) && staDescId == 10) {
- List<WrkMast> wrkMasts =wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type",10).eq("crn_no",crnNo).eq("whs_type",rowLastnoType.getType().longValue()));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10).eq("crn_no", crnNo).eq("whs_type", rowLastnoType.getType().longValue()));
int nearbay = 0;
int nearlev = 0;
- for (WrkMast wrkMast:wrkMasts){
+ for (WrkMast wrkMast : wrkMasts) {
int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
- if (Cools.isEmpty(wrkMast.getLocNo())){
+ if (Cools.isEmpty(wrkMast.getLocNo())) {
continue;
}
- if (Utils.getRow(wrkMast.getLocNo())==nearRow){
+ if (Utils.getRow(wrkMast.getLocNo()) == nearRow) {
continue;
}
//璧峰绔欎笉涓�鑷�
- if (!wrkMast.getSourceStaNo().equals(sourceStaNo)){
+ if (!wrkMast.getSourceStaNo().equals(sourceStaNo)) {
continue;
}
- if (Utils.getBay(wrkMast.getLocNo())==nearbay && Utils.getLev(wrkMast.getLocNo())==nearlev){
+ if (Utils.getBay(wrkMast.getLocNo()) == nearbay && Utils.getLev(wrkMast.getLocNo()) == nearlev) {
continue;
- }else {
- nearbay=Utils.getBay(wrkMast.getLocNo());
- nearlev=Utils.getLev(wrkMast.getLocNo());
+ } else {
+ nearbay = Utils.getBay(wrkMast.getLocNo());
+ nearlev = Utils.getLev(wrkMast.getLocNo());
}
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(wrkMast.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) ){
+ 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 {
+ } else {
break;
}
}
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
- int row2=0;
- if (Utils.getRow(locMast2.getLocNo())>nearRowW){
- row2=Utils.getRow(locMast2.getLocNo())-1;
- }else {
- row2=Utils.getRow(locMast2.getLocNo())+1;
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+ int row2 = 0;
+ if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+ row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+ } else {
+ row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
- if (Cools.isEmpty(locMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ if (Cools.isEmpty(locMast)) {
continue;
}
break;
@@ -659,86 +1233,83 @@
boolean signRule2 = false;
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
// signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
- if (!Cools.isEmpty(matnr) && staDescId == 1) {
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
signRule2 = true;
}
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (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){
+ 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")){
+ 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())) {
+ if (!Cools.isEmpty(locDetl) && findLocNoAttributeVo.beSimilar(locDetl)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
break;
}
}
}
}
- }else if (signRule2){
- List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
+ } else if (signRule2) {
+ List<String> locNos = locDetlService.getSameDetlToday(findLocNoAttributeVo.getMatnr(), sRow, eRow);
int nearbay = 0;
int nearlev = 0;
for (String locNo : locNos) {
int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
- if (Cools.isEmpty(locNo)){
+ if (Cools.isEmpty(locNo)) {
continue;
}
- if (Utils.getRow(locNo)==nearRow){
+ if (Utils.getRow(locNo) == nearRow) {
continue;
}
- if (Utils.getBay(locNo)==nearbay && Utils.getLev(locNo)==nearlev){
+ if (Utils.getBay(locNo) == nearbay && Utils.getLev(locNo) == nearlev) {
continue;
- }else {
- nearbay=Utils.getBay(locNo);
- nearlev=Utils.getLev(locNo);
+ } else {
+ nearbay = Utils.getBay(locNo);
+ nearlev = Utils.getLev(locNo);
}
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(locNo);
- 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) ){
+ 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 {
+ } else {
break;
}
}
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
- int row2=0;
- if (Utils.getRow(locMast2.getLocNo())>nearRowW){
- row2=Utils.getRow(locMast2.getLocNo())-1;
- }else {
- row2=Utils.getRow(locMast2.getLocNo())+1;
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+ int row2 = 0;
+ if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+ row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+ } else {
+ row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
- if (Cools.isEmpty(locMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ if (Cools.isEmpty(locMast)) {
continue;
}
break;
@@ -763,50 +1334,50 @@
// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ 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){
+ for (LocMast locMastSign : locMasts) {
int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
- if (Cools.isEmpty(locMastSign.getLocNo())){
+ if (Cools.isEmpty(locMastSign.getLocNo())) {
continue;
}
- if (Utils.getRow(locMastSign.getLocNo())==nearRow){
+ if (Utils.getRow(locMastSign.getLocNo()) == nearRow) {
continue;
}
- if (Utils.getBay(locMastSign.getLocNo())==nearbay && Utils.getLev(locMastSign.getLocNo())==nearlev){
+ if (Utils.getBay(locMastSign.getLocNo()) == nearbay && Utils.getLev(locMastSign.getLocNo()) == nearlev) {
continue;
- }else {
- nearbay=Utils.getBay(locMastSign.getLocNo());
- nearlev=Utils.getLev(locMastSign.getLocNo());
+ } 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) ){
+ 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 {
+ } else {
break;
}
}
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
- int row2=0;
- if (Utils.getRow(locMast2.getLocNo())>nearRowW){
- row2=Utils.getRow(locMast2.getLocNo())-1;
- }else {
- row2=Utils.getRow(locMast2.getLocNo())+1;
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+ int row2 = 0;
+ if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+ row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+ } else {
+ row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
- if (Cools.isEmpty(locMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ if (Cools.isEmpty(locMast)) {
continue;
}
break;
@@ -820,18 +1391,15 @@
if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
// 鑾峰彇鐩爣绔�
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
+ wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", crnNo);
staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
@@ -848,18 +1416,17 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",true));//鏈�娴呭簱浣�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
+ //System.out.println(nearRow);
+ //System.out.println(curRow);
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
locMast = locMast2;
break;
}
@@ -868,26 +1435,26 @@
}
//鏈壘鍒� 鍏佽娣锋枡
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
if (Cools.isEmpty(locMast2)) {
- LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMast3)) {
locMast = locMast3;
break;
}
} else {
- if ((locMast2.getLocSts().equals("F") && staDescId == 1) || (locMast2.getLocSts().equals("D") && staDescId == 10)){
- LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ if ((locMast2.getLocSts().equals("F") && staDescId == 1) || (locMast2.getLocSts().equals("D") && staDescId == 10)) {
+ LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMast3)) {
locMast = locMast3;
break;
@@ -902,9 +1469,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -920,16 +1487,8 @@
startupDto.setLocNo(locNo);
return startupDto;
}
- public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
- matnr = "";
- }
- if (Cools.isEmpty(batch)) { //鎵规
- batch = "";
- }
- if (Cools.isEmpty(grade)) { //澶囩敤
- grade = "";
- }
+
+ public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
// 鍒濆鍖栧弬鏁�
int crnNo = 0; //鍫嗗灈鏈哄彿
@@ -949,12 +1508,12 @@
}
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crnNumber = eRow-sRow+1;
+ int crnNumber = eRow - sRow + 1;
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
}
@@ -962,7 +1521,7 @@
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
Wrapper<StaDesc> wrapper = null;
@@ -971,19 +1530,16 @@
if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
// 鑾峰彇鐩爣绔�
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
+ wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).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("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
@@ -1001,18 +1557,15 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",true));//鏈�娴呭簱浣�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
locMast = locMast2;
break;
}
@@ -1023,9 +1576,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -1049,7 +1602,7 @@
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
+ for (int i = 0; i < count - msg.length(); ++i) {
msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
--
Gitblit v1.9.1