From 485dabe1952c39eeb83291247e9ee1fe77a51df1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 24 七月 2023 16:51:20 +0800
Subject: [PATCH] #入库逻辑待完善
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 3
src/main/java/com/zy/asrs/service/LocDetlService.java | 7 +
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 119 +++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5
src/main/java/com/zy/asrs/service/BasCrnpService.java | 1
src/main/java/com/zy/common/web/WcsController.java | 7
src/main/java/com/zy/common/service/CommonService.java | 159 +++++++++++++++++---------
src/main/java/com/zy/asrs/entity/result/KeyValueVo.java | 8 +
src/main/resources/application.yml | 7
10 files changed, 258 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java b/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
index 667f06a..904df9e 100644
--- a/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
@@ -12,4 +12,12 @@
private Object value;
+ public KeyValueVo() {
+ }
+
+ public KeyValueVo(String name, Object value) {
+ this.name = name;
+ this.value = value;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 771b750..ff155f3 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -37,6 +37,9 @@
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, ld.appe_time, getdate()) = 0) ORDER BY ld.appe_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
+ @Select("SELECT distinct ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE 1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0 AND (left(ld.batch, 4)) = (left(#{batch}, 4))")
+ List<String> selectSameDetlToday2(@Param("matnr") String matnr, @Param("batch") String batch, @Param("start") Integer start, @Param("end") Integer end);
+
List<LocDetl> getStockStatis(Map<String, Object> map);
Integer getStockStatisCount(Map<String, Object> map);
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/asrs/service/BasCrnpService.java
index 10c3feb..90340db 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpService.java
@@ -8,5 +8,6 @@
BasCrnp checkSiteStatus(Integer crnId);
boolean checkSiteError(Integer crnNo, boolean pakin);
+// boolean checkSiteError2(Integer crnNo, boolean pakin, Integer sourceStaNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index ee17ba1..a809089 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -57,4 +57,11 @@
Double getLocDetlSumQty(String locNo);
void updateMatTurn(String matnrOld,String matnr);
+
+ /**
+ * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ * @param matnr 鍟嗗搧缂栧彿
+ * @return locNo 搴撲綅鍙�
+ */
+ List<String> getSameDetlToday2(String matnr, String batch, Integer start, Integer end);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 7b36b86..92f3aa3 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -1,10 +1,12 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
@@ -122,4 +124,121 @@
return true;
}
+
+// //鏉板厠
+// @Override
+// public boolean checkSiteError2(Integer crnNo, boolean pakin, Integer sourceStaNo) {
+// BasCrnp crnp = this.selectById(crnNo);
+// if (Cools.isEmpty(crnp)) {
+// log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
+// return false;
+// }
+// if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
+// log.error("{}鍙峰爢鍨涙満闈炶嚜鍔ㄨ繛绾跨姸鎬侊紝鏃犳硶浣滀笟!", crnNo);
+// return false;
+// }
+// if (crnp.getCrnErr() != null) {
+// if (crnp.getCrnErr() != 0) {
+// log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+// return false;
+// }
+// }
+//
+// if (pakin) {
+// //TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD
+// int staNo = 0;
+// String crnNos = "";
+// switch (crnNo){
+// case 1:
+// staNo = 123;
+// crnNos = "1,2,3,4";
+// break;
+// case 2:
+// staNo = 121;
+// crnNos = "1,2,3,4";
+// break;
+// case 3:
+// staNo = 119;
+// crnNos = "1,2,3,4";
+// break;
+// case 4:
+// staNo = 117;
+// crnNos = "1,2,3,4";
+// break;
+// case 5:
+// staNo = 115;
+// crnNos = "5,6,7,8";
+// break;
+// case 6:
+// staNo = 113;
+// crnNos = "5,6,7,8";
+// break;
+// case 7:
+// staNo = 111;
+// crnNos = "5,6,7,8";
+// break;
+// case 8:
+// staNo = 109;
+// crnNos = "5,6,7,8";
+// break;
+// case 9:
+// staNo = 106;
+// crnNos = "9,10,11,12";
+// break;
+// case 10:
+// staNo = 105;
+// crnNos = "9,10,11,12";
+// break;
+// case 11:
+// staNo = 103;
+// crnNos = "9,10,11,12";
+// break;
+// case 12:
+// staNo = 101;
+// crnNos = "9,10,11,12";
+// break;
+// }
+// int maxCount = 2;
+// int storeCount = wrkMastService.getStoreCount(crnNo);
+//
+// //鍒嗗寳涓崡涓変釜鍖哄垽鏂紝姣�4鍙板爢鍨涙満1涓尯銆傞櫎1鍙锋湁3涓殏瀛樹互澶栵紝鍙鏈夊嚭搴撲换鍔″叆搴撴殏瀛樻暟灏卞彧鑳戒负1涓�
+// //娌℃湁鍑哄簱浠诲姟鏃讹紝鏆傚瓨鏁板湪devp琛╥n_qty瀛楁閰嶇疆
+//// int pakOutCunt = wrkMastService.getPakOutCount(crnNos);
+//// if(pakOutCunt > 0){
+//// maxCount = crnNo!= 1 ? 1 : 3;//1鍙�3涓叆搴撴殏瀛�
+//// } else {
+// BasDevp devp = basDevpService.selectById(staNo);
+// if(!Cools.isEmpty(devp)){
+// maxCount = devp.getInQty();
+// }
+//// }
+//
+// if(storeCount >= maxCount){
+// log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�![storeCount:{},maxCount:{}]", crnNo, storeCount, maxCount);
+// return false;
+// }
+//
+// if ("N".equals(crnp.getInEnable())) {
+// log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
+// return false;
+// }
+//
+// //1--8鍙峰爢鍨涙満锛屼簩妤煎叆搴撴椂鍒ゆ柇鏄惁鏈夊搴斿嚭搴撲换鍔�,濡傛灉鏈夊垯鍫嗗灈鏈轰笉鍙敤
+// if (sourceStaNo > 299 && crnNo < 9){
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+// .eq("crn_no",crnNo).last(" and source_sta_no > 300 and ( wrk_sts in (11,12) or (wrk_sts=14 and wrk_no in (select wrk_no from asr_bas_devp)))"));
+// if(!Cools.isEmpty(wrkMast)){
+// log.error("{}鍙峰爢鍨涙満瀛樺湪鍑哄簱浠诲姟,浠诲姟鍙穥}", crnNo, wrkMast.getWrkNo());
+// return false;
+// }
+// }
+// } else {
+// if ("N".equals(crnp.getOutEnable())) {
+// log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
+// return false;
+// }
+// }
+//
+// return true;
+// }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 3880962..d43e920 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -48,6 +48,11 @@
return this.baseMapper.selectSameDetlToday(matnr, start, end);
}
+ @Override
+ public List<String> getSameDetlToday2(String matnr, String batch, Integer start, Integer end) {
+ return this.baseMapper.selectSameDetlToday2(matnr, batch, start, end);
+ }
+
@Override
public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 875140f..fd6c732 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,8 +90,8 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
+// List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), null, locTypeDto, 0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c8ff3bc..98c7487 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
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.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -92,14 +93,15 @@
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞宸ヤ綔绫诲瀷
* @param sourceStaNo 婧愮珯
- * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+ * @param list 鍟嗗搧缂栧彿闆嗗悎
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<KeyValueVo> list, LocTypeDto locTypeDto, int times) {
whsType = 1;
StartupDto startupDto = new StartupDto();
-
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -111,29 +113,64 @@
int eRow = rowLastno.geteRow();
int crn_qty = rowLastno.getCrnQty();
int rowCount = eRow - sRow + 1;
-
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo = 0;
// 鐩爣搴撲綅
LocMast locMast = null;
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
- for (String locNo : locNos) {
- if (Utils.isShallowLoc(slaveProperties, locNo)) {
- continue;
+ if (!Cools.isEmpty(list)) {
+ boolean sameMatnr = true;
+ String matnr = "";
+ String batch = "";
+ for (KeyValueVo vo : list) {
+ if (Cools.isEmpty(matnr)) {
+ matnr = vo.getName();
+ } else {
+ if (!matnr.equals(vo.getName())) {
+ sameMatnr = false;
+ break;
+ }
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- break;
+ String val = String.valueOf(vo.getValue());
+ if (Cools.isEmpty(batch)) {
+ batch = val;
+ } else {
+ int year0 = Integer.parseInt(batch.substring(0, 2));
+ int month0 = Integer.parseInt(batch.substring(2, 4));
+ int year = Integer.parseInt(val.substring(0, 2));
+ int month = Integer.parseInt(val.substring(2, 4));
+ if (year <= year0) {
+ if (month < month0) {
+ batch = val;
}
}
}
}
+ if (sameMatnr) {
+ List<String> locNos = locDetlService.getSameDetlToday2(matnr, batch, sRow, eRow);
+ for (String locNo : locNos) {
+ if (Utils.isShallowLoc(slaveProperties, locNo)) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(shallowLoc)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
@@ -148,9 +185,13 @@
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- break;
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(shallowLoc)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
}
}
}
@@ -158,10 +199,41 @@
}
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast){
- curRow = getCurRow(curRow);
+ if (null == locMast) {
+ Shelves shelves = new Shelves(rowCount, crn_qty);
+ for (int i = 0; i < shelves.group; i ++) {
+ curRow = shelves.start(curRow);
+ if (curRow < 0) {
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ Integer crnNo1 = shelves.get(curRow);
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
+ break;
+ }
+ }
}
+ if (crnNo == 0) {
+ throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ boolean sign = true;
+ if (!staNo.getAutoing().equals("Y")) {
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ sign = false;
+ }
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
@@ -169,22 +241,24 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
- if (locMast == null) {
+ if (locMast == null && sign) {
if (Utils.isShallowLoc(slaveProperties, curRow)) {
Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
// todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
+ if (locMast !=null && !locMastService.checkEmptyCount(locMast)) {
locMast = null;
}
}
+
if (Cools.isEmpty(locMast)) {
locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (!locMastService.checkEmptyCount(locMast)) {
locMast = null;
}
+
// 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
@@ -201,51 +275,27 @@
}
}
}
- Integer crnNo = 0;
- BasDevp staNo =null;
- boolean sign=false;
- if (!Cools.isEmpty(locMast)){
- try{
- crnNo = locMast.getCrnNo();
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- }
- }catch (Exception e){
- sign=true;
- }
- }
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast) || sign) {
+ if (Cools.isEmpty(locMast)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount) {
times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+ return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times);
+ } else {
+ times = 0;
}
// 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
if (locTypeDto.getLocType1() == 1) {
locTypeDto.setLocType1((short) 2);
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+ return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
String locNo = locMast.getLocNo();
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(crnNo);
@@ -254,6 +304,7 @@
startupDto.setLocNo(locNo);
return startupDto;
}
+
public static String zerofill(String msg, Integer count) {
@@ -274,7 +325,7 @@
* 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
*/
private Integer getCurRow(Integer curRow) {
- if (Utils.isDeepLocLeft(slaveProperties,curRow)){
+ if (Utils.isDeepLocLeft(slaveProperties,curRow)){ //鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
curRow=curRow+3;
}else if (Utils.isDeepLocLeft(slaveProperties,curRow-1)){
curRow=curRow+1;
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 2bfec11..102f8f6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -159,9 +160,11 @@
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
+ List<KeyValueVo> list = waitPakins.stream().map(item-> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
+// List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, list, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 04fd4a7..4d6a72e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,14 +46,13 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
-# doubleLocs: 1,4,11,14,21,24
- doubleLocs: 1,4,5,8,9,12
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft : 1,5,9
+ doubleLocsLeft : 1,5,9,13,17,21
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight : 4,8,12
+ doubleLocsRight : 4,8,12,16,20,24
comb:
--
Gitblit v1.9.1