|
|
@@ -1472,11 +1472,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
// 类型值 2 ,41
|
|
|
List<OrderInstallDetailCode> codes = orderInstallDetailCodeService.lambdaQuery()
|
|
|
.eq(OrderInstallDetailCode::getOrderBaseId, detail.getOrderBaseId())
|
|
|
- .eq(OrderInstallDetailCode::getStatus,2).list();
|
|
|
+ .eq(OrderInstallDetailCode::getType,2)
|
|
|
+ .eq(OrderInstallDetailCode::getStatus,1).list();
|
|
|
|
|
|
OrderDetailFile detailFile = orderDetailFileService.lambdaQuery()
|
|
|
.eq(OrderDetailFile::getOrderBaseId, detail.getOrderBaseId())
|
|
|
- .in(OrderDetailFile::getFileType,41).last("limit 1").one();
|
|
|
+ .eq(OrderDetailFile::getFileType,41).last("limit 1").one();
|
|
|
if (detailFile != null && CollectionUtils.isNotEmpty(codes)){
|
|
|
for (OrderInstallDetailCode code:codes){
|
|
|
// 条码类型相同，采集图与上传图同步
|
yaozhixue