From d63ae630370b97d3739799a99f186e9cd7645db0 Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期五, 27 八月 2021 09:45:04 +0800
Subject: [PATCH] 1.0.2
---
src/main/java/waitMatchk.sql | 12 ++++++------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 14 ++++++++++++--
src/main/java/com/zy/common/CodeBuilder.java | 2 +-
3 files changed, 19 insertions(+), 9 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 5438dd4..fec6f1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -24,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -181,11 +182,20 @@
}
//鐢熸垚鐩樼偣鏂囨。
for (LocDetlDto locDetlDto : locDetlDtos) {
- String replace = UUID.randomUUID().toString().replace("-", "");
+
+ String id="";
+ //鑾峰彇褰撳墠鏃堕棿鎴�
+ SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
+ String temp = sf.format(new Date());
+ //鑾峰彇6浣嶉殢鏈烘暟
+ int random=(int) ((Math.random()+1)*1000);
+ id=temp+random;
+
+// String replace = UUID.randomUUID().toString().replace("-", "");
LocDetl locDetl = locDetlDto.getLocDetl();
//鐢熸垚鐩樼偣妗�
WaitMatchk waitMatchk = new WaitMatchk();
- waitMatchk.setBillNo(replace);//璁㈠崟缂栧彿
+ waitMatchk.setBillNo(id);//璁㈠崟缂栧彿
waitMatchk.setLocNo(locDetl.getLocNo());//搴撲綅鍙�
waitMatchk.setStockQty(locDetl.getQty());
waitMatchk.setMatNo(locDetl.getMatNo());//浜у搧缂栧彿
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 72295b8..f5dd70b 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -18,7 +18,7 @@
generator.url="192.168.4.208:1433;databasename=xgmasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="ints_wait_matchk";
+ generator.table="ints_io_complete_log";
generator.packagePath="com.zy.ints";
generator.build();
}
diff --git a/src/main/java/waitMatchk.sql b/src/main/java/waitMatchk.sql
index 9719b66..b051933 100644
--- a/src/main/java/waitMatchk.sql
+++ b/src/main/java/waitMatchk.sql
@@ -12,9 +12,9 @@
-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk/waitMatchk.html', N'鐩樼偣閫氱煡妗�', null, '2', null, '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-export', N'瀵煎嚭', '', '3', '4', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-into', N'瀵煎叆', '', '3', '5', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#view', N'鏌ヨ', '20421', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-add', N'鏂板', '20421', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-edit', N'缂栬緫', '20421', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-delete', N'鍒犻櫎', '20421', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-export', N'瀵煎嚭', '20421', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-into', N'瀵煎叆', '20421', '3', '5', '1');
--
Gitblit v1.9.1