feat():重构生产报工确认

master
jiyufei 2 months ago
parent 4ad7bfee01
commit 4dda471e23

@ -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 YysProdReportMapper extends BaseMapper<YysProdReportEntity> { public interface YysProdReportMapper extends BaseMapper<YysProdReportEntity> {

@ -2,9 +2,7 @@ package jnpf.service;
import jnpf.model.yysprodreport.*; import jnpf.model.yysprodreport.*;
import jnpf.entity.*; import jnpf.entity.*;
import java.util.*; import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -13,12 +11,12 @@ 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 YysProdReportService extends IService<YysProdReportEntity> { public interface YysProdReportService extends IService<YysProdReportEntity> {
List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination); List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination);
List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination, String dataType); List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination,String dataType);
YysProdReportEntity getInfo(String id); YysProdReportEntity getInfo(String id);
@ -30,9 +28,9 @@ public interface YysProdReportService extends IService<YysProdReportEntity> {
//子表方法 //子表方法
//副表数据方法 //副表数据方法
String checkForm(YysProdReportForm form, int i); String checkForm(YysProdReportForm form,int i);
void saveOrUpdate(YysProdReportForm yysProdReportForm, String id, boolean isSave) throws Exception; void saveOrUpdate(YysProdReportForm yysProdReportForm,String id, boolean isSave) throws Exception;
/** /**
* *

@ -1,62 +1,46 @@
package jnpf.service.impl; package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.YysProdReportMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysprodreport.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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.YysProdReportEntity;
import jnpf.mapper.YysProdReportMapper;
import jnpf.model.QueryModel;
import jnpf.model.yysprodreport.YysProdReportConstant;
import jnpf.model.yysprodreport.YysProdReportForm;
import jnpf.model.yysprodreport.YysProdReportPagination;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
import jnpf.service.YysDayLogsService;
import jnpf.service.YysProdReportService;
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.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/** /**
* yysProdReport * yysProdReport
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-08-07 * 2024-08-19
*/ */
@Service @Service
@Slf4j @Slf4j
public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, YysProdReportEntity> implements YysProdReportService { public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, YysProdReportEntity> implements YysProdReportService{
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -67,201 +51,198 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
private YysDayLogsService yysDayLogsService; private YysDayLogsService yysDayLogsService;
@Override @Override
public List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination) { public List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination){
return getTypeList(yysProdReportPagination, yysProdReportPagination.getDataType()); return getTypeList(yysProdReportPagination,yysProdReportPagination.getDataType());
} }
/** 列表查询 */
/**
*
*/
@Override @Override
public List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination, String dataType) { public List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination,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 ? YysProdReportConstant.getAppColumnData() : YysProdReportConstant.getColumnData(); String columnData = !isPc ? YysProdReportConstant.getAppColumnData() : YysProdReportConstant.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 yysProdReportNum = 0; int yysProdReportNum =0;
QueryWrapper<YysProdReportEntity> yysProdReportQueryWrapper = new QueryWrapper<>(); QueryWrapper<YysProdReportEntity> yysProdReportQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp = ""; String superOp ="";
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getSuperQueryJson())) { if (ObjectUtil.isNotEmpty(yysProdReportPagination.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 = yysProdReportPagination.getSuperQueryJson(); String queryJson = yysProdReportPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysProdReportEntity> yysProdReportSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysProdReportEntity> yysProdReportSuperWrapper = new QueryWrapper<>();
yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper, YysProdReportEntity.class, queryJson, "0")); yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper,YysProdReportEntity.class,queryJson,"0"));
int yysProdReportNum1 = yysProdReportSuperWrapper.getExpression().getNormal().size(); int yysProdReportNum1 = yysProdReportSuperWrapper.getExpression().getNormal().size();
if (yysProdReportNum1 > 0) { if (yysProdReportNum1>0){
List<String> yysProdReportList = this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList()); List<String> yysProdReportList =this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysProdReportList); allSuperList.addAll(yysProdReportList);
intersectionSuperList.add(yysProdReportList); intersectionSuperList.add(yysProdReportList);
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<YysProdReportEntity> yysProdReportSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysProdReportEntity> yysProdReportSuperWrapper = new QueryWrapper<>();
yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper, YysProdReportEntity.class, ruleJson, "0")); yysProdReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysProdReportSuperWrapper,YysProdReportEntity.class,ruleJson,"0"));
int yysProdReportNum1 = yysProdReportSuperWrapper.getExpression().getNormal().size(); int yysProdReportNum1 = yysProdReportSuperWrapper.getExpression().getNormal().size();
if (yysProdReportNum1 > 0) { if (yysProdReportNum1>0){
List<String> yysProdReportList = this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList()); List<String> yysProdReportList =this.list(yysProdReportSuperWrapper).stream().map(YysProdReportEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysProdReportList); allRuleList.addAll(yysProdReportList);
intersectionRuleList.add(yysProdReportList); intersectionRuleList.add(yysProdReportList);
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 yysProdReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper, YysProdReportEntity.class, yysProdReportPagination.getMenuId(), "0")); Object yysProdReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper,YysProdReportEntity.class,yysProdReportPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysProdReportObj)) { if (ObjectUtil.isEmpty(yysProdReportObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>) yysProdReportObj; yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>)yysProdReportObj;
if (yysProdReportQueryWrapper.getExpression().getNormal().size() > 0) { if( yysProdReportQueryWrapper.getExpression().getNormal().size()>0){
yysProdReportNum++; yysProdReportNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysProdReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper,YysProdReportEntity.class,yysProdReportPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysProdReportObj)){
return new ArrayList<>();
} else {
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>)yysProdReportObj;
if( yysProdReportQueryWrapper.getExpression().getNormal().size()>0){
yysProdReportNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysProdReportObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysProdReportQueryWrapper, YysProdReportEntity.class, yysProdReportPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysProdReportObj)) {
return new ArrayList<>();
} else {
yysProdReportQueryWrapper = (QueryWrapper<YysProdReportEntity>) yysProdReportObj;
if (yysProdReportQueryWrapper.getExpression().getNormal().size() > 0) {
yysProdReportNum++;
}
}
} }
} }
if (isPc) { if(isPc){
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getManufactureTime())) { if(ObjectUtil.isNotEmpty(yysProdReportPagination.getManufactureTime())){
yysProdReportNum++; yysProdReportNum++;
List ManufactureTimeList = JsonUtil.getJsonToList(yysProdReportPagination.getManufactureTime(), String.class); List ManufactureTimeList = JsonUtil.getJsonToList(yysProdReportPagination.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)));
yysProdReportQueryWrapper.lambda().ge(YysProdReportEntity::getManufactureTime, new Date(fir)) yysProdReportQueryWrapper.lambda().ge(YysProdReportEntity::getManufactureTime, new Date(fir))
.le(YysProdReportEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysProdReportEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getProductName())) { if(ObjectUtil.isNotEmpty(yysProdReportPagination.getProductName())){
yysProdReportNum++; yysProdReportNum++;
String value = yysProdReportPagination.getProductName() instanceof List ? String value = yysProdReportPagination.getProductName() instanceof List ?
JsonUtil.getObjectToString(yysProdReportPagination.getProductName()) : JsonUtil.getObjectToString(yysProdReportPagination.getProductName()) :
String.valueOf(yysProdReportPagination.getProductName()); String.valueOf(yysProdReportPagination.getProductName());
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductName, value); yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductName,value);
} }
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getProductCode())) { if(ObjectUtil.isNotEmpty(yysProdReportPagination.getProductCode())){
yysProdReportNum++; yysProdReportNum++;
String value = yysProdReportPagination.getProductCode() instanceof List ? String value = yysProdReportPagination.getProductCode() instanceof List ?
JsonUtil.getObjectToString(yysProdReportPagination.getProductCode()) : JsonUtil.getObjectToString(yysProdReportPagination.getProductCode()) :
String.valueOf(yysProdReportPagination.getProductCode()); String.valueOf(yysProdReportPagination.getProductCode());
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductCode, value); yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getProductCode,value);
} }
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getDeviceName())) { if(ObjectUtil.isNotEmpty(yysProdReportPagination.getDeviceName())){
yysProdReportNum++; yysProdReportNum++;
String value = yysProdReportPagination.getDeviceName() instanceof List ? String value = yysProdReportPagination.getDeviceName() instanceof List ?
JsonUtil.getObjectToString(yysProdReportPagination.getDeviceName()) : JsonUtil.getObjectToString(yysProdReportPagination.getDeviceName()) :
String.valueOf(yysProdReportPagination.getDeviceName()); String.valueOf(yysProdReportPagination.getDeviceName());
yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getDeviceName, value); yysProdReportQueryWrapper.lambda().like(YysProdReportEntity::getDeviceName,value);
} }
if (ObjectUtil.isNotEmpty(yysProdReportPagination.getStatus())) { if(ObjectUtil.isNotEmpty(yysProdReportPagination.getStatus())){
yysProdReportNum++; yysProdReportNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] status = JsonUtil.getJsonToBean(yysProdReportPagination.getStatus(), String[][].class); String[][] status = JsonUtil.getJsonToBean(yysProdReportPagination.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(yysProdReportPagination.getStatus(), String.class); List<String> status = JsonUtil.getJsonToList(yysProdReportPagination.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(yysProdReportPagination.getStatus())); idList.add(String.valueOf(yysProdReportPagination.getStatus()));
} }
} }
yysProdReportQueryWrapper.lambda().and(t -> { yysProdReportQueryWrapper.lambda().and(t->{
idList.forEach(tt -> { idList.forEach(tt->{
t.like(YysProdReportEntity::getStatus, tt).or(); t.like(YysProdReportEntity::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");
} }
yysProdReportQueryWrapper.lambda().in(YysProdReportEntity::getId, intersection); yysProdReportQueryWrapper.lambda().in(YysProdReportEntity::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;
yysProdReportQueryWrapper.lambda().and(t -> t.in(YysProdReportEntity::getId, finalAllSuperIDlist)); yysProdReportQueryWrapper.lambda().and(t->t.in(YysProdReportEntity::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;
yysProdReportQueryWrapper.lambda().and(t -> t.in(YysProdReportEntity::getId, finalAllRuleIDlist)); yysProdReportQueryWrapper.lambda().and(t->t.in(YysProdReportEntity::getId, finalAllRuleIDlist));
} }
//假删除标志 //假删除标志
yysProdReportQueryWrapper.lambda().isNull(YysProdReportEntity::getDeleteMark); yysProdReportQueryWrapper.lambda().isNull(YysProdReportEntity::getDeleteMark);
@ -284,85 +265,73 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
// } // }
// } // }
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<YysProdReportEntity> page = new Page<>(yysProdReportPagination.getCurrentPage(), yysProdReportPagination.getPageSize()); Page<YysProdReportEntity> page=new Page<>(yysProdReportPagination.getCurrentPage(), yysProdReportPagination.getPageSize());
IPage<YysProdReportEntity> userIPage = this.page(page, yysProdReportQueryWrapper); IPage<YysProdReportEntity> userIPage=this.page(page, yysProdReportQueryWrapper);
return yysProdReportPagination.setData(userIPage.getRecords(), userIPage.getTotal()); return yysProdReportPagination.setData(userIPage.getRecords(),userIPage.getTotal());
} else { }else{
List<YysProdReportEntity> list = new ArrayList(); List<YysProdReportEntity> list = new ArrayList();
return yysProdReportPagination.setData(list, list.size()); return yysProdReportPagination.setData(list, list.size());
} }
} else { }else{
return this.list(yysProdReportQueryWrapper); return this.list(yysProdReportQueryWrapper);
} }
} }
@Override @Override
public YysProdReportEntity getInfo(String id) { public YysProdReportEntity getInfo(String id){
QueryWrapper<YysProdReportEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysProdReportEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(YysProdReportEntity::getId, id); queryWrapper.lambda().eq(YysProdReportEntity::getId,id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysProdReportEntity entity) { public void create(YysProdReportEntity entity){
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysProdReportEntity entity) { public boolean update(String id, YysProdReportEntity entity){
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysProdReportEntity entity) { public void delete(YysProdReportEntity 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(YysProdReportForm form, int i) { public String checkForm(YysProdReportForm 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 yysProdReportForm
* @param yysProdReportForm * @return
* @return */
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysProdReportForm yysProdReportForm, String id, boolean isSave) throws Exception { public void saveOrUpdate(YysProdReportForm yysProdReportForm,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());
yysProdReportForm = JsonUtil.getJsonToBean( yysProdReportForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysProdReportConstant.getFormData(), yysProdReportForm), YysProdReportForm.class); generaterSwapUtil.swapDatetime(YysProdReportConstant.getFormData(), yysProdReportForm), YysProdReportForm.class);

@ -280,7 +280,7 @@ public class YysRequisitionReportServiceImpl extends ServiceImpl<YysRequisitionR
QueryWrapper<YysRequisitionReportEntity> productNameWrapper=new QueryWrapper<>(); QueryWrapper<YysRequisitionReportEntity> productNameWrapper=new QueryWrapper<>();
productNameWrapper.lambda().eq(YysRequisitionReportEntity::getProductName,form.getProductName()); productNameWrapper.lambda().eq(YysRequisitionReportEntity::getProductName,form.getProductName());
//假删除标志 //假删除标志
productNameWrapper.lambda().isNull(YysRequisitionReportEntity::getDeletemark); productNameWrapper.lambda().isNull(YysRequisitionReportEntity::getDeleteMark);
if (isUp){ if (isUp){
productNameWrapper.lambda().ne(YysRequisitionReportEntity::getId, id); productNameWrapper.lambda().ne(YysRequisitionReportEntity::getId, id);
} }

@ -1,59 +1,39 @@
package jnpf.controller; package jnpf.controller;
import cn.hutool.core.util.ObjectUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.xuyanwu.spring.file.storage.FileInfo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.exception.DataException; import jnpf.base.model.ColumnDataModel;
import jnpf.permission.entity.UserEntity; import jnpf.base.util.VisualUtils;
import jnpf.service.*; import jnpf.base.vo.DownloadVO;
import jnpf.entity.*; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.config.ConfigValueUtil;
import jnpf.entity.YysProdReportEntity;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.model.yysprodreport.YysProdReportConstant;
import jnpf.model.yysprodreport.YysProdReportForm;
import jnpf.model.yysprodreport.YysProdReportPagination;
import jnpf.service.YysProdReportService;
import jnpf.util.*; import jnpf.util.*;
import jnpf.model.yysprodreport.*; import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.*;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/** /**
* yysProdReport * yysProdReport
@ -61,7 +41,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
@ -157,9 +137,6 @@ public class YysProdReportController {
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;
@ -205,6 +182,9 @@ public class YysProdReportController {
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;
} }
@ -361,7 +341,6 @@ public class YysProdReportController {
if (entity != null) { if (entity != null) {
//假删除 //假删除
entity.setDeleteMark(1); entity.setDeleteMark(1);
entity.setDeleteTime(DateUtil.getNowDate());
yysProdReportService.update(id, entity); yysProdReportService.update(id, entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");

@ -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_prod_report") @TableName("yys_prod_report")
public class YysProdReportEntity { public class YysProdReportEntity {
@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 YysProdReportEntity {
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,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 YysProdReportForm { public class YysProdReportForm {
@ -29,12 +29,9 @@ public class YysProdReportForm {
/** 设备名称 **/ /** 设备名称 **/
@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 YysProdReportForm {
/** 确认状态 **/ /** 确认状态 **/
@JsonProperty("status") @JsonProperty("status")
private Object status; private Object status;
/** 顺序号 **/
@JsonProperty("sort")
private BigDecimal sort;
} }

@ -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 YysProdReportPagination extends Pagination { public class YysProdReportPagination extends Pagination {

@ -1,243 +1,212 @@
<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" <el-page-header @back="goBack" content="详情" />
content="详情"/> <div class="options">
<div class="options"> <el-button @click="goBack"> </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" 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="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>
<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> </div>
</div> </transition>
<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: '',
post : "", post: "",
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, sort: 1,
}, },
statusOptions:[{"fullName":"待确认","id":"1"},{"fullName":"已确认","id":"2"}], statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps:{"label":"fullName","value":"id" }, 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')
}, },
mounted() {}, init(id) {
methods: { this.dataForm.id = id || 0;
toDetail(defaultValue, modelId) { this.visible = true;
if (!defaultValue) return this.$nextTick(() => {
getConfigData(modelId).then(res => { if (this.dataForm.id) {
if (!res.data || !res.data.formData) return this.loading = true
let formData = JSON.parse(res.data.formData) request({
formData.popupType = 'general' url: '/api/example/YysPackageReport/detail/' + this.dataForm.id,
this.detailVisible = true method: 'get'
this.$nextTick(() => { }).then(res => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.dataInfo(res.data)
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>

@ -26,15 +26,9 @@
<p>{{ dataForm.deviceName }}</p> <p>{{ dataForm.deviceName }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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"> <el-col :span="8">
<jnpf-form-tip-item label="班次" prop="post"> <jnpf-form-tip-item label="班次" prop="post">
<p>{{ dataForm.post }} </p> <p>{{ dataForm.post }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -113,6 +107,12 @@
<p>{{ dataForm.status }} </p> <p>{{ dataForm.status }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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> </template>
</el-form> </el-form>
</el-row> </el-row>
@ -140,11 +140,10 @@ export default {
manufactureTime: '', manufactureTime: '',
deviceCode: "", deviceCode: "",
deviceName: '', deviceName: '',
sort: 1, post: "",
post: "1",
startTime: '', startTime: '',
endTime: '', endTime: '',
productCode: '', productCode: "",
productName: '', productName: '',
models: '', models: '',
measurementUnit: '', measurementUnit: '',
@ -156,9 +155,8 @@ export default {
reportGroup: "", reportGroup: "",
reportMember: [], reportMember: [],
status: "1", status: "1",
sort: 1,
}, },
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" },

File diff suppressed because one or more lines are too long

@ -29,7 +29,7 @@
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)" <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据" placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='device_code' field='deviceCode' popupType="dialog" relationField='device_name' field='deviceCode'
interfaceId="590497496266971845" :pageSize="20" interfaceId="590497496266971845" :pageSize="20"
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'> :columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect> </JnpfPopupSelect>
@ -42,18 +42,15 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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"> <el-col :span="8">
<jnpf-form-tip-item label="班次" prop="post"> <jnpf-form-tip-item label="班次" prop="post">
<JnpfSelect v-model="dataForm.post" @change="changeData('post', -1)" placeholder="请选择" <JnpfPopupSelect v-model="dataForm.post" @change="changeData('post', -1)"
clearable :style='{ "width": "100%" }' :options="postOptions" :props="postProps"> :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.post"
</JnpfSelect> 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> </jnpf-form-tip-item>
</el-col> </el-col>
@ -70,17 +67,20 @@
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime"> <jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)" <JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择结束时间" clearable placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' format="HH:mm">
:style='{ "width": "100%" }' format="HH:mm">
</JnpfTimePicker> </JnpfTimePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="产品编码" prop="productCode"> <jnpf-form-tip-item label="产品编码" prop="productCode">
<JnpfInput v-model="dataForm.productCode" @change="changeData('productCode', -1)" <JnpfPopupSelect v-model="dataForm.productCode" @change="changeData('productCode', -1)"
placeholder="请输入产品编码" clearable :style='{ "width": "100%" }'> :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.productCode"
</JnpfInput> 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> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -155,7 +155,7 @@
<jnpf-form-tip-item label="报工成员" prop="reportMember"> <jnpf-form-tip-item label="报工成员" prop="reportMember">
<JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)" <JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)"
placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds" placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds"
clearable :style='{ "width": "100%" }'> clearable :style='{ "width": "100%" }' :multiple="true">
</JnpfUserSelect> </JnpfUserSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -167,6 +167,13 @@
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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> </template>
</el-form> </el-form>
@ -235,8 +242,9 @@ export default {
qualifiedNum: 0, qualifiedNum: 0,
compensatoryHour: 0, compensatoryHour: 0,
reportGroup: undefined, reportGroup: undefined,
reportMember: undefined, reportMember: [],
status: "1", status: "1",
sort: 1,
version: 0, version: 0,
}, },
tableRequiredData: {}, tableRequiredData: {},
@ -266,7 +274,7 @@ export default {
post: [ post: [
{ {
required: true, required: true,
message: '请至少选择一个', message: '请选择',
trigger: 'change' trigger: 'change'
}, },
], ],
@ -287,8 +295,8 @@ export default {
productCode: [ productCode: [
{ {
required: true, required: true,
message: '请输入产品编码', message: '请选择产品编码',
trigger: 'blur' trigger: 'change'
}, },
], ],
productName: [ productName: [
@ -335,8 +343,8 @@ export default {
], ],
}, },
deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },], deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },],
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }], postcolumnOptions: [{ "label": "班次名称", "value": "classes_name" }, { "label": "开始时间", "value": "start_time" }, { "label": "结束时间", "value": "end_time" }, { "label": "时长", "value": "classes_duration" },],
postProps: { "label": "fullName", "value": "id" }, productCodecolumnOptions: [{ "label": "物料编码", "value": "material_id" }, { "label": "物料名称", "value": "material_name" },],
reportGroupcolumnOptions: [{ "label": "班组名称", "value": "group_name" }, { "label": "班组组长", "value": "f_real_name" }, { "label": "班组类型", "value": "group_desc" },], reportGroupcolumnOptions: [{ "label": "班组名称", "value": "group_name" }, { "label": "班组组长", "value": "f_real_name" }, { "label": "班组类型", "value": "group_desc" },],
statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }], statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" }, statusProps: { "label": "fullName", "value": "id" },
@ -346,7 +354,6 @@ export default {
manufactureTime: [], manufactureTime: [],
deviceCode: [], deviceCode: [],
deviceName: [], deviceName: [],
sort: [],
post: [], post: [],
startTime: [], startTime: [],
endTime: [], endTime: [],
@ -362,6 +369,7 @@ export default {
reportGroup: [], reportGroup: [],
reportMember: [], reportMember: [],
status: [], status: [],
sort: [],
}, },
} }
}, },

@ -233,12 +233,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: [],
}, },
} }

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