yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():问题修复

Browse Source
master
jiyufei 2 months ago
parent 11015adb3e
commit 1b0e225cec
10 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java
Unescape View File

@ -415,7 +415,7 @@ public class YysBillMaterialServiceImpl extends ServiceImpl<YysBillMaterialMappe
@Override @Override
public List<YysSubsetMaterialEntity> queryByPieceId(YysBillMaterialPagination yysBillMaterialPagination) { public List<YysSubsetMaterialEntity> queryByPieceId(YysBillMaterialPagination yysBillMaterialPagination) {
LambdaQueryWrapper<YysSubsetMaterialEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YysSubsetMaterialEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YysSubsetMaterialEntity::getPieceId, yysBillMaterialPagination.getPieceId()); wrapper.eq(YysSubsetMaterialEntity::getSubsetId, yysBillMaterialPagination.getPieceId());
wrapper.isNull(YysSubsetMaterialEntity::getDeleteMark); wrapper.isNull(YysSubsetMaterialEntity::getDeleteMark);
Page<YysSubsetMaterialEntity> page = new Page<>(yysBillMaterialPagination.getCurrentPage(), yysBillMaterialPagination.getPageSize()); Page<YysSubsetMaterialEntity> page = new Page<>(yysBillMaterialPagination.getCurrentPage(), yysBillMaterialPagination.getPageSize());
IPage<YysSubsetMaterialEntity> userIPage = yysSubsetMaterialService.page(page, wrapper); IPage<YysSubsetMaterialEntity> userIPage = yysSubsetMaterialService.page(page, wrapper);

2
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialClassServiceImpl.java
Unescape View File

@ -180,7 +180,7 @@ public class YysMaterialClassServiceImpl extends ServiceImpl<YysMaterialClassMap
String value = yysMaterialClassPagination.getParentClassification() instanceof List ? String value = yysMaterialClassPagination.getParentClassification() instanceof List ?
JsonUtil.getObjectToString(yysMaterialClassPagination.getParentClassification()) : JsonUtil.getObjectToString(yysMaterialClassPagination.getParentClassification()) :
String.valueOf(yysMaterialClassPagination.getParentClassification()); String.valueOf(yysMaterialClassPagination.getParentClassification());
yysMaterialClassQueryWrapper.lambda().like(YysMaterialClassEntity::getParentClassification, value); yysMaterialClassQueryWrapper.lambda().like(YysMaterialClassEntity::getParentClassname, value);
} }

2
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierClassServiceImpl.java
Unescape View File

@ -178,7 +178,7 @@ public class YysSupplierClassServiceImpl extends ServiceImpl<YysSupplierClassMap
String value = yysSupplierClassPagination.getParentClassification() instanceof List ? String value = yysSupplierClassPagination.getParentClassification() instanceof List ?
JsonUtil.getObjectToString(yysSupplierClassPagination.getParentClassification()) : JsonUtil.getObjectToString(yysSupplierClassPagination.getParentClassification()) :
String.valueOf(yysSupplierClassPagination.getParentClassification()); String.valueOf(yysSupplierClassPagination.getParentClassification());
yysSupplierClassQueryWrapper.lambda().like(YysSupplierClassEntity::getParentClassification, value); yysSupplierClassQueryWrapper.lambda().like(YysSupplierClassEntity::getParentClassname, value);
} }

10
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysInventoryQueryController.java
Unescape View File

@ -13,9 +13,11 @@ import jnpf.entity.*;
import jnpf.util.*; import jnpf.util.*;
import jnpf.model.yysinventoryquery.*; import jnpf.model.yysinventoryquery.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.*; import java.util.*;
@ -56,6 +58,9 @@ public class YysInventoryQueryController {
@Autowired @Autowired
private YysInventoryQueryService yysInventoryQueryService; private YysInventoryQueryService yysInventoryQueryService;
@Resource
private YysMaterialClassService yysMaterialClassService;
/** /**
* 列表 * 列表
@ -68,9 +73,14 @@ public class YysInventoryQueryController {
public ActionResult list(@RequestBody YysInventoryQueryPagination yysInventoryQueryPagination) throws IOException { public ActionResult list(@RequestBody YysInventoryQueryPagination yysInventoryQueryPagination) throws IOException {
List<YysInventoryQueryEntity> list = yysInventoryQueryService.getList(yysInventoryQueryPagination); List<YysInventoryQueryEntity> list = yysInventoryQueryService.getList(yysInventoryQueryPagination);
List<Map<String, Object>> realList = new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
List<YysMaterialClassEntity> list1 = yysMaterialClassService.list();
Map<String, String> collect = list1.stream().collect(Collectors.toMap(YysMaterialClassEntity::getClassId, YysMaterialClassEntity::getClassName));
for (YysInventoryQueryEntity entity : list) { for (YysInventoryQueryEntity entity : list) {
Map<String, Object> yysInventoryQueryMap = JsonUtil.entityToMap(entity); Map<String, Object> yysInventoryQueryMap = JsonUtil.entityToMap(entity);
yysInventoryQueryMap.put("id", yysInventoryQueryMap.get("id")); yysInventoryQueryMap.put("id", yysInventoryQueryMap.get("id"));
if (MapUtils.isNotEmpty(collect) && collect.containsKey(entity.getMaterialClassification())) {
yysInventoryQueryMap.put("materialClassification", collect.get(entity.getMaterialClassification()));
}
//副表数据 //副表数据
//子表数据 //子表数据
realList.add(yysInventoryQueryMap); realList.add(yysInventoryQueryMap);

3
jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue
Unescape View File

@ -15,7 +15,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据状态"> <el-form-item label="单据状态">
<el-input v-model="query.documentStatus" placeholder="请输入" clearable> </el-input> <JnpfSelect v-model="query.documentStatus" placeholder="请输入" clearable
:options="documentStatusOptions" :props="documentStatusProps"> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">

4
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialclass/index.vue
Unescape View File

@ -15,7 +15,9 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
:options="enableStatusOptions" :props="enableStatusProps">
</JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">

4
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialinformation/index.vue
Unescape View File

@ -21,7 +21,9 @@
<template v-if="showAll"> <template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
:options="enableStatusOptions" :props="enableStatusProps">
</JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>

4
jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierclass/index.vue
Unescape View File

@ -15,7 +15,9 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
:options="enableStatusOptions" :props="enableStatusProps">
</JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">

4
jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue
Unescape View File

@ -15,7 +15,9 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
:options="enableStatusOptions" :props="enableStatusProps">
</JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">

4
jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue
Unescape View File

@ -10,7 +10,9 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
:options="enableStatusOptions" :props="enableStatusProps">
</JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">

Write Preview
Loading…
Cancel
Save