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

feat():重构包装报工确认

Browse Source
master
jiyufei 2 months ago
parent ac722e2784
commit 8592c2d48a
13 changed files with 1051 additions and 1046 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysPackageReportMapper.java
Unescape View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-08-07
* 日期： 2024-08-19
*/
public interface YysPackageReportMapper extends BaseMapper<YysPackageReportEntity> {

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

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-08-07
* 日期： 2024-08-19
*/
public interface YysPackageReportService extends IService<YysPackageReportEntity> {
List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination);

286
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysPackageReportServiceImpl.java
Unescape View File

@ -1,58 +1,45 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.YysPackageReportMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yyspackagereport.*;
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.concurrent.CompletableFuture;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel;
import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.entity.YysPackageReportEntity;
import jnpf.mapper.YysPackageReportMapper;
import jnpf.model.QueryModel;
import jnpf.model.yyspackagereport.YysPackageReportConstant;
import jnpf.model.yyspackagereport.YysPackageReportForm;
import jnpf.model.yyspackagereport.YysPackageReportPagination;
import jnpf.permission.entity.UserEntity;
import jnpf.service.YysDayLogsService;
import jnpf.service.YysPackageReportService;
import jnpf.util.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
*
* yysPackageReport
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-08-07
* 日期： 2024-08-19
*/
@Service
@Slf4j
@ -67,98 +54,98 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
private YysDayLogsService yysDayLogsService;
@Override
public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination) {
return getTypeList(yysPackageReportPagination, yysPackageReportPagination.getDataType());
public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination){
return getTypeList(yysPackageReportPagination,yysPackageReportPagination.getDataType());
}
/**
* 列表查询
*/
@Override
public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination, String dataType) {
String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList = new ArrayList<>();
public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysPackageReportConstant.getAppColumnData() : YysPackageReportConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total = 0;
int yysPackageReportNum = 0;
QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper = new QueryWrapper<>();
int total=0;
int yysPackageReportNum =0;
QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp = "";
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())) {
String superOp ="";
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysPackageReportPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper, YysPackageReportEntity.class, queryJson, "0"));
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper,YysPackageReportEntity.class,queryJson,"0"));
int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
if (yysPackageReportNum1 > 0) {
List<String> yysPackageReportList = this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
if (yysPackageReportNum1>0){
List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysPackageReportList);
intersectionSuperList.add(yysPackageReportList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if (superOp.equalsIgnoreCase("and")) {
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
} else {
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper, YysPackageReportEntity.class, ruleJson, "0"));
yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper,YysPackageReportEntity.class,ruleJson,"0"));
int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
if (yysPackageReportNum1 > 0) {
List<String> yysPackageReportList = this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
if (yysPackageReportNum1>0){
List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysPackageReportList);
intersectionRuleList.add(yysPackageReportList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if (ruleOp.equalsIgnoreCase("and")) {
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
} else {
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysPackageReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper, YysPackageReportEntity.class, yysPackageReportPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysPackageReportObj)) {
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysPackageReportObj)){
return new ArrayList<>();
} else {
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>) yysPackageReportObj;
if (yysPackageReportQueryWrapper.getExpression().getNormal().size() > 0) {
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
yysPackageReportNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysPackageReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper, YysPackageReportEntity.class, yysPackageReportPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysPackageReportObj)) {
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysPackageReportObj)){
return new ArrayList<>();
} else {
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>) yysPackageReportObj;
if (yysPackageReportQueryWrapper.getExpression().getNormal().size() > 0) {
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
yysPackageReportNum++;
}
}
@ -166,11 +153,11 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())) {
if(isPc){
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())){
yysPackageReportNum++;
List ManufactureTimeList = JsonUtil.getJsonToList(yysPackageReportPagination.getManufactureTime(), String.class);
List ManufactureTimeList = JsonUtil.getJsonToList(yysPackageReportPagination.getManufactureTime(),String.class);
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
@ -180,59 +167,59 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
}
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())) {
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())){
yysPackageReportNum++;
String value = yysPackageReportPagination.getProductName() instanceof List ?
JsonUtil.getObjectToString(yysPackageReportPagination.getProductName()) :
String.valueOf(yysPackageReportPagination.getProductName());
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductName, value);
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductName,value);
}
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductCode())) {
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductCode())){
yysPackageReportNum++;
String value = yysPackageReportPagination.getProductCode() instanceof List ?
JsonUtil.getObjectToString(yysPackageReportPagination.getProductCode()) :
String.valueOf(yysPackageReportPagination.getProductCode());
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductCode, value);
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductCode,value);
}
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getDeviceName())) {
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getDeviceName())){
yysPackageReportNum++;
String value = yysPackageReportPagination.getDeviceName() instanceof List ?
JsonUtil.getObjectToString(yysPackageReportPagination.getDeviceName()) :
String.valueOf(yysPackageReportPagination.getDeviceName());
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getDeviceName, value);
yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getDeviceName,value);
}
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getStatus())) {
if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getStatus())){
yysPackageReportNum++;
List<String> idList = new ArrayList<>();
try {
String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(), String[][].class);
for (int i = 0; i < status.length; i++) {
if (status[i].length > 0) {
String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(),String[][].class);
for(int i=0;i<status.length;i++){
if(status[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i])));
}
}
} catch (Exception e1) {
}catch (Exception e1){
try {
List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(), String.class);
if (status.size() > 0) {
List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(),String.class);
if(status.size()>0){
idList.addAll(status);
}
} catch (Exception e2) {
}catch (Exception e2){
idList.add(String.valueOf(yysPackageReportPagination.getStatus()));
}
}
yysPackageReportQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
yysPackageReportQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(YysPackageReportEntity::getStatus, tt).or();
});
});
@ -241,131 +228,118 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total > 0) {
if (intersection.size() == 0) {
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
yysPackageReportQueryWrapper.lambda().in(YysPackageReportEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
yysPackageReportQueryWrapper.lambda().and(t -> t.in(YysPackageReportEntity::getId, finalAllSuperIDlist));
yysPackageReportQueryWrapper.lambda().and(t->t.in(YysPackageReportEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
yysPackageReportQueryWrapper.lambda().and(t -> t.in(YysPackageReportEntity::getId, finalAllRuleIDlist));
yysPackageReportQueryWrapper.lambda().and(t->t.in(YysPackageReportEntity::getId, finalAllRuleIDlist));
}
//假删除标志
yysPackageReportQueryWrapper.lambda().isNull(YysPackageReportEntity::getDeleteMark);
//排序
yysPackageReportQueryWrapper.last("ORDER BY CAST(sort AS UNSIGNED)");
// if (StringUtil.isEmpty(yysPackageReportPagination.getSidx())) {
// yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
// } else {
// try {
// String sidx = yysPackageReportPagination.getSidx();
// String[] strs = sidx.split("_name");
// YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
// Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
// declaredField.setAccessible(true);
// String value = declaredField.getAnnotation(TableField.class).value();
// yysPackageReportQueryWrapper = "asc".equals(yysPackageReportPagination.getSort().toLowerCase()) ? yysPackageReportQueryWrapper.orderByAsc(value) : yysPackageReportQueryWrapper.orderByDesc(value);
// } catch (NoSuchFieldException e) {
// e.printStackTrace();
// }
// }
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysPackageReportEntity> page = new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize());
IPage<YysPackageReportEntity> userIPage = this.page(page, yysPackageReportQueryWrapper);
return yysPackageReportPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
if(StringUtil.isEmpty(yysPackageReportPagination.getSidx())){
yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
}else{
try {
String sidx = yysPackageReportPagination.getSidx();
String[] strs= sidx.split("_name");
YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
yysPackageReportQueryWrapper="asc".equals(yysPackageReportPagination.getSort().toLowerCase())?yysPackageReportQueryWrapper.orderByAsc(value):yysPackageReportQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<YysPackageReportEntity> page=new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize());
IPage<YysPackageReportEntity> userIPage=this.page(page, yysPackageReportQueryWrapper);
return yysPackageReportPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<YysPackageReportEntity> list = new ArrayList();
return yysPackageReportPagination.setData(list, list.size());
}
} else {
}else{
return this.list(yysPackageReportQueryWrapper);
}
}
@Override
public YysPackageReportEntity getInfo(String id) {
QueryWrapper<YysPackageReportEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysPackageReportEntity::getId, id);
public YysPackageReportEntity getInfo(String id){
QueryWrapper<YysPackageReportEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(YysPackageReportEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysPackageReportEntity entity) {
public void create(YysPackageReportEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, YysPackageReportEntity entity) {
public boolean update(String id, YysPackageReportEntity entity){
return this.updateById(entity);
}
@Override
public void delete(YysPackageReportEntity entity) {
if (entity != null) {
public void delete(YysPackageReportEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@Override
public String checkForm(YysPackageReportForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
public String checkForm(YysPackageReportForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp) {
if (isUp){
id = form.getId();
}
//主表字段验证
if (StringUtil.isEmpty(form.getDeviceName())) {
if(StringUtil.isEmpty(form.getDeviceName())){
return "设备名称不能为空";
}
if (StringUtil.isEmpty(form.getProductCode())) {
return "产品编码不能为空";
}
if (StringUtil.isEmpty(form.getProductName())) {
if(StringUtil.isEmpty(form.getProductName())){
return "产品名称不能为空";
}
if (StringUtil.isEmpty(form.getModels())) {
if(StringUtil.isEmpty(form.getModels())){
return "规格型号不能为空";
}
if (StringUtil.isEmpty(form.getMeasurementUnit())) {
if(StringUtil.isEmpty(form.getMeasurementUnit())){
return "计量单位不能为空";
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
*
* @param id
* @param yysPackageReportForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(YysPackageReportForm yysPackageReportForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
public void saveOrUpdate(YysPackageReportForm yysPackageReportForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysPackageReportForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(), yysPackageReportForm), YysPackageReportForm.class);
generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(),yysPackageReportForm),YysPackageReportForm.class);
YysPackageReportEntity entity = JsonUtil.getJsonToBean(yysPackageReportForm, YysPackageReportEntity.class);
if (isSave) {

8
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysPackageReportController.java
Unescape View File

@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-08-07
* @日期： 2024-08-19
*/
@Slf4j
@RestController
@ -150,9 +150,6 @@ public class YysPackageReportController {
case "deviceName" :
entitys.add(new ExcelExportEntity("设备名称" ,"deviceName"));
break;
case "sort" :
entitys.add(new ExcelExportEntity("顺序号" ,"sort"));
break;
case "post" :
entitys.add(new ExcelExportEntity("班次" ,"post"));
break;
@ -198,6 +195,9 @@ public class YysPackageReportController {
case "status" :
entitys.add(new ExcelExportEntity("确认状态" ,"status"));
break;
case "sort" :
entitys.add(new ExcelExportEntity("顺序号" ,"sort"));
break;
default:
break;
}

8
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysPackageReportEntity.java
Unescape View File

@ -10,17 +10,17 @@ import java.math.BigDecimal;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-08-07
* @日期： 2024-08-19
*/
@Data
@TableName("yys_package_report")
public class YysPackageReportEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "WORK_ID" , updateStrategy = FieldStrategy.IGNORED)
@TableField("WORK_ID")
private String workId;
@TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date manufactureTime;
private String manufactureTime;
@TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
private String deviceCode;
@TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@ -29,7 +29,7 @@ public class YysPackageReportEntity {
private Integer sort;
@TableField(value = "POST" , updateStrategy = FieldStrategy.IGNORED)
private String post;
@TableField(value = "START_TIME" , updateStrategy = FieldStrategy.IGNORED)
@TableField("START_TIME")
private String startTime;
@TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED)
private String endTime;

10
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportConstant.java
View File

File diff suppressed because one or more lines are too long

10
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportForm.java
Unescape View File

@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-08-07
* @日期： 2024-08-19
*/
@Data
public class YysPackageReportForm {
@ -29,12 +29,9 @@ public class YysPackageReportForm {
/** 设备名称 **/
@JsonProperty("deviceName")
private String deviceName;
/** 顺序号 **/
@JsonProperty("sort")
private BigDecimal sort;
/** 班次 **/
@JsonProperty("post")
private Object post;
private String post;
/** 开始时间 **/
@JsonProperty("startTime")
private String startTime;
@ -77,4 +74,7 @@ public class YysPackageReportForm {
/** 确认状态 **/
@JsonProperty("status")
private Object status;
/** 顺序号 **/
@JsonProperty("sort")
private BigDecimal sort;
}

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-08-07
* @日期： 2024-08-19
*/
@Data
public class YysPackageReportPagination extends Pagination {

237
jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/Detail.vue
Unescape View File

@ -1,133 +1,164 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="生产日期" prop="manufactureTime">
<p>{{ dataForm.manufactureTime }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="生产日期"
prop="manufactureTime" >
<p>{{dataForm.manufactureTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备编码" prop="deviceCode">
<p>{{ dataForm.deviceCode }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<p>{{ dataForm.deviceName }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="顺序号" prop="sort">
<JnpfNumber v-model="dataForm.sort" placeholder="数字文本" disabled :min="1" :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="班次" prop="post">
<p>{{ dataForm.post }} </p>
<el-col :span="8" >
<jnpf-form-tip-item label="班次"
prop="post" >
<p>{{dataForm.post}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<p>{{ dataForm.startTime }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="开始时间"
prop="steatTime" >
<p>{{dataForm.steatTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<p>{{ dataForm.endTime }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="结束时间"
prop="endTime" >
<p>{{dataForm.endTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="产品编码" prop="productCode">
<p>{{ dataForm.productCode }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="产品编码"
prop="productCode" >
<p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="产品名称" prop="productName">
<p>{{ dataForm.productName }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="产品名称"
prop="productName" >
<p>{{dataForm.productName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="规格型号" prop="models">
<p>{{ dataForm.models }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="规格型号"
prop="models" >
<p>{{dataForm.models}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计量单位" prop="measurementUnit">
<p>{{ dataForm.measurementUnit }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="计量单位"
prop="measurementUnit" >
<p>{{dataForm.measurementUnit}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计划数量" prop="planNum">
<JnpfNumber v-model="dataForm.planNum" placeholder="计划数量" disabled :step="1">
<el-col :span="8" >
<jnpf-form-tip-item label="计划数量"
prop="planNum" >
<JnpfNumber v-model="dataForm.planNum"
placeholder="计划数量" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="数采数量" prop="acquisitionNum">
<JnpfNumber v-model="dataForm.acquisitionNum" placeholder="数采数量" disabled :step="1">
<el-col :span="8" >
<jnpf-form-tip-item label="数采数量"
prop="acquisitionNum" >
<JnpfNumber v-model="dataForm.acquisitionNum"
placeholder="数采数量" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="次品数量" prop="defectiveNum">
<JnpfNumber v-model="dataForm.defectiveNum" placeholder="次品数量" disabled :step="1">
<el-col :span="8" >
<jnpf-form-tip-item label="次品数量"
prop="defectiveNum" >
<JnpfNumber v-model="dataForm.defectiveNum"
placeholder="次品数量" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="合格数量" prop="qualifiedNum">
<JnpfNumber v-model="dataForm.qualifiedNum" placeholder="合格数量" disabled :step="1">
<el-col :span="8" >
<jnpf-form-tip-item label="合格数量"
prop="qualifiedNum" >
<JnpfNumber v-model="dataForm.qualifiedNum"
placeholder="合格数量" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="补偿工时" prop="compensatoryHour">
<JnpfNumber v-model="dataForm.compensatoryHour" placeholder="数字文本" disabled :step="1"
:precision="1">
<el-col :span="8" >
<jnpf-form-tip-item label="补偿工时"
prop="compensatoryHour" >
<JnpfNumber v-model="dataForm.compensatoryHour"
placeholder="数字文本" disabled
:step="1" :precision="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="报工班组" prop="reportGroup">
<p>{{ dataForm.reportGroup }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="报工班组"
prop="reportGroup" >
<p>{{dataForm.reportGroup}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="报工成员" prop="reportMember">
<p>{{ dataForm.reportMember }}</p>
<el-col :span="8" >
<jnpf-form-tip-item label="报工成员"
prop="reportMember" >
<p>{{dataForm.reportMember}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="确认状态" prop="status">
<el-col :span="8" >
<jnpf-form-tip-item label="确认状态"
prop="status" >
<p>{{ dataForm.status }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="顺序号"
prop="sort" >
<JnpfNumber v-model="dataForm.sort"
placeholder="数字文本" disabled
:min="1" :step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
@ -136,31 +167,29 @@ export default {
loading: false,
dataForm: {
id: '',
manufactureTime: '',
deviceCode: "",
deviceName: '',
sort: 1,
post: "1",
startTime: '',
endTime: '',
productCode: '',
productName: '',
models: '',
measurementUnit: '',
planNum: 0,
acquisitionNum: 0,
defectiveNum: 0,
qualifiedNum: 0,
compensatoryHour: 0,
reportGroup: "",
reportMember: [],
status: "1",
id :'',
manufactureTime : '',
deviceCode : "",
deviceName : '',
post : "",
steatTime : '',
endTime : '',
productCode : "",
productName : '',
models : '',
measurementUnit : '',
planNum : 0,
acquisitionNum : 0,
defectiveNum : 0,
qualifiedNum : 0,
compensatoryHour : 0,
reportGroup : "",
reportMember : [],
status : "1",
sort : 1,
},
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" },
statusOptions:[{"fullName":"待确认","id":"1"},{"fullName":"已确认","id":"2"}],
statusProps:{"label":"fullName","value":"id" },
}
},
@ -169,7 +198,7 @@ export default {
created() {
},
mounted() { },
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -183,8 +212,8 @@ export default {
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
@ -195,10 +224,10 @@ export default {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysPackageReport/detail/' + this.dataForm.id,
url: '/api/example/YysPackageReport/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -209,6 +238,6 @@ export default {
})
},
},
}
}
</script>

2
jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/columnList.js
View File

File diff suppressed because one or more lines are too long

414
jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/form.vue
Unescape View File

@ -1,196 +1,198 @@
<template>
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<el-page-header @back="goBack"
:content="!dataForm.id ? '新建':'编辑'"/>
<div class="options">
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保 存</el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="生产日期" prop="manufactureTime">
<JnpfDatePicker v-model="dataForm.manufactureTime"
@change="changeData('manufactureTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择生产日期" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
<el-col :span="8" >
<jnpf-form-tip-item
label="生产日期" prop="manufactureTime" >
<JnpfDatePicker v-model="dataForm.manufactureTime" @change="changeData('manufactureTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择生产日期" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" >
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备编码" prop="deviceCode">
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='device_name' field='deviceCode'
interfaceId="590497496266971845" :pageSize="20"
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
<el-col :span="8" >
<jnpf-form-tip-item
label="设备编码" prop="deviceCode" >
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode" placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='device_name' field='deviceCode' interfaceId="590497496266971845" :pageSize="20" :columnOptions="deviceCodecolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName', -1)"
placeholder="选择设备编码后自动带入" disabled clearable :style='{ "width": "100%" }'>
<el-col :span="8" >
<jnpf-form-tip-item
label="设备名称" prop="deviceName" >
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
placeholder="选择设备编码后自动带入" disabled clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="顺序号" prop="sort">
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort', -1)"
placeholder="数字文本" :min="1" :step="1">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="班次" prop="post">
<JnpfSelect v-model="dataForm.post" @change="changeData('post', -1)" placeholder="请选择"
clearable :style='{ "width": "100%" }' :options="postOptions" :props="postProps">
</JnpfSelect>
<el-col :span="8" >
<jnpf-form-tip-item
label="班次" prop="post" >
<JnpfPopupSelect v-model="dataForm.post" @change="changeData('post',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.post" placeholder="请选择班次" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='classes_name' field='post' interfaceId="595237502952944325" :pageSize="20" :columnOptions="postcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择开始时间" clearable
:style='{ "width": "100%" }' format="HH:mm">
<el-col :span="8" >
<jnpf-form-tip-item
label="开始时间" prop="steatTime" >
<JnpfTimePicker v-model="dataForm.steatTime" @change="changeData('steatTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择开始时间" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择结束时间" clearable
:style='{ "width": "100%" }' format="HH:mm">
<el-col :span="8" >
<jnpf-form-tip-item
label="结束时间" prop="endTime" >
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择结束时间" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="产品编码" prop="productCode">
<JnpfInput v-model="dataForm.productCode" @change="changeData('productCode', -1)"
placeholder="请输入产品编码" clearable :style='{ "width": "100%" }'>
</JnpfInput>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品编码" prop="productCode" >
<JnpfPopupSelect v-model="dataForm.productCode" @change="changeData('productCode',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.productCode" placeholder="请选择" hasPage propsValue="material_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='material_name' field='productCode' interfaceId="593079067666820933" :pageSize="20" :columnOptions="productCodecolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="产品名称" prop="productName">
<JnpfInput v-model="dataForm.productName" @change="changeData('productName', -1)"
placeholder="请输入产品名称" clearable :style='{ "width": "100%" }'>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品名称" prop="productName" >
<JnpfInput v-model="dataForm.productName" @change="changeData('productName',-1)"
placeholder="请输入产品名称" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="规格型号" prop="models">
<JnpfInput v-model="dataForm.models" @change="changeData('models', -1)"
placeholder="请输入规格型号" clearable :style='{ "width": "100%" }'>
<el-col :span="8" >
<jnpf-form-tip-item
label="规格型号" prop="models" >
<JnpfInput v-model="dataForm.models" @change="changeData('models',-1)"
placeholder="请输入规格型号" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计量单位" prop="measurementUnit">
<JnpfInput v-model="dataForm.measurementUnit"
@change="changeData('measurementUnit', -1)" placeholder="请输入计量单位" clearable
:style='{ "width": "100%" }'>
<el-col :span="8" >
<jnpf-form-tip-item
label="计量单位" prop="measurementUnit" >
<JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit',-1)"
placeholder="请输入计量单位" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计划数量" prop="planNum">
<JnpfInputNumber v-model="dataForm.planNum" @change="changeData('planNum', -1)"
placeholder="计划数量" :step="1">
<el-col :span="8" >
<jnpf-form-tip-item
label="计划数量" prop="planNum" >
<JnpfInputNumber v-model="dataForm.planNum" @change="changeData('planNum',-1)"
placeholder="计划数量" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="数采数量" prop="acquisitionNum">
<JnpfInputNumber v-model="dataForm.acquisitionNum"
@change="changeData('acquisitionNum', -1)" placeholder="数采数量" :step="1">
<el-col :span="8" >
<jnpf-form-tip-item
label="数采数量" prop="acquisitionNum" >
<JnpfInputNumber v-model="dataForm.acquisitionNum" @change="changeData('acquisitionNum',-1)"
placeholder="数采数量" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="次品数量" prop="defectiveNum">
<JnpfInputNumber v-model="dataForm.defectiveNum"
@change="changeData('defectiveNum', -1)" placeholder="次品数量" :step="1">
<el-col :span="8" >
<jnpf-form-tip-item
label="次品数量" prop="defectiveNum" >
<JnpfInputNumber v-model="dataForm.defectiveNum" @change="changeData('defectiveNum',-1)"
placeholder="次品数量" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="合格数量" prop="qualifiedNum">
<JnpfInputNumber v-model="dataForm.qualifiedNum"
@change="changeData('qualifiedNum', -1)" placeholder="合格数量" :step="1">
<el-col :span="8" >
<jnpf-form-tip-item
label="合格数量" prop="qualifiedNum" >
<JnpfInputNumber v-model="dataForm.qualifiedNum" @change="changeData('qualifiedNum',-1)"
placeholder="合格数量" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="补偿工时" prop="compensatoryHour">
<JnpfInputNumber v-model="dataForm.compensatoryHour"
@change="changeData('compensatoryHour', -1)" placeholder="数字文本" :precision="1"
:step="1">
<el-col :span="8" >
<jnpf-form-tip-item
label="补偿工时" prop="compensatoryHour" >
<JnpfInputNumber v-model="dataForm.compensatoryHour" @change="changeData('compensatoryHour',-1)"
placeholder="数字文本" :precision="1" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="报工班组" prop="reportGroup">
<JnpfPopupSelect v-model="dataForm.reportGroup" @change="changeData('reportGroup', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.reportGroup"
placeholder="请选择报工班组" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='group_name' field='reportGroup'
interfaceId="590871154491662213" :pageSize="20"
:columnOptions="reportGroupcolumnOptions" clearable :style='{ "width": "100%" }'>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工班组" prop="reportGroup" >
<JnpfPopupSelect v-model="dataForm.reportGroup" @change="changeData('reportGroup',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.reportGroup" placeholder="请选择报工班组" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='group_name' field='reportGroup' interfaceId="590871154491662213" :pageSize="20" :columnOptions="reportGroupcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="报工成员" prop="reportMember">
<JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)"
placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds"
clearable :style='{ "width": "100%" }' >
<el-col :span="8" >
<jnpf-form-tip-item
label="报工成员" prop="reportMember" >
<JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember',-1)"
placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds" clearable :style='{"width":"100%"}' :multiple="true" >
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="确认状态" prop="status">
<JnpfSelect v-model="dataForm.status" @change="changeData('status', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="statusOptions"
:props="statusProps">
<el-col :span="8" >
<jnpf-form-tip-item
label="确认状态" prop="status" >
<JnpfSelect v-model="dataForm.status" @change="changeData('status',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="statusOptions" :props="statusProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="顺序号" prop="sort" >
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort',-1)"
placeholder="数字文本" :min="1" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
</el-row>
</div>
</transition>
</template>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {},
import request from '@/utils/request'
import {mapGetters} from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { },
props: [],
data() {
return {
@ -204,41 +206,41 @@ export default {
loading: false,
btnLoading: false,
formRef: 'formRef',
setting: {},
setting:{},
eventType: '',
userBoxVisible: false,
userBoxVisible:false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {
currTableConf:{},
dataValueAll:{},
addTableConf:{
},
//可选范围默认值
ableAll: {
ableAll:{
},
tableRows: {
tableRows:{
},
Vmodel: "",
currVmodel: "",
Vmodel:"",
currVmodel:"",
dataForm: {
manufactureTime: undefined,
deviceCode: undefined,
deviceName: undefined,
sort: 1,
post: "1",
startTime: undefined,
endTime: undefined,
productCode: undefined,
productName: undefined,
models: undefined,
measurementUnit: undefined,
planNum: 0,
acquisitionNum: 0,
defectiveNum: 0,
qualifiedNum: 0,
compensatoryHour: 0,
reportGroup: undefined,
reportMember: undefined,
status: "1",
manufactureTime : undefined,
deviceCode : undefined,
deviceName : undefined,
post : undefined,
steatTime : undefined,
endTime : undefined,
productCode : undefined,
productName : undefined,
models : undefined,
measurementUnit : undefined,
planNum : 0,
acquisitionNum : 0,
defectiveNum : 0,
qualifiedNum : 0,
compensatoryHour : 0,
reportGroup : undefined,
reportMember : [],
status : "1",
sort : 1,
version: 0,
},
tableRequiredData: {},
@ -268,11 +270,11 @@ export default {
post: [
{
required: true,
message: '请至少选择一个',
message: '请选择班次',
trigger: 'change'
},
],
startTime: [
steatTime: [
{
required: true,
message: '请选择开始时间',
@ -289,8 +291,8 @@ export default {
productCode: [
{
required: true,
message: '请输入产品编码',
trigger: 'blur'
message: '请选择',
trigger: 'change'
},
],
productName: [
@ -318,14 +320,14 @@ export default {
{
required: true,
message: '计划数量',
trigger: ["blur", "change"]
trigger: ["blur","change"]
},
],
acquisitionNum: [
{
required: true,
message: '数采数量',
trigger: ["blur", "change"]
trigger: ["blur","change"]
},
],
status: [
@ -336,34 +338,34 @@ export default {
},
],
},
deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },],
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
reportGroupcolumnOptions: [{ "label": "班组名称", "value": "group_name" }, { "label": "班组组长", "value": "f_real_name" }, { "label": "班组类型", "value": "group_desc" },],
statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
deviceCodecolumnOptions:[ {"label":"设备编码","value":"device_code"}, {"label":"设备名称","value":"device_name"}, {"label":"设备类型","value":"device_desc"},],
postcolumnOptions:[ {"label":"班次名称","value":"classes_name"}, {"label":"开始时间","value":"start_time"}, {"label":"结束时间","value":"end_time"}, {"label":"班次时长","value":"classes_duration"},],
productCodecolumnOptions:[ {"label":"产品编码","value":"material_id"}, {"label":"产品名称","value":"material_name"},],
reportGroupcolumnOptions:[ {"label":"班组名称","value":"group_name"}, {"label":"班组组长","value":"f_real_name"}, {"label":"班组类型","value":"group_desc"},],
statusOptions:[{"fullName":"待确认","id":"1"},{"fullName":"已确认","id":"2"}],
statusProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {
manufactureTime: [],
deviceCode: [],
deviceName: [],
sort: [],
post: [],
startTime: [],
endTime: [],
productCode: [],
productName: [],
models: [],
measurementUnit: [],
planNum: [],
acquisitionNum: [],
defectiveNum: [],
qualifiedNum: [],
compensatoryHour: [],
reportGroup: [],
reportMember: [],
status: [],
manufactureTime:[] ,
deviceCode:[] ,
deviceName:[] ,
post:[] ,
steatTime:[] ,
endTime:[] ,
productCode:[] ,
productName:[] ,
models:[] ,
measurementUnit:[] ,
planNum:[] ,
acquisitionNum:[] ,
defectiveNum:[] ,
qualifiedNum:[] ,
compensatoryHour:[] ,
reportGroup:[] ,
reportMember:[] ,
status:[] ,
sort:[] ,
},
}
},
@ -376,7 +378,7 @@ export default {
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
mounted() {},
methods: {
prev() {
this.index--
@ -406,7 +408,7 @@ export default {
},
getInfo(id) {
request({
url: '/api/example/YysPackageReport/' + id,
url: '/api/example/YysPackageReport/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -430,7 +432,7 @@ export default {
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if (this[options]) {
if(this[options]){
this[options]()
}
this.changeData(key, index)
@ -439,8 +441,8 @@ export default {
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
changeDataFormData(type, data, model,index,defaultValue) {
if(!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
@ -454,15 +456,15 @@ export default {
}
}
},
dataAll() {
dataAll(){
},
goBack() {
this.$emit('refresh')
},
clearData() {
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
@ -481,16 +483,16 @@ export default {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysPackageReport/' + this.dataForm.id,
url: '/api/example/YysPackageReport/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
}else{
this.clearData()
this.initDefaultData()
}
@ -511,7 +513,7 @@ export default {
})
},
request() {
let _data = this.dataList()
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
@ -541,13 +543,13 @@ export default {
this.$emit('refresh', true)
}
})
}).catch(() => {
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
} else {
}else{
request({
url: '/api/example/YysPackageReport/' + this.dataForm.id,
url: '/api/example/YysPackageReport/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
@ -562,15 +564,15 @@ export default {
this.$emit('refresh', true)
}
})
}).catch(() => {
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
@ -579,8 +581,8 @@ export default {
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
if(this['get'+this.currVmodel]){
this['get'+this.currVmodel](t)
}
}
},
@ -647,18 +649,18 @@ export default {
}
return timeDataValue;
},
dataList() {
dataList(){
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
this.childIndex=-1
},
},
}
}
</script>

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

@ -234,12 +234,12 @@ export default {
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" },
interfaceRes: {
deviceCode: [],
post: [],
productCode: [],
reportGroup: [],
},
}

2
jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/superQueryJson.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save