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

feat():前端样式调整;

Browse Source
master
jiyufei 2 months ago
parent 33f534173f
commit 2d0267c80d
4 changed files with 418 additions and 356 deletions
Show Stats Download Patch File Download Diff File

52
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java
Unescape View File

@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialRequirementPlanMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysmaterialrequirementplan.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* YysMaterialRequirementPlan
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -48,11 +60,15 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
@Autowired
private YysMaterialRequirementItemService yysMaterialRequirementItemService;
@Override
public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
return getTypeList(yysMaterialRequirementPlanPagination, yysMaterialRequirementPlanPagination.getDataType());
}
/** 列表查询 */
/**
* 列表查询
*/
@Override
public List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination, String dataType) {
String userId = userProvider.get().getUserId();
@ -316,27 +332,34 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
return this.list(yysMaterialRequirementPlanQueryWrapper);
}
}
@Override
public YysMaterialRequirementPlanEntity getInfo(String id) {
QueryWrapper<YysMaterialRequirementPlanEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysMaterialRequirementPlanEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, YysMaterialRequirementPlanEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(YysMaterialRequirementPlanEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** YysMaterialRequirementItem子表方法 */
/**
* YysMaterialRequirementItem子表方法
*/
@Override
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id, YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
Map<String, Object> newtabMap = YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet()
@ -350,14 +373,19 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
return yysMaterialRequirementItemService.list(queryWrapper);
}
/** YysMaterialRequirementItem子表方法 */
/**
* YysMaterialRequirementItem子表方法
*/
@Override
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id) {
QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id);
return yysMaterialRequirementItemService.list(queryWrapper);
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override
public String checkForm(YysMaterialRequirementPlanForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@ -372,24 +400,24 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) {
if (StringUtil.isNotEmpty(t.getMaterialCode())) {
t.setMaterialCode(t.getMaterialCode().trim());
}
else{
} else {
return "设计子表-物料编码不能为空";
}
}
for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) {
if (StringUtil.isNotEmpty(t.getMaterialName())) {
t.setMaterialName(t.getMaterialName().trim());
}
else{
} else {
return "设计子表-物料名称不能为空";
}
}
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
*
* @param id
* @param yysMaterialRequirementPlanForm
* @return
@ -407,7 +435,11 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
String mainId = RandomUtil.uuId();
entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false));
entity.setId(mainId);
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
} else {
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
// entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false));
}
this.saveOrUpdate(entity);
@ -424,6 +456,8 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
entitys.setId(RandomUtil.uuId());
entitys.setMaterialRequirementPlanId(entity.getId());
if (isSave) {
entitys.setCreatorTime(DateUtil.getNowDate());
entitys.setCreatorUserId(userInfo.getUserId());
} else {
}
yysMaterialRequirementItemService.saveOrUpdate(entitys);

26
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java
Unescape View File

@ -8,23 +8,30 @@ import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysmaterialrequirementplan.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
@ -36,7 +43,9 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
@ -51,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* YysMaterialRequirementPlan
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
@ -78,6 +88,9 @@ public class YysMaterialRequirementPlanController {
@Autowired
private ConfigValueUtil configValueUtil;
@Resource
private UserService userService;
/**
* 列表
*
@ -92,6 +105,9 @@ public class YysMaterialRequirementPlanController {
for (YysMaterialRequirementPlanEntity entity : list) {
Map<String, Object> yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id"));
if (StringUtils.isNoneBlank(yysMaterialRequirementPlanMap.get("creatorUserId").toString())) {
yysMaterialRequirementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialRequirementPlanMap.get("creatorUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(), yysMaterialRequirementPlanPagination);
@ -108,6 +124,7 @@ public class YysMaterialRequirementPlanController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
@ -128,6 +145,7 @@ public class YysMaterialRequirementPlanController {
}
return ActionResult.success("创建成功");
}
/**
* 导出Excel
*
@ -283,8 +301,10 @@ public class YysMaterialRequirementPlanController {
}
return vo;
}
/**
* 编辑
*
* @param id
* @param yysMaterialRequirementPlanForm
* @return
@ -312,8 +332,10 @@ public class YysMaterialRequirementPlanController {
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
*
* @param id
* @return
*/
@ -329,9 +351,11 @@ public class YysMaterialRequirementPlanController {
}
return ActionResult.success("删除成功");
}
/**
* 表单信息(详情页)
* 详情页面使用-转换数据
*
* @param id
* @return
*/
@ -351,9 +375,11 @@ public class YysMaterialRequirementPlanController {
yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialRequirementPlanMap, YysMaterialRequirementPlanConstant.getFormData(), "590812661621456901", false);
return ActionResult.success(yysMaterialRequirementPlanMap);
}
/**
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
*
* @param id
* @return
*/

2
jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue
Unescape View File

@ -82,7 +82,7 @@
<JnpfNumber v-model="scope.row.sort" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="班次" prop="post" algin="center">
<el-table-column label="班次" prop="post" align="center">
<template slot-scope="scope">
{{ scope.row.post }}
</template>

12
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
Unescape View File

@ -68,9 +68,15 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="planYearMonth" label="年月" align="center">
</el-table-column>
<el-table-column prop="planNumber" label="物料需求计划单号" align="center">
</el-table-column>
<el-table-column prop="reamrk" label="备注" align="center">
<el-table-column prop="orderDate" label="单据日期" align="center">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="创建日期" align="center">
</el-table-column>
<el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center">
<!-- <template slot-scope="scope">
@ -81,10 +87,6 @@
<el-tag type="success" v-else-if="scope.row.isCreatePlan == '否'">否</el-tag>
</template>
</el-table-column>
<el-table-column prop="planYearMonth" label="年月" align="center">
</el-table-column>
<el-table-column prop="orderDate" label="单据日期" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑

Write Preview
Loading…
Cancel
Save