From 193c3204f7f998df4d603df202dbea88a3074585 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 九月 2025 09:03:39 +0800
Subject: [PATCH] #入库逻辑变更
---
src/main/java/com/zy/common/service/CommonService.java | 661 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 531 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index df07cec..6b29b4d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -55,6 +55,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private ConfigService configService;
+ @Autowired
+ private MatService matService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -122,37 +124,469 @@
* @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:
- return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
- 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;
+ 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);
+ }
+ }
+
+ //妫�娴嬫槸鍚︿负鍛嗘粸鏂�
+ 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 staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ 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 (!basCrnpService.checkSiteError(crnNo, true)) {
+ throw new CoolException(crnNo + "鍙峰爢鍨涙満寮傚父");
+ }
+
+ 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;
+ }
+ }
+ }
+
+ 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;
+// }
/**
* 妫�绱㈠簱浣嶅彿
@@ -218,29 +652,23 @@
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no", crnNo)
- .in("io_type", 1, 10, 53, 57)
- );
- if(wrkMasts.size() > crnSearchDetectTaskCount){
+ 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)
- );
+ 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) {
+ 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++;
@@ -256,15 +684,22 @@
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){
+ 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);
- }else {
+ 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);
@@ -272,15 +707,9 @@
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).le("io_type", 100));
- if (locMasts.size() - crnCountO <= 2) {
+ 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;
@@ -297,26 +726,35 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- 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).le("io_type", 100));
- if (locMasts.size() - crnCountO <= 2) {
- log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- } else {
- nearRow = near;
- break;
+ 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;
+ }
}
}
}
@@ -351,8 +789,7 @@
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()));
+ 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;
@@ -365,13 +802,7 @@
}
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- 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)
- );
+ 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;
@@ -385,10 +816,7 @@
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
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")
- );
+ LocMast shallowLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
if (shallowLocMast != null) {
locMast = shallowLocMast;
break;
@@ -448,8 +876,7 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
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()));
+ 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())) {
@@ -488,18 +915,14 @@
// 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()).ne("inv_wh",1)
- .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.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()));
+ 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;
@@ -519,20 +942,17 @@
}
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;
@@ -566,7 +986,7 @@
// locTypeDto.setLocType1((short)i);
// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
// }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿},{}", JSON.toJSONString(locTypeDto), times,moveCrnNo);
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿},{}", JSON.toJSONString(locTypeDto), times, moveCrnNo);
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -581,20 +1001,15 @@
//閽堝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()));
+ 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());
+ 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);
@@ -661,8 +1076,7 @@
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()));
+ 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++;
@@ -822,8 +1236,7 @@
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()));
+ 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);
@@ -964,10 +1377,7 @@
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);
@@ -992,10 +1402,7 @@
// 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) {
@@ -1109,10 +1516,7 @@
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);
@@ -1139,10 +1543,7 @@
// 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;
--
Gitblit v1.9.1