From e73d51083fc0407ba97078ffd5e6fb325ae7d1ef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 17:49:44 +0800
Subject: [PATCH] #v2.1.2
---
src/main/java/com/zy/common/service/CommonService.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d344066..431da27 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -113,33 +113,33 @@
LocMast locMast = null;
// 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯
- 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 (!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) {
--
Gitblit v1.9.1