From 8eb26bc1c8389698984df75f33ec580e41fd4c2c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 30 七月 2020 14:06:28 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/webapp/static/js/locDetl/locDetl.js | 3 +
src/main/webapp/views/locDetl/locDetl.html | 5 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 ++-
src/main/java/com/zy/common/service/CommonService.java | 52 +++++++++++++------------
4 files changed, 39 insertions(+), 27 deletions(-)
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 f4e5bb4..6865d44 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/6/11
@@ -66,7 +67,8 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo());
+ List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -248,7 +250,7 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 628c95f..a45668c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -87,7 +87,7 @@
* @param sourceStaNo 婧愮珯
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -105,31 +105,34 @@
LocMast locMast = null;
// 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯
- 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);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- continue;
- }
- String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast targetLocMast = locMastService.selectById(targetLocNo);
- if (targetLocMast != null && !targetLocMast.getLocSts().equals("O")) {
- locMast = targetLocMast;
- crnNo = locMast.getCrnNo();
- break;
+ if (!Cools.isEmpty(matNos)) {
+ List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0));
+ for (String locNo : locNos) {
+ // 鑾峰彇鎺�
+ int row = Integer.parseInt(locNo.substring(0, 2));
+ // 鍒ゆ柇鏄惁涓烘繁搴撲綅
+ double remainder = Arith.remainder(row, rowCount / crn_qty);
+ int targetRow;
+ if (remainder == 1) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+ targetRow = row + 1;
+ } else if (remainder == 0) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
+ targetRow = row - 1;
+ } else {
+ continue;
+ }
+ String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast targetLocMast = locMastService.selectById(targetLocNo);
+ if (targetLocMast != null && targetLocMast.getLocSts().equals("O")) {
+ locMast = targetLocMast;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
}
}
+
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
@@ -146,7 +149,6 @@
}
}
}
-
basCrnpService.checkSiteStatus(crnNo);
// 鑾峰彇鐩爣绔�
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7f4e979..eca2026 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,6 +2,9 @@
function getCol() {
var cols = [{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}];
cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ )
return cols;
}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 44ad39d..0f7ce4c 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -21,6 +21,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1