From 39b22a93673a65872b7f63f8d5ff1c2b95ef0bbd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 15:28:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/DoubleDeepService.java | 77 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/common/service/DoubleDeepService.java b/src/main/java/com/zy/common/service/DoubleDeepService.java
index 04db044..0e0ff7b 100644
--- a/src/main/java/com/zy/common/service/DoubleDeepService.java
+++ b/src/main/java/com/zy/common/service/DoubleDeepService.java
@@ -1,10 +1,14 @@
package com.zy.common.service;
import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.RowLastnoService;
import com.zy.asrs.service.WrkLastnoService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.common.model.Shelves;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,6 +23,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkLastnoService wrkLastnoService;
+ @Autowired
+ private RowLastnoService rowLastnoService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -27,43 +33,66 @@
*/
public int getWorkNo(Integer wrkMk) {
WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
+ if (Cools.isEmpty(wrkLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
int workNo = 0;
// 鍏ュ嚭搴撶被鍨�
if (wrkLastno.getWrkMk() == 0) {
- if (!Cools.isEmpty(wrkLastno)){
- workNo = wrkLastno.getWrkNo();
- int sNo = wrkLastno.getSNo();
- int eNo = wrkLastno.getENo();
+ 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;
- } else {
- break;
- }
- }
-
- if (workNo > 0){
- // todo
- wrkLastno.setWrkNo(workNo);
- wrkLastnoService.updateById(wrkLastno);
+ while (true) {
+ WrkMast wrkMast = wrkMastService.selectById(workNo);
+ if (null != wrkMast) {
+ workNo = workNo>=eNo ? sNo : workNo+1;
+ } else {
+ break;
}
}
-
+ if (workNo > 0){
+ // todo
+ wrkLastno.setWrkNo(workNo);
+ wrkLastnoService.updateById(wrkLastno);
+ }
}
return workNo;
}
/**
* 妫�绱㈠簱浣嶅彿
- * @param
- * @return
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public String getLocNo() {
- return null;
+ public String getLocNo(Integer whsType) {
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ String locNo = null;
+ if (rowLastno.getWhsType() == 1){
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crn_qty = rowLastno.getCrnQty();
+
+ Shelves shelves = new Shelves(8, crn_qty);
+ curRow = shelves.start(curRow);
+
+ if (curRow != 0) {
+
+
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+ }
+
+ }
+
+ return locNo;
}
-}
+
+}
\ No newline at end of file
--
Gitblit v1.9.1