From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 25 +++----------------------
1 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index cc724a9..d539429 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -17,11 +17,7 @@
String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
int num;
- if (tableName.equals("ins_order")) {
- num = systemLogMapper.countRowsByNow2(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
- } else {
- num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
- }
+ num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
String nums = num + "";
if (nums.length() == 1) nums = "00" + num;
else if (nums.length() == 2) nums = "0" + num;
@@ -29,29 +25,14 @@
}
//妫�楠屽崟濮旀墭鍗曞彿鐨勭敓鎴愯鍒�
- public String giveCode2(String code, Long companyId, String laboratory, String tableName, String symbol, String patten) {
+ public String giveCode2(String code, String tableName, String symbol, String patten) {
String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
int num;
- num = systemLogMapper.countRowsByNow3(tableName, companyId, laboratory, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+ num = systemLogMapper.countRowsByNow2(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
String nums = num + "";
if (nums.length() == 1) nums = "00" + num;
else if (nums.length() == 2) nums = "0" + num;
return code + (date2 == null ? date : date2) + symbol + nums;
}
-
- //妫�楠屽崟鐢熸垚澶栭儴濮旀墭缂栧彿鐨勮鍒�
- public String giveCode3(String code, Long companyId, String laboratory, String tableName, String symbol, String patten) {
- String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
- int num;
- num = systemLogMapper.countRowsByNow4(tableName, companyId, laboratory, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))) + 1;
- String nums = num + "";
- if (nums.length() == 1) nums = "0000" + num;
- else if (nums.length() == 2) nums = "000" + num;
- else if (nums.length() == 3) nums = "00" + num;
- else if (nums.length() == 4) nums = "0" + num;
- return code + (date2 == null ? date : date2) + symbol + nums;
- }
-
}
--
Gitblit v1.9.3