Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
40e19d66
提交
40e19d66
authored
12月 16, 2021
作者:
zhoushaopan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(入库模块): 添加装备日志,修改装备拆分逻辑
添加装备日志,修改装备拆分逻辑
上级
ba7d8bc4
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
332 行增加
和
215 行删除
+332
-215
StorageBillController.java
.../dev/device/storage/controller/StorageBillController.java
+265
-207
BackCreateSeqVo.java
...m/tykj/dev/device/storage/subject/vo/BackCreateSeqVo.java
+31
-0
CreateSeqVo.java
...a/com/tykj/dev/device/storage/subject/vo/CreateSeqVo.java
+14
-8
ReceiveCreateSeqVo.java
...ykj/dev/device/storage/subject/vo/ReceiveCreateSeqVo.java
+22
-0
没有找到文件。
dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java
浏览文件 @
40e19d66
...
...
@@ -172,9 +172,25 @@ public class StorageBillController {
}
}
// @ApiOperation(value = "自动生成装备序列号", notes = "可以通过这个接口自动生成序列号")
// @PostMapping(value = "/autoCreate/{num}")
// public ResponseEntity autoCreate(@PathVariable("num") int num){
// Long seq = snowflake.creatNextId();
// StringBuffer stringBuffer = new StringBuffer();
// stringBuffer.append(seq);
// if (num>1) {
// stringBuffer.append("-");
// stringBuffer.append(seq + num - 1);
// }
// //根据区间生成一个集合
// List<String> seqs = DeviceSeqUtil.selectDeviceSeqs(stringBuffer.toString());
// return ResponseEntity.ok(stringBuffer.toString());
// }
@ApiOperation
(
value
=
"自动生成装备序列号"
,
notes
=
"可以通过这个接口自动生成序列号"
)
@PostMapping
(
value
=
"/autoCreate/{num}"
)
public
ResponseEntity
autoCreate
(
@PathVariable
(
"num"
)
int
num
){
@PostMapping
(
value
=
"/autoCreate"
)
public
ResponseEntity
<
CreateSeqVo
>
autoCreate
(
@RequestBody
ReceiveCreateSeqVo
receiveCreateSeqVo
){
CreateSeqVo
createSeqVo
=
new
CreateSeqVo
();
Integer
num
=
receiveCreateSeqVo
.
getStorageCount
();
Long
seq
=
snowflake
.
creatNextId
();
StringBuffer
stringBuffer
=
new
StringBuffer
();
stringBuffer
.
append
(
seq
);
...
...
@@ -182,47 +198,53 @@ public class StorageBillController {
stringBuffer
.
append
(
"-"
);
stringBuffer
.
append
(
seq
+
num
-
1
);
}
return
ResponseEntity
.
ok
(
stringBuffer
.
toString
());
//根据区间生成一个集合
List
<
String
>
selectDeviceSeqs
=
DeviceSeqUtil
.
selectDeviceSeqs
(
stringBuffer
.
toString
());
createSeqVo
.
setSeqInterval
(
stringBuffer
.
toString
());
createSeqVo
.
setSeqList
(
selectDeviceSeqs
);
createSeqVo
.
setStorageCount
(
num
);
createSeqVo
.
setPackingLibrary
(
packingLibraryService
.
getOne
(
receiveCreateSeqVo
.
getPackingId
()));
return
ResponseEntity
.
ok
(
createSeqVo
);
}
@ApiOperation
(
value
=
"自动生成配件序列号"
,
notes
=
"可以通过这个接口自动生成序列号"
)
@PostMapping
(
value
=
"/autoCreateForPart"
)
public
ResponseEntity
autoCreateForPart
(
@RequestBody
CreateSeqVo
createSeqVo
){
Integer
num
=
createSeqVo
.
getNum
();
//根据型号查询数据库
// int maxSeqNumber = deviceLibraryService.getMaxSeqNumber(createSeqVo.getModel());
// List<String> seqList = IntStream.rangeClosed(maxSeqNumber + 1, num)
// .mapToObj(DeviceNumberUtils::parseNumber2Seq)
// .collect(Collectors.toList());
List
<
String
>
strings
=
deviceLibraryService
.
getMaxPartSeqNumber
(
createSeqVo
.
getModel
(),
1
);
int
start
=
0
;
if
(!
CollectionUtils
.
isEmpty
(
strings
)){
//说明数据库中存有该集合中的数字
String
s
=
strings
.
get
(
0
);
start
=
Integer
.
parseInt
(
s
);
}
List
<
String
>
seq2
=
createSeq2
(
start
+
1
,
start
+
1
+
num
);
// StringJoiner stringBuffer = new StringJoiner("-");
StringBuilder
stringBuilder
=
new
StringBuilder
();
String
model
=
createSeqVo
.
getModel
();
String
type
=
createSeqVo
.
getType
();
String
style
=
createSeqVo
.
getStyle
();
if
(
style
.
length
()<
2
){
style
=
"0"
+
style
;
}
if
(
type
.
length
()<
2
){
type
=
"0"
+
type
;
}
String
modelTypeStyle
=
model
+
type
+
style
;
stringBuilder
.
append
(
modelTypeStyle
)
.
append
(
seq2
.
get
(
0
))
.
append
(
"-"
)
.
append
(
modelTypeStyle
)
.
append
(
seq2
.
get
(
seq2
.
size
()-
1
));
return
ResponseEntity
.
ok
(
stringBuilder
);
}
//
@ApiOperation(value = "自动生成配件序列号", notes = "可以通过这个接口自动生成序列号")
//
@PostMapping(value = "/autoCreateForPart")
//
public ResponseEntity autoCreateForPart(@RequestBody CreateSeqVo createSeqVo){
//
Integer num = createSeqVo.getNum();
//
//
//根据型号查询数据库
//
//
int maxSeqNumber = deviceLibraryService.getMaxSeqNumber(createSeqVo.getModel());
//
//
List<String> seqList = IntStream.rangeClosed(maxSeqNumber + 1, num)
//
//
.mapToObj(DeviceNumberUtils::parseNumber2Seq)
//
//
.collect(Collectors.toList());
//
List<String> strings = deviceLibraryService.getMaxPartSeqNumber(createSeqVo.getModel(), 1);
//
int start =0;
//
if (!CollectionUtils.isEmpty(strings)){
//
//说明数据库中存有该集合中的数字
//
String s = strings.get(0);
//
start = Integer.parseInt(s);
//
}
//
List<String> seq2 = createSeq2(start+1, start+1+num);
//
//
StringJoiner stringBuffer = new StringJoiner("-");
//
StringBuilder stringBuilder = new StringBuilder();
//
String model = createSeqVo.getModel();
//
String type = createSeqVo.getType();
//
String style = createSeqVo.getStyle();
//
if (style.length()<2){
//
style = "0"+style;
//
}
//
if (type.length()<2){
//
type = "0"+type;
//
}
//
String modelTypeStyle = model+type+style;
//
stringBuilder
//
.append(modelTypeStyle)
//
.append(seq2.get(0))
//
.append("-")
//
.append(modelTypeStyle)
//
.append(seq2.get(seq2.size()-1));
//
return ResponseEntity.ok(stringBuilder);
//
}
@ApiOperation
(
value
=
"获取序列号区间列表"
,
notes
=
"可以通过这个接口获取序列号区间列表"
)
@GetMapping
(
value
=
"/getSeq/{num}/{string}"
)
...
...
@@ -236,179 +258,207 @@ public class StorageBillController {
return
ResultUtil
.
success
(
DeviceSeqUtil
.
createDeviceSeqs
(
s
,
num
));
}
// @ApiOperation(value = "选择入库型号数量", notes = "可以通过这个接口选择入库型号数量")
// @PostMapping(value = "/addStorageDetail")
// public ResponseEntity addStorageDetail(@RequestBody List<StorageBillDetailVo> list) {
// //存放所有的列装
// List<PackingLibrary> libraryEntities = new ArrayList<>();
//
// Map<Integer, List<PackingLibrary>> map = new HashMap<>();
// //所有的序列号
// List<String> seqs = new ArrayList<>();
// for (StorageBillDetailVo s : list) {
// if (s.getStorageCount()>0) {
// //序列号区间
// List<String> strings = DeviceSeqUtil.createDeviceSeqs(s.getSeqInterval(), s.getStorageCount());
// //生产号区间
// List<String> strings3 = DeviceSeqUtil.createDeviceSeqs(s.getProdInterval(), s.getStorageCount());
// List<List<String>> sons = new ArrayList<>();
// List<List<String>> sons2 = new ArrayList<>();
// List<List<String>> sons3 = new ArrayList<>();
// List<List<String>> sons4 = new ArrayList<>();
// int count = 1;
// //入库的数量
// Integer deviceNum = s.getStorageCount();
//
// while (deviceNum >= count) {
// PackingLibrary packingLibraryEntity = new PackingLibrary();
// BeanUtils.copyProperties(packingLibraryService.getOne(s.getPackingId()), packingLibraryEntity);
// packingLibraryEntity.setCorresponding(count);
//// packingLibraryEntity.setIsSinglePart(1);
// if (!strings3.isEmpty()) {
// packingLibraryEntity.setProdNumber(strings3.get(0));
// strings3.remove(0);
// }
// if (!strings.isEmpty()) {
// if (deviceLibraryDao.getAllBySeqNumber(strings.get(0)).size() > 0) {
// throw new ApiException("序列号" + strings.get(0) + "已存在");
// }
// if (seqs.contains(strings.get(0))){
// throw new ApiException("序列号" + strings.get(0) + "不能重复");
// }
// packingLibraryEntity.setSeq(strings.get(0));
// strings.remove(0);
// }
// seqs.add(packingLibraryEntity.getSeq());
// libraryEntities.add(packingLibraryEntity);
// if (s.getList() != null && s.getList().size() != 0) {
// for (int j = 0; j < s.getList().size(); j++) {
// StorageBillDetailVo s2 = s.getList().get(j);
// if (j >= sons.size()) {
// sons.add(DeviceSeqUtil.createDeviceSeqs(s2.getSeqInterval(), s2.getStorageCount()));
// sons2.add(DeviceSeqUtil.createDeviceSeqs(s2.getProdInterval(), s2.getStorageCount()));
// }
// packingLibraryEntity = packingLibraryService.getOne(s2.getPackingId());
// List<String> strings2 = sons.get(j);
// List<String> strings1 = sons2.get(j);
// if (s2.getStorageCount() >= count) {
// packingLibraryEntity.setIsSinglePart(0);
// packingLibraryEntity.setCorresponding(count);
// if (!strings2.isEmpty()) {
// if (deviceLibraryDao.getAllBySeqNumber(strings2.get(0)).size() > 0) {
// throw new ApiException("序列号" + strings2.get(0) + "已存在");
// }
// if (seqs.contains(strings2.get(0))){
// throw new ApiException("序列号" + strings2.get(0) + "不能重复");
// }
// packingLibraryEntity.setSeq(strings2.get(0));
// strings2.remove(0);
// }
// if (!strings1.isEmpty()) {
// packingLibraryEntity.setProdNumber(strings1.get(0));
// strings1.remove(0);
// }
// seqs.add(packingLibraryEntity.getSeq());
// libraryEntities.add(packingLibraryEntity);
// }
// if (s2.getStorageCount() - strings2.size() == deviceNum) {
// List<PackingLibrary> packingLibraries = new ArrayList<>();
// for (int i = 0; i < s2.getStorageCount() - deviceNum; i++) {
// packingLibraryEntity = packingLibraryService.getOne(s2.getPackingId());
// packingLibraryEntity.setCorresponding(0);
//// packingLibraryEntity.setIsSinglePart(1);
//
// if (!strings2.isEmpty()) {
// if (deviceLibraryDao.getAllBySeqNumber(strings2.get(0)).size() > 0) {
// throw new ApiException("序列号" + strings2.get(0) + "已存在");
// }
// if (seqs.contains(strings2.get(0))){
// throw new ApiException("序列号" + strings2.get(0) + "不能重复");
// }
// packingLibraryEntity.setSeq(strings2.get(0));
// strings2.remove(0);
// }
// if (!strings1.isEmpty()) {
// packingLibraryEntity.setProdNumber(strings1.get(0));
// strings1.remove(0);
// }
// seqs.add(packingLibraryEntity.getSeq());
// packingLibraries.add(packingLibraryEntity);
// }
// map.put(s2.getPackingId(), packingLibraries);
// }
// if (s2.getList() != null && s2.getList().size() != 0) {
// for (int k = 0; k < s2.getList().size(); k++) {
// StorageBillDetailVo s3 = s2.getList().get(k);
// if (k >= sons3.size()) {
// sons3.add(DeviceSeqUtil.createDeviceSeqs(s3.getSeqInterval(), s3.getStorageCount()));
// sons4.add(DeviceSeqUtil.createDeviceSeqs(s3.getProdInterval(), s3.getStorageCount()));
// }
// packingLibraryEntity = packingLibraryService.getOne(s3.getPackingId());
// List<String> strings4 = sons3.get(k);
// List<String> strings5 = sons4.get(k);
// if (s3.getStorageCount() >= count) {
//// packingLibraryEntity.setIsSinglePart(0);
// packingLibraryEntity.setCorresponding(count);
//
// if (!strings4.isEmpty()) {
// if (deviceLibraryDao.getAllBySeqNumber(strings4.get(0)).size() > 0) {
// throw new ApiException("序列号" + strings4.get(0) + "已存在");
// }
// if (seqs.contains(strings4.get(0))){
// throw new ApiException("序列号" + strings4.get(0) + "不能重复");
// }
// packingLibraryEntity.setSeq(strings4.get(0));
// strings4.remove(0);
// }
// if (!strings5.isEmpty()) {
// packingLibraryEntity.setProdNumber(strings5.get(0));
// strings5.remove(0);
// }
// seqs.add(packingLibraryEntity.getSeq());
// libraryEntities.add(packingLibraryEntity);
// }
// if (s3.getStorageCount() - strings4.size() == deviceNum) {
// List<PackingLibrary> packingLibraries = new ArrayList<>();
// for (int i = 0; i < s3.getStorageCount() - deviceNum; i++) {
// packingLibraryEntity = packingLibraryService.getOne(s3.getPackingId());
// packingLibraryEntity.setCorresponding(0);
//// packingLibraryEntity.setIsSinglePart(1);
//
//
// if (!strings4.isEmpty()) {
// if (deviceLibraryDao.getAllBySeqNumber(strings4.get(0)).size() > 0) {
// throw new ApiException("序列号" + strings4.get(0) + "已存在");
// }
// if (seqs.contains(strings4.get(0))){
// throw new ApiException("序列号" + strings4.get(0) + "不能重复");
// }
// packingLibraryEntity.setSeq(strings4.get(0));
// strings4.remove(0);
// }
// if (!strings5.isEmpty()) {
// packingLibraryEntity.setProdNumber(strings5.get(0));
// strings5.remove(0);
// }
// seqs.add(packingLibraryEntity.getSeq());
// packingLibraries.add(packingLibraryEntity);
// }
// map.put(s3.getPackingId(), packingLibraries);
// }
// }
//
// }
// }
//
// }
// count = count + 1;
// }
// }
// }
// for (Integer i : map.keySet()) {
// libraryEntities.addAll(map.get(i));
// }
// return ResultUtil.success(libraryEntities);
// }
@ApiOperation
(
value
=
"选择入库型号数量"
,
notes
=
"可以通过这个接口选择入库型号数量"
)
@PostMapping
(
value
=
"/addStorageDetail"
)
public
ResponseEntity
addStorageDetail
(
@RequestBody
List
<
StorageBillDetailVo
>
list
)
{
//存放所有的列装
List
<
PackingLibrary
>
libraryEntities
=
new
ArrayList
<>();
Map
<
Integer
,
List
<
PackingLibrary
>>
map
=
new
HashMap
<>();
//所有的序列号
List
<
String
>
seqs
=
new
ArrayList
<>();
for
(
StorageBillDetailVo
s
:
list
)
{
if
(
s
.
getStorageCount
()>
0
)
{
//序列号区间
List
<
String
>
strings
=
DeviceSeqUtil
.
createDeviceSeqs
(
s
.
getSeqInterval
(),
s
.
getStorageCount
());
//生产号区间
List
<
String
>
strings3
=
DeviceSeqUtil
.
createDeviceSeqs
(
s
.
getProdInterval
(),
s
.
getStorageCount
());
List
<
List
<
String
>>
sons
=
new
ArrayList
<>();
List
<
List
<
String
>>
sons2
=
new
ArrayList
<>();
List
<
List
<
String
>>
sons3
=
new
ArrayList
<>();
List
<
List
<
String
>>
sons4
=
new
ArrayList
<>();
int
count
=
1
;
//入库的数量
Integer
deviceNum
=
s
.
getStorageCount
();
while
(
deviceNum
>=
count
)
{
PackingLibrary
packingLibraryEntity
=
new
PackingLibrary
();
BeanUtils
.
copyProperties
(
packingLibraryService
.
getOne
(
s
.
getPackingId
()),
packingLibraryEntity
);
packingLibraryEntity
.
setCorresponding
(
count
);
// packingLibraryEntity.setIsSinglePart(1);
if
(!
strings3
.
isEmpty
())
{
packingLibraryEntity
.
setProdNumber
(
strings3
.
get
(
0
));
strings3
.
remove
(
0
);
}
if
(!
strings
.
isEmpty
())
{
if
(
deviceLibraryDao
.
getAllBySeqNumber
(
strings
.
get
(
0
)).
size
()
>
0
)
{
throw
new
ApiException
(
"序列号"
+
strings
.
get
(
0
)
+
"已存在"
);
}
if
(
seqs
.
contains
(
strings
.
get
(
0
))){
throw
new
ApiException
(
"序列号"
+
strings
.
get
(
0
)
+
"不能重复"
);
}
packingLibraryEntity
.
setSeq
(
strings
.
get
(
0
));
strings
.
remove
(
0
);
}
seqs
.
add
(
packingLibraryEntity
.
getSeq
());
libraryEntities
.
add
(
packingLibraryEntity
);
if
(
s
.
getList
()
!=
null
&&
s
.
getList
().
size
()
!=
0
)
{
for
(
int
j
=
0
;
j
<
s
.
getList
().
size
();
j
++)
{
StorageBillDetailVo
s2
=
s
.
getList
().
get
(
j
);
if
(
j
>=
sons
.
size
())
{
sons
.
add
(
DeviceSeqUtil
.
createDeviceSeqs
(
s2
.
getSeqInterval
(),
s2
.
getStorageCount
()));
sons2
.
add
(
DeviceSeqUtil
.
createDeviceSeqs
(
s2
.
getProdInterval
(),
s2
.
getStorageCount
()));
}
packingLibraryEntity
=
packingLibraryService
.
getOne
(
s2
.
getPackingId
());
List
<
String
>
strings2
=
sons
.
get
(
j
);
List
<
String
>
strings1
=
sons2
.
get
(
j
);
if
(
s2
.
getStorageCount
()
>=
count
)
{
packingLibraryEntity
.
setIsSinglePart
(
0
);
packingLibraryEntity
.
setCorresponding
(
count
);
if
(!
strings2
.
isEmpty
())
{
if
(
deviceLibraryDao
.
getAllBySeqNumber
(
strings2
.
get
(
0
)).
size
()
>
0
)
{
throw
new
ApiException
(
"序列号"
+
strings2
.
get
(
0
)
+
"已存在"
);
}
if
(
seqs
.
contains
(
strings2
.
get
(
0
))){
throw
new
ApiException
(
"序列号"
+
strings2
.
get
(
0
)
+
"不能重复"
);
}
packingLibraryEntity
.
setSeq
(
strings2
.
get
(
0
));
strings2
.
remove
(
0
);
}
if
(!
strings1
.
isEmpty
())
{
packingLibraryEntity
.
setProdNumber
(
strings1
.
get
(
0
));
strings1
.
remove
(
0
);
}
seqs
.
add
(
packingLibraryEntity
.
getSeq
());
libraryEntities
.
add
(
packingLibraryEntity
);
}
if
(
s2
.
getStorageCount
()
-
strings2
.
size
()
==
deviceNum
)
{
List
<
PackingLibrary
>
packingLibraries
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
s2
.
getStorageCount
()
-
deviceNum
;
i
++)
{
packingLibraryEntity
=
packingLibraryService
.
getOne
(
s2
.
getPackingId
());
packingLibraryEntity
.
setCorresponding
(
0
);
// packingLibraryEntity.setIsSinglePart(1);
if
(!
strings2
.
isEmpty
())
{
if
(
deviceLibraryDao
.
getAllBySeqNumber
(
strings2
.
get
(
0
)).
size
()
>
0
)
{
throw
new
ApiException
(
"序列号"
+
strings2
.
get
(
0
)
+
"已存在"
);
}
if
(
seqs
.
contains
(
strings2
.
get
(
0
))){
throw
new
ApiException
(
"序列号"
+
strings2
.
get
(
0
)
+
"不能重复"
);
}
packingLibraryEntity
.
setSeq
(
strings2
.
get
(
0
));
strings2
.
remove
(
0
);
}
if
(!
strings1
.
isEmpty
())
{
packingLibraryEntity
.
setProdNumber
(
strings1
.
get
(
0
));
strings1
.
remove
(
0
);
}
seqs
.
add
(
packingLibraryEntity
.
getSeq
());
packingLibraries
.
add
(
packingLibraryEntity
);
}
map
.
put
(
s2
.
getPackingId
(),
packingLibraries
);
}
if
(
s2
.
getList
()
!=
null
&&
s2
.
getList
().
size
()
!=
0
)
{
for
(
int
k
=
0
;
k
<
s2
.
getList
().
size
();
k
++)
{
StorageBillDetailVo
s3
=
s2
.
getList
().
get
(
k
);
if
(
k
>=
sons3
.
size
())
{
sons3
.
add
(
DeviceSeqUtil
.
createDeviceSeqs
(
s3
.
getSeqInterval
(),
s3
.
getStorageCount
()));
sons4
.
add
(
DeviceSeqUtil
.
createDeviceSeqs
(
s3
.
getProdInterval
(),
s3
.
getStorageCount
()));
}
packingLibraryEntity
=
packingLibraryService
.
getOne
(
s3
.
getPackingId
());
List
<
String
>
strings4
=
sons3
.
get
(
k
);
List
<
String
>
strings5
=
sons4
.
get
(
k
);
if
(
s3
.
getStorageCount
()
>=
count
)
{
// packingLibraryEntity.setIsSinglePart(0);
packingLibraryEntity
.
setCorresponding
(
count
);
if
(!
strings4
.
isEmpty
())
{
if
(
deviceLibraryDao
.
getAllBySeqNumber
(
strings4
.
get
(
0
)).
size
()
>
0
)
{
throw
new
ApiException
(
"序列号"
+
strings4
.
get
(
0
)
+
"已存在"
);
}
if
(
seqs
.
contains
(
strings4
.
get
(
0
))){
throw
new
ApiException
(
"序列号"
+
strings4
.
get
(
0
)
+
"不能重复"
);
}
packingLibraryEntity
.
setSeq
(
strings4
.
get
(
0
));
strings4
.
remove
(
0
);
}
if
(!
strings5
.
isEmpty
())
{
packingLibraryEntity
.
setProdNumber
(
strings5
.
get
(
0
));
strings5
.
remove
(
0
);
}
seqs
.
add
(
packingLibraryEntity
.
getSeq
());
libraryEntities
.
add
(
packingLibraryEntity
);
}
if
(
s3
.
getStorageCount
()
-
strings4
.
size
()
==
deviceNum
)
{
List
<
PackingLibrary
>
packingLibraries
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
s3
.
getStorageCount
()
-
deviceNum
;
i
++)
{
packingLibraryEntity
=
packingLibraryService
.
getOne
(
s3
.
getPackingId
());
packingLibraryEntity
.
setCorresponding
(
0
);
// packingLibraryEntity.setIsSinglePart(1);
if
(!
strings4
.
isEmpty
())
{
if
(
deviceLibraryDao
.
getAllBySeqNumber
(
strings4
.
get
(
0
)).
size
()
>
0
)
{
throw
new
ApiException
(
"序列号"
+
strings4
.
get
(
0
)
+
"已存在"
);
}
if
(
seqs
.
contains
(
strings4
.
get
(
0
))){
throw
new
ApiException
(
"序列号"
+
strings4
.
get
(
0
)
+
"不能重复"
);
}
packingLibraryEntity
.
setSeq
(
strings4
.
get
(
0
));
strings4
.
remove
(
0
);
}
if
(!
strings5
.
isEmpty
())
{
packingLibraryEntity
.
setProdNumber
(
strings5
.
get
(
0
));
strings5
.
remove
(
0
);
}
seqs
.
add
(
packingLibraryEntity
.
getSeq
());
packingLibraries
.
add
(
packingLibraryEntity
);
public
ResponseEntity
<
List
<
BackCreateSeqVo
>>
addStorageDetail
(
@RequestBody
List
<
CreateSeqVo
>
createSeqVos
)
{
List
<
BackCreateSeqVo
>
backCreateSeqVos
=
new
ArrayList
<>();
//当手动输入序列号的时候 需要进行遍历成集合
createSeqVos
.
forEach
(
createSeqVo
->
{
List
<
String
>
deviceSeqs
=
DeviceSeqUtil
.
selectDeviceSeqs
(
createSeqVo
.
getSeqInterval
());
createSeqVo
.
setSeqList
(
deviceSeqs
);
});
//做校验 数量跟序列号
createSeqVos
.
forEach
(
createSeqVo
->
{
if
(
createSeqVo
.
getStorageCount
()!=
createSeqVo
.
getSeqList
().
size
()){
throw
new
ApiException
(
"序列号与入库数量不匹配"
);
}
map
.
put
(
s3
.
getPackingId
(),
packingLibraries
);
});
//开始拆分装备
for
(
CreateSeqVo
createSeqVo
:
createSeqVos
)
{
List
<
String
>
seqList
=
createSeqVo
.
getSeqList
();
for
(
int
i
=
0
;
i
<
seqList
.
size
();
i
++)
{
BackCreateSeqVo
backCreateSeqVo
=
new
BackCreateSeqVo
();
BeanUtils
.
copyProperties
(
createSeqVo
,
backCreateSeqVo
);
backCreateSeqVo
.
setSeqNumber
(
seqList
.
get
(
i
));
backCreateSeqVos
.
add
(
backCreateSeqVo
);
}
}
return
ResponseEntity
.
ok
(
backCreateSeqVos
);
}
}
}
count
=
count
+
1
;
}
}
}
for
(
Integer
i
:
map
.
keySet
())
{
libraryEntities
.
addAll
(
map
.
get
(
i
));
}
return
ResultUtil
.
success
(
libraryEntities
);
}
@ApiOperation
(
value
=
"办结后添加其他单据"
,
notes
=
"办结后添加其他单据"
)
@PostMapping
(
value
=
"/addOtherFiles/{taskId}"
)
...
...
@@ -671,6 +721,14 @@ public class StorageBillController {
deviceLogDtos
.
add
(
deviceLogDto
);
stringBuffer
.
append
(
"x"
);
});
}
else
if
(!
batchEntitiesIsBinding0
.
isEmpty
()){
batchEntitiesIsBinding0
.
forEach
(
deviceLibrary
->
{
stringBuffer
.
append
(
deviceLibrary
.
getId
());
//存装备日志
DeviceLogDto
deviceLogDto
=
new
DeviceLogDto
(
deviceLibrary
.
getId
(),
logMessage
,
fileVoList
,
null
,
taskEntity1
.
getId
());
deviceLogDtos
.
add
(
deviceLogDto
);
stringBuffer
.
append
(
"x"
);
});
}
stopWatch
.
stop
();
log
.
info
(
"存放所有save的装备时间:{}"
,
stopWatch
.
getTotalTimeMillis
()+
"ms"
);
...
...
dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/BackCreateSeqVo.java
0 → 100644
浏览文件 @
40e19d66
package
com
.
tykj
.
dev
.
device
.
storage
.
subject
.
vo
;
import
com.tykj.dev.device.packing.subject.domin.PackingLibrary
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zsp
*/
@Data
@ApiModel
(
"拆分之后的装备"
)
public
class
BackCreateSeqVo
{
@ApiModelProperty
(
name
=
"列装对象"
)
private
PackingLibrary
packingLibrary
;
@ApiModelProperty
(
name
=
"入库数量"
,
example
=
"1"
)
private
Integer
storageCount
;
@ApiModelProperty
(
name
=
"生成的序列号区间"
,
example
=
"1"
)
private
String
seqInterval
;
@ApiModelProperty
(
name
=
"生成的序列号集合"
)
private
List
<
String
>
seqList
;
@ApiModelProperty
(
name
=
"生成的装备序列号"
)
private
String
seqNumber
;
}
dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/CreateSeqVo.java
浏览文件 @
40e19d66
package
com
.
tykj
.
dev
.
device
.
storage
.
subject
.
vo
;
import
com.tykj.dev.device.packing.subject.domin.PackingLibrary
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zsp
*/
...
...
@@ -11,15 +14,18 @@ import lombok.Data;
@ApiModel
(
"生成附件的装备序列号"
)
public
class
CreateSeqVo
{
@ApiModelProperty
(
name
=
"型号"
)
private
String
model
;
@ApiModelProperty
(
name
=
"列装对象"
)
private
PackingLibrary
packingLibrary
;
@ApiModelProperty
(
name
=
"入库数量"
,
example
=
"1"
)
private
Integer
storageCount
;
@ApiModelProperty
(
name
=
"生成的序列号区间"
,
example
=
"1"
)
private
String
seqInterval
;
@ApiModelProperty
(
name
=
"生成的序列号集合"
)
private
List
<
String
>
seqList
;
@ApiModelProperty
(
name
=
"类型"
,
example
=
"1"
)
private
String
type
;
@ApiModelProperty
(
name
=
"形态"
,
example
=
"1"
)
private
String
style
;
@ApiModelProperty
(
name
=
"数量"
)
private
Integer
num
;
}
dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/ReceiveCreateSeqVo.java
0 → 100644
浏览文件 @
40e19d66
package
com
.
tykj
.
dev
.
device
.
storage
.
subject
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zsp
*/
@Data
@ApiModel
(
"生成装备序列号"
)
public
class
ReceiveCreateSeqVo
{
@ApiModelProperty
(
name
=
"列装id"
)
private
Integer
packingId
;
@ApiModelProperty
(
name
=
"入库数量"
,
example
=
"1"
)
private
Integer
storageCount
;
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论