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/asrs/mapper/LocDetlMapper.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 22 +++++++++++++++++++---
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 5306c07..77a8a07 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -24,7 +24,7 @@
@Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
int updateLocNo(String newLocNo, String oldLocNo);
- @Select("SELECT wml.loc_no FROM asr_wrk_mast_log wml LEFT JOIN asr_wrk_detl_log wdl ON wml.wrk_no = wdl.wrk_no LEFT JOIN asr_loc_mast lm ON wml.loc_no = lm.loc_no WHERE (1 = 1 AND wdl.matnr = 'X004073XX' AND (wml.io_type = 1 OR wml.io_type = 11) AND wml.wrk_sts = 5 AND DateDiff(dd, wml.modi_time, getdate()) = 0 AND lm.loc_sts = 'F') ORDER BY wml.modi_time ASC")
+ @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
List<String> selectSameDetlToday(String matnr);
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ed5ceb6..efb2df8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -107,11 +107,16 @@
int row = Integer.parseInt(locNo.substring(0, 2));
// 鍒ゆ柇鏄惁涓烘繁搴撲綅
double remainder = Arith.remainder(row, rowCount / crn_qty);
- if (remainder != 0 && remainder != 1) {
+ if (remainder == 1) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+
+ } else if (remainder == 0) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
+
+ } else {
continue;
}
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- System.out.println();
+
}
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
@@ -170,7 +175,18 @@
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