From e1f2618f03b150b5a60231501dd10f7e6e599baf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 30 七月 2020 09:17:35 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/common/service/CommonService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 4529c56..efb2df8 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;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -96,6 +99,26 @@
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 == 1) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+
+ } else if (remainder == 0) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
+
+ } else {
+ continue;
+ }
+
+ }
+
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
Shelves shelves = new Shelves(rowCount, crn_qty);
curRow = shelves.start(curRow);
@@ -110,13 +133,7 @@
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", staDescId)
@@ -147,10 +164,29 @@
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));
+ String locNo = "0100201";
+ int row = Integer.parseInt(locNo.substring(0, 2));
+ double remainder = Arith.remainder(row, 4);
+ if (remainder == 1) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+ int targetRow = row + 1;
+
+ } else if (remainder == 0) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
+
+ } else {
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1