From de67c95651efbf649704450e03fdb2d16c2e6bcc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 29 七月 2020 17:07:04 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/common/service/CommonService.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8eae96c..ed5ceb6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -2,6 +2,7 @@
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.*;
@@ -34,6 +35,8 @@
private BasDevpService basDevpService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -63,9 +66,15 @@
}
}
if (workNo > 0){
- // todo
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
+ }
+ }
+ if (workNo == 0) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ if (wrkMastService.selectById(workNo)!=null) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
@@ -74,10 +83,11 @@
/**
* 妫�绱㈠簱浣嶅彿
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer sourceStaNo) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -89,6 +99,21 @@
int eRow = rowLastno.geteRow();
int crn_qty = rowLastno.getCrnQty();
int rowCount = eRow - sRow + 1;
+
+ // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯 todo
+ List<String> locNos = locDetlService.getSameDetlToday("X004073XX");
+ for (String locNo : locNos) {
+ // 鑾峰彇鎺�
+ int row = Integer.parseInt(locNo.substring(0, 2));
+ // 鍒ゆ柇鏄惁涓烘繁搴撲綅
+ double remainder = Arith.remainder(row, rowCount / crn_qty);
+ if (remainder != 0 && remainder != 1) {
+ continue;
+ }
+ // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+ System.out.println();
+ }
+
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
Shelves shelves = new Shelves(rowCount, crn_qty);
curRow = shelves.start(curRow);
@@ -103,16 +128,10 @@
break;
}
}
- BasCrnp crnp = basCrnpService.selectById(crnNo);
- if (Cools.isEmpty(crnp)) {
- throw new CoolException("鍫嗗灈鏈虹紪鍙烽敊璇�");
- }
- if (!"Y".equals(crnp.getInEnable())) {
- throw new CoolException("褰撳墠鍫嗗灈鏈烘棤娉曞叆搴�");
- }
+ basCrnpService.checkSiteStatus(crnNo);
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", 1)
+ .eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
@@ -140,10 +159,18 @@
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
} else {
- throw new CoolException("鐩爣绔欎笉鍙敤");
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
+ } else {
+ throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
}
return startupDto;
}
+ public static void main(String[] args) {
+ System.out.println(Arith.remainder(1, 4));
+ System.out.println("0200201".substring(0, 2));
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1