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 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-08-07 * 日期： 2024-08-19
*/ */
public interface YysPackageReportMapper extends BaseMapper<YysPackageReportEntity> { 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 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-08-07 * 日期： 2024-08-19
*/ */
public interface YysPackageReportService extends IService<YysPackageReportEntity> { public interface YysPackageReportService extends IService<YysPackageReportEntity> {
List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination); List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination);

406
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; 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 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 com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.metadata.IPage; 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.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo; 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.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 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 * yysPackageReport
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-08-07 * 日期： 2024-08-19
*/ */
@Service @Service
@Slf4j @Slf4j
@ -67,305 +54,292 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
private YysDayLogsService yysDayLogsService; private YysDayLogsService yysDayLogsService;
@Override @Override
public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination) { public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination){
return getTypeList(yysPackageReportPagination, yysPackageReportPagination.getDataType()); return getTypeList(yysPackageReportPagination,yysPackageReportPagination.getDataType());
} }
/** /**
* 列表查询 * 列表查询
*/ */
@Override @Override
public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination, String dataType) { public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination,String dataType){
String userId = userProvider.get().getUserId(); String userId=userProvider.get().getUserId();
List<String> AllIdList = new ArrayList(); List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList = new ArrayList<>(); List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysPackageReportConstant.getAppColumnData() : YysPackageReportConstant.getColumnData(); String columnData = !isPc ? YysPackageReportConstant.getAppColumnData() : YysPackageReportConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total = 0; int total=0;
int yysPackageReportNum = 0; int yysPackageReportNum =0;
QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper = new QueryWrapper<>(); QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp = ""; String superOp ="";
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())) { if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysPackageReportPagination.getSuperQueryJson(); String queryJson = yysPackageReportPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>(); 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(); int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
if (yysPackageReportNum1 > 0) { if (yysPackageReportNum1>0){
List<String> yysPackageReportList = this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList()); List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysPackageReportList); allSuperList.addAll(yysPackageReportList);
intersectionSuperList.add(yysPackageReportList); intersectionSuperList.add(yysPackageReportList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if (superOp.equalsIgnoreCase("and")) { if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
} else { }else{
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp = ""; String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)) { if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>(); 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(); int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
if (yysPackageReportNum1 > 0) { if (yysPackageReportNum1>0){
List<String> yysPackageReportList = this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList()); List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysPackageReportList); allRuleList.addAll(yysPackageReportList);
intersectionRuleList.add(yysPackageReportList); intersectionRuleList.add(yysPackageReportList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if (ruleOp.equalsIgnoreCase("and")) { if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
} else { }else{
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
if (isPc && pcPermission) { if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()) { if (!userProvider.get().getIsAdministrator()){
Object yysPackageReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper, YysPackageReportEntity.class, yysPackageReportPagination.getMenuId(), "0")); Object yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysPackageReportObj)) { if (ObjectUtil.isEmpty(yysPackageReportObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>) yysPackageReportObj; yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
if (yysPackageReportQueryWrapper.getExpression().getNormal().size() > 0) { if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
yysPackageReportNum++; yysPackageReportNum++;
} }
} }
} }
}
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){
yysPackageReportNum++;
}
} }
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) {
yysPackageReportNum++;
}
}
} }
} }
if (isPc) { if(isPc){
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())) { if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())){
yysPackageReportNum++; 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 fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
yysPackageReportQueryWrapper.lambda().ge(YysPackageReportEntity::getManufactureTime, new Date(fir)) yysPackageReportQueryWrapper.lambda().ge(YysPackageReportEntity::getManufactureTime, new Date(fir))
.le(YysPackageReportEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysPackageReportEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())) { if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())){
yysPackageReportNum++; yysPackageReportNum++;
String value = yysPackageReportPagination.getProductName() instanceof List ? String value = yysPackageReportPagination.getProductName() instanceof List ?
JsonUtil.getObjectToString(yysPackageReportPagination.getProductName()) : JsonUtil.getObjectToString(yysPackageReportPagination.getProductName()) :
String.valueOf(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++; yysPackageReportNum++;
String value = yysPackageReportPagination.getProductCode() instanceof List ? String value = yysPackageReportPagination.getProductCode() instanceof List ?
JsonUtil.getObjectToString(yysPackageReportPagination.getProductCode()) : JsonUtil.getObjectToString(yysPackageReportPagination.getProductCode()) :
String.valueOf(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++; yysPackageReportNum++;
String value = yysPackageReportPagination.getDeviceName() instanceof List ? String value = yysPackageReportPagination.getDeviceName() instanceof List ?
JsonUtil.getObjectToString(yysPackageReportPagination.getDeviceName()) : JsonUtil.getObjectToString(yysPackageReportPagination.getDeviceName()) :
String.valueOf(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++; yysPackageReportNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(), String[][].class); String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(),String[][].class);
for (int i = 0; i < status.length; i++) { for(int i=0;i<status.length;i++){
if (status[i].length > 0) { if(status[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i])));
} }
} }
} catch (Exception e1) { }catch (Exception e1){
try { try {
List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(), String.class); List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(),String.class);
if (status.size() > 0) { if(status.size()>0){
idList.addAll(status); idList.addAll(status);
} }
} catch (Exception e2) { }catch (Exception e2){
idList.add(String.valueOf(yysPackageReportPagination.getStatus())); idList.add(String.valueOf(yysPackageReportPagination.getStatus()));
} }
} }
yysPackageReportQueryWrapper.lambda().and(t -> { yysPackageReportQueryWrapper.lambda().and(t->{
idList.forEach(tt -> { idList.forEach(tt->{
t.like(YysPackageReportEntity::getStatus, tt).or(); t.like(YysPackageReportEntity::getStatus, tt).or();
}); });
}); });
} }
} }
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList); List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total > 0) { if (total>0){
if (intersection.size() == 0) { if (intersection.size()==0){
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
yysPackageReportQueryWrapper.lambda().in(YysPackageReportEntity::getId, intersection); yysPackageReportQueryWrapper.lambda().in(YysPackageReportEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)) { if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size() == 0) { if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; 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 (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size() == 0) { if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; 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.lambda().isNull(YysPackageReportEntity::getDeleteMark);
//排序 //排序
yysPackageReportQueryWrapper.last("ORDER BY CAST(sort AS UNSIGNED)"); if(StringUtil.isEmpty(yysPackageReportPagination.getSidx())){
// if (StringUtil.isEmpty(yysPackageReportPagination.getSidx())) { yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
// yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId); }else{
// } else { try {
// try { String sidx = yysPackageReportPagination.getSidx();
// String sidx = yysPackageReportPagination.getSidx(); String[] strs= sidx.split("_name");
// String[] strs = sidx.split("_name"); YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
// YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity(); Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
// Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]); declaredField.setAccessible(true);
// declaredField.setAccessible(true); String value = declaredField.getAnnotation(TableField.class).value();
// String value = declaredField.getAnnotation(TableField.class).value(); yysPackageReportQueryWrapper="asc".equals(yysPackageReportPagination.getSort().toLowerCase())?yysPackageReportQueryWrapper.orderByAsc(value):yysPackageReportQueryWrapper.orderByDesc(value);
// yysPackageReportQueryWrapper = "asc".equals(yysPackageReportPagination.getSort().toLowerCase()) ? yysPackageReportQueryWrapper.orderByAsc(value) : yysPackageReportQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) {
// } catch (NoSuchFieldException e) { e.printStackTrace();
// e.printStackTrace(); }
// } }
// }
if ("0".equals(dataType)) { if("0".equals(dataType)){
if ((total > 0 && AllIdList.size() > 0) || total == 0) { if((total>0 && AllIdList.size()>0) || total==0){
Page<YysPackageReportEntity> page = new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize()); Page<YysPackageReportEntity> page=new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize());
IPage<YysPackageReportEntity> userIPage = this.page(page, yysPackageReportQueryWrapper); IPage<YysPackageReportEntity> userIPage=this.page(page, yysPackageReportQueryWrapper);
return yysPackageReportPagination.setData(userIPage.getRecords(), userIPage.getTotal()); return yysPackageReportPagination.setData(userIPage.getRecords(),userIPage.getTotal());
} else { }else{
List<YysPackageReportEntity> list = new ArrayList(); List<YysPackageReportEntity> list = new ArrayList();
return yysPackageReportPagination.setData(list, list.size()); return yysPackageReportPagination.setData(list, list.size());
} }
} else { }else{
return this.list(yysPackageReportQueryWrapper); return this.list(yysPackageReportQueryWrapper);
} }
} }
@Override @Override
public YysPackageReportEntity getInfo(String id) { public YysPackageReportEntity getInfo(String id){
QueryWrapper<YysPackageReportEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysPackageReportEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(YysPackageReportEntity::getId, id); queryWrapper.lambda().eq(YysPackageReportEntity::getId,id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysPackageReportEntity entity) { public void create(YysPackageReportEntity entity){
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysPackageReportEntity entity) { public boolean update(String id, YysPackageReportEntity entity){
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysPackageReportEntity entity) { public void delete(YysPackageReportEntity entity){
if (entity != null) { if(entity!=null){
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override @Override
public String checkForm(YysPackageReportForm form, int i) { public String checkForm(YysPackageReportForm form,int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = ""; String id="";
String countRecover = ""; String countRecover = "";
if (isUp) { if (isUp){
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
if (StringUtil.isEmpty(form.getDeviceName())) { if(StringUtil.isEmpty(form.getDeviceName())){
return "设备名称不能为空"; return "设备名称不能为空";
} }
if (StringUtil.isEmpty(form.getProductCode())) { if(StringUtil.isEmpty(form.getProductName())){
return "产品编码不能为空"; return "产品名称不能为空";
} }
if (StringUtil.isEmpty(form.getProductName())) { if(StringUtil.isEmpty(form.getModels())){
return "产品名称不能为空"; return "规格型号不能为空";
} }
if (StringUtil.isEmpty(form.getModels())) { if(StringUtil.isEmpty(form.getMeasurementUnit())){
return "规格型号不能为空"; return "计量单位不能为空";
} }
if (StringUtil.isEmpty(form.getMeasurementUnit())) {
return "计量单位不能为空";
}
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
* * @param id
* @param id * @param yysPackageReportForm
* @param yysPackageReportForm * @return
* @return */
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysPackageReportForm yysPackageReportForm, String id, boolean isSave) throws Exception { public void saveOrUpdate(YysPackageReportForm yysPackageReportForm,String id, boolean isSave) throws Exception{
UserInfo userInfo = userProvider.get(); UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysPackageReportForm = JsonUtil.getJsonToBean( yysPackageReportForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(), yysPackageReportForm), YysPackageReportForm.class); generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(),yysPackageReportForm),YysPackageReportForm.class);
YysPackageReportEntity entity = JsonUtil.getJsonToBean(yysPackageReportForm, YysPackageReportEntity.class); YysPackageReportEntity entity = JsonUtil.getJsonToBean(yysPackageReportForm, YysPackageReportEntity.class);
if (isSave) { 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 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-08-07 * @日期： 2024-08-19
*/ */
@Slf4j @Slf4j
@RestController @RestController
@ -150,9 +150,6 @@ public class YysPackageReportController {
case "deviceName" : case "deviceName" :
entitys.add(new ExcelExportEntity("设备名称" ,"deviceName")); entitys.add(new ExcelExportEntity("设备名称" ,"deviceName"));
break; break;
case "sort" :
entitys.add(new ExcelExportEntity("顺序号" ,"sort"));
break;
case "post" : case "post" :
entitys.add(new ExcelExportEntity("班次" ,"post")); entitys.add(new ExcelExportEntity("班次" ,"post"));
break; break;
@ -198,6 +195,9 @@ public class YysPackageReportController {
case "status" : case "status" :
entitys.add(new ExcelExportEntity("确认状态" ,"status")); entitys.add(new ExcelExportEntity("确认状态" ,"status"));
break; break;
case "sort" :
entitys.add(new ExcelExportEntity("顺序号" ,"sort"));
break;
default: default:
break; 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 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-08-07 * @日期： 2024-08-19
*/ */
@Data @Data
@TableName("yys_package_report") @TableName("yys_package_report")
public class YysPackageReportEntity { public class YysPackageReportEntity {
@TableId(value ="ID" ) @TableId(value ="ID" )
private String id; private String id;
@TableField(value = "WORK_ID" , updateStrategy = FieldStrategy.IGNORED) @TableField("WORK_ID")
private String workId; private String workId;
@TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date manufactureTime; private String manufactureTime;
@TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
private String deviceCode; private String deviceCode;
@TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@ -29,7 +29,7 @@ public class YysPackageReportEntity {
private Integer sort; private Integer sort;
@TableField(value = "POST" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "POST" , updateStrategy = FieldStrategy.IGNORED)
private String post; private String post;
@TableField(value = "START_TIME" , updateStrategy = FieldStrategy.IGNORED) @TableField("START_TIME")
private String startTime; private String startTime;
@TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED)
private String endTime; 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 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-08-07 * @日期： 2024-08-19
*/ */
@Data @Data
public class YysPackageReportForm { public class YysPackageReportForm {
@ -29,12 +29,9 @@ public class YysPackageReportForm {
/** 设备名称 **/ /** 设备名称 **/
@JsonProperty("deviceName") @JsonProperty("deviceName")
private String deviceName; private String deviceName;
/** 顺序号 **/
@JsonProperty("sort")
private BigDecimal sort;
/** 班次 **/ /** 班次 **/
@JsonProperty("post") @JsonProperty("post")
private Object post; private String post;
/** 开始时间 **/ /** 开始时间 **/
@JsonProperty("startTime") @JsonProperty("startTime")
private String startTime; private String startTime;
@ -77,4 +74,7 @@ public class YysPackageReportForm {
/** 确认状态 **/ /** 确认状态 **/
@JsonProperty("status") @JsonProperty("status")
private Object 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 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-08-07 * @日期： 2024-08-19
*/ */
@Data @Data
public class YysPackageReportPagination extends Pagination { public class YysPackageReportPagination extends Pagination {

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

@ -1,214 +1,243 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" /> <el-page-header @back="goBack"
<div class="options"> content="详情"/>
<el-button @click="goBack">取 消</el-button> <div class="options">
</div> <el-button @click="goBack">取 消</el-button>
</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">
<template v-if="!loading">
<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>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<p>{{ dataForm.startTime }}</p>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<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">
</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">
</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">
</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">
</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">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="确认状态" prop="status">
<p>{{ dataForm.status }} </p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div> </div>
</transition> </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" >
<template v-if="!loading">
<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>
</jnpf-form-tip-item>
</el-col>
<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="post" >
<p>{{dataForm.post}}</p>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<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>
</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" >
</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" >
</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" >
</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" >
</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" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<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>
</jnpf-form-tip-item>
</el-col>
<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-row>
</div>
</transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail }, components: { Detail},
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id: '', id :'',
manufactureTime: '', manufactureTime : '',
deviceCode: "", deviceCode : "",
deviceName: '', deviceName : '',
sort: 1, post : "",
post: "1", steatTime : '',
startTime: '', endTime : '',
endTime: '', productCode : "",
productCode: '', productName : '',
productName: '', models : '',
models: '', measurementUnit : '',
measurementUnit: '', planNum : 0,
planNum: 0, acquisitionNum : 0,
acquisitionNum: 0, defectiveNum : 0,
defectiveNum: 0, qualifiedNum : 0,
qualifiedNum: 0, compensatoryHour : 0,
compensatoryHour: 0, reportGroup : "",
reportGroup: "", reportMember : [],
reportMember: [], status : "1",
status: "1", sort : 1,
}, },
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }], statusOptions:[{"fullName":"待确认","id":"1"},{"fullName":"已确认","id":"2"}],
postProps: { "label": "fullName", "value": "id" }, statusProps:{"label":"fullName","value":"id" },
statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" },
} }
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
}, },
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
}, },
init(id) { mounted() {},
this.dataForm.id = id || 0; methods: {
this.visible = true; toDetail(defaultValue, modelId) {
this.$nextTick(() => { if (!defaultValue) return
if (this.dataForm.id) { getConfigData(modelId).then(res => {
this.loading = true if (!res.data || !res.data.formData) return
request({ let formData = JSON.parse(res.data.formData)
url: '/api/example/YysPackageReport/detail/' + this.dataForm.id, formData.popupType = 'general'
method: 'get' this.detailVisible = true
}).then(res => { this.$nextTick(() => {
this.dataInfo(res.data) this.$refs.Detail.init(formData, modelId, defaultValue)
this.loading = false
}) })
} })
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysPackageReport/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}) })
},
}, },
}, }
}
</script> </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

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

File diff suppressed because it is too large Load Diff

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

@ -234,12 +234,12 @@ export default {
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }], statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" }, statusProps: { "label": "fullName", "value": "id" },
interfaceRes: { interfaceRes: {
deviceCode: [], deviceCode: [],
post: [],
productCode: [],
reportGroup: [], reportGroup: [],
}, },
} }
@ -424,10 +424,10 @@ export default {
const year = now.getFullYear(); const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0'); const month = String(now.getMonth() + 1).padStart(2, '0');
const startDate = `${year}-${month}-01 00:00:00`; const startDate = `${year}-${month}-01 00:00:00`;
const startDateTimestamp = new Date(startDate).getTime(); const startDateTimestamp = new Date(startDate).getTime();
const endDate = `${year}-${month}-${new Date(year, now.getMonth() + 1, 0).getDate()}`; const endDate = `${year}-${month}-${new Date(year, now.getMonth() + 1, 0).getDate()}`;
const endDateTimestamp = new Date(endDate).getTime(); const endDateTimestamp = new Date(endDate).getTime();
this.query.manufactureTime = [startDateTimestamp, endDateTimestamp]; this.query.manufactureTime = [startDateTimestamp, endDateTimestamp];
}, },
initData() { initData() {
this.listLoading = true; this.listLoading = true;

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