|
@@ -125,7 +125,7 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
String ylCodeProduce = BusinessIdGenerator.generateBusinessIdForProduct(i.get());
|
|
|
String ylCodeProduceZz = BusinessIdGenerator.generateBusinessIdForProductZz(i.get());
|
|
|
item.setYlCode(ylCode);
|
|
|
- item.setProductCode(ylCodeProduce);
|
|
|
+ item.setProductNumber(ylCodeProduce);
|
|
|
item.setRecordNumber(ylCodeProduceZz);
|
|
|
i.getAndIncrement();
|
|
|
QyRecordProduct qyRecordProduct = BeanUtil.toBean(item, QyRecordProduct.class);
|
|
@@ -210,7 +210,7 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
String ylCodeProduce = BusinessIdGenerator.generateBusinessIdForProduct(i.get());
|
|
|
String ylCodeProduceZz = BusinessIdGenerator.generateBusinessIdForProductZz(i.get());
|
|
|
item.setYlCode(ylCode);
|
|
|
- item.setProductCode(ylCodeProduce);
|
|
|
+ item.setProductNumber(ylCodeProduce);
|
|
|
item.setRecordNumber(ylCodeProduceZz);
|
|
|
QyRecardBody qyRecardBody = BeanUtil.toBean(item, QyRecardBody.class);
|
|
|
qyRecardBody.setQyRecordInfoId(qyRecordInfo.getId());
|
|
@@ -283,8 +283,10 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
QyRecordInfo recordInfo = this.queryEntity(qyRecordInfoIdParam.getId());
|
|
|
List<QyRecardBody> bodyList = qyRecardBodyService.list(new LambdaQueryWrapper<QyRecardBody>().eq(QyRecardBody::getQyRecordInfoId, recordInfo.getId()));
|
|
|
List<QyRecordAttachment> attachmentList = qyRecordAttachmentService.list(new LambdaQueryWrapper<QyRecordAttachment>().eq(QyRecordAttachment::getQyRecordInfoId, recordInfo.getId()));
|
|
|
+ List<QyRecordProduct> qyRecordProductList = qyRecordProductService.list(new LambdaQueryWrapper<QyRecordProduct>().eq(QyRecordProduct::getQyRecordInfoId, recordInfo.getId()));
|
|
|
QyRecordInfoAddParam param = BeanUtil.toBean(recordInfo, QyRecordInfoAddParam.class);
|
|
|
List<QyRecardBodyAddParam> qyRecardBodyAddParamList = new ArrayList<>();
|
|
|
+ List<QyRecordProductAddParam> qyRecordProductAddParamArrayList = new ArrayList<>();
|
|
|
List<QyRecordAttachmentAddParam> qyRecordAttachmentAddParamList = new ArrayList<>();
|
|
|
if(CollectionUtil.isNotEmpty(bodyList)){
|
|
|
bodyList.stream().forEach(item ->{
|
|
@@ -292,6 +294,12 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
qyRecardBodyAddParamList.add(bean);
|
|
|
});
|
|
|
}
|
|
|
+ if(CollectionUtil.isNotEmpty(qyRecordProductList)){
|
|
|
+ qyRecordProductList.stream().forEach(item ->{
|
|
|
+ QyRecordProductAddParam bean = BeanUtil.toBean(item, QyRecordProductAddParam.class);
|
|
|
+ qyRecordProductAddParamArrayList.add(bean);
|
|
|
+ });
|
|
|
+ }
|
|
|
if(CollectionUtil.isNotEmpty(attachmentList)){
|
|
|
attachmentList.stream().forEach(item ->{
|
|
|
QyRecordAttachmentAddParam bean_ = BeanUtil.toBean(item, QyRecordAttachmentAddParam.class);
|
|
@@ -300,6 +308,7 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
}
|
|
|
param.setQyRecardBodyAddParams(qyRecardBodyAddParamList);
|
|
|
param.setQyRecordAttachmentAddParams(qyRecordAttachmentAddParamList);
|
|
|
+ param.setQyRecordProductAddParams(qyRecordProductAddParamArrayList);
|
|
|
return param;
|
|
|
}
|
|
|
|