采购计划基本功能

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysMaterialProcurementItemMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.YysMaterialProcurementItemEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+public interface YysMaterialProcurementItemMapper extends BaseMapper<YysMaterialProcurementItemEntity> {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysMaterialProcurementPlanMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.YysMaterialProcurementPlanEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+public interface YysMaterialProcurementPlanMapper extends BaseMapper<YysMaterialProcurementPlanEntity> {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementItemService.java

@@ -0,0 +1,18 @@
+package jnpf.service;
+
+import jnpf.model.yysmaterialprocurementplan.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+public interface YysMaterialProcurementItemService extends IService<YysMaterialProcurementItemEntity> {
+    QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination,QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper);
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementPlanService.java

@@ -0,0 +1,39 @@
+package jnpf.service;
+
+import jnpf.model.yysmaterialprocurementplan.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+public interface YysMaterialProcurementPlanService extends IService<YysMaterialProcurementPlanEntity> {
+    List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination);
+
+    List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination,String dataType);
+
+    YysMaterialProcurementPlanEntity getInfo(String id);
+
+    void delete(YysMaterialProcurementPlanEntity entity);
+
+    void create(YysMaterialProcurementPlanEntity entity);
+
+    boolean update(String id, YysMaterialProcurementPlanEntity entity);
+
+    //子表方法
+    List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id,YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination);
+
+    List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id);
+
+    //副表数据方法
+	String checkForm(YysMaterialProcurementPlanForm form,int i);
+
+    void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.YysMaterialProcurementItemMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.yysmaterialprocurementplan.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+@Service
+public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMaterialProcurementItemMapper, YysMaterialProcurementItemEntity> implements YysMaterialProcurementItemService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination, QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?YysMaterialProcurementPlanConstant.getColumnData():YysMaterialProcurementPlanConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return yysMaterialProcurementItemQueryWrapper;
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java

@@ -0,0 +1,388 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.YysMaterialProcurementPlanMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.yysmaterialprocurementplan.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+@Service
+public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private YysMaterialProcurementItemService yysMaterialProcurementItemService;
+    @Override
+    public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){
+        return getTypeList(yysMaterialProcurementPlanPagination,yysMaterialProcurementPlanPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int yysMaterialProcurementPlanNum =0;
+        QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper=new QueryWrapper<>();
+        int yysMaterialProcurementItemNum =0;
+        QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper=new QueryWrapper<>();
+        long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>();
+            yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,queryJson,"0"));
+            int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
+            if (yysMaterialProcurementPlanNum1>0){
+                List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(yysMaterialProcurementPlanList);
+                intersectionSuperList.add(yysMaterialProcurementPlanList);
+                superNum++;
+            }
+            String YysMaterialProcurementItemTable = "yys_material_procurement_item";
+            boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable);
+            List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , queryJson, null);
+            if (YysMaterialProcurementItemHasSql){
+                allSuperList.addAll(yysMaterialProcurementItemList);
+                intersectionSuperList.add(yysMaterialProcurementItemList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>();
+            yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,ruleJson,"0"));
+            int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
+            if (yysMaterialProcurementPlanNum1>0){
+                List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(yysMaterialProcurementPlanList);
+                intersectionRuleList.add(yysMaterialProcurementPlanList);
+                ruleNum++;
+            }
+            String YysMaterialProcurementItemTable = "yys_material_procurement_item";
+            boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable);
+            List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , ruleJson, null);
+            if (YysMaterialProcurementItemHasSql){
+                allRuleList.addAll(yysMaterialProcurementItemList);
+                intersectionRuleList.add(yysMaterialProcurementItemList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){
+        return new ArrayList<>();
+        } else {
+        yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj;
+        if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){
+        yysMaterialProcurementPlanNum++;
+        }
+        }
+        Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){
+        return new ArrayList<>();
+        } else {
+        yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj;
+        if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){
+        yysMaterialProcurementItemNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){
+        return new ArrayList<>();
+        } else {
+        yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj;
+        if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){
+        yysMaterialProcurementPlanNum++;
+        }
+        }
+
+
+        Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){
+        return new ArrayList<>();
+        } else {
+        yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj;
+        if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){
+        yysMaterialProcurementItemNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())){
+            yysMaterialProcurementPlanNum++;
+
+                String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ?
+                    JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) :
+                    String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber());
+                yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())){
+            yysMaterialProcurementPlanNum++;
+
+                List ProcurementYearMonthList =  JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1)));
+
+                    yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir))
+                    .le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())){
+            yysMaterialProcurementPlanNum++;
+
+                List ProcurementDateList =  JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1)));
+
+                    yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir))
+                    .le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+        }
+            if(yysMaterialProcurementItemNum>0){
+            List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t->t.getMaterialProcurementPlanId()).collect(Collectors.toList());
+            long count = yysMaterialProcurementItemService.count();
+            if (count>0){
+            intersectionList.add(yysMaterialProcurementItemIdList);
+            }
+            AllIdList.addAll(yysMaterialProcurementItemIdList);
+            }
+            total+=yysMaterialProcurementItemNum;
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        yysMaterialProcurementPlanQueryWrapper.lambda().isNull(YysMaterialProcurementPlanEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())){
+            yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate);
+        }else{
+            try {
+                String sidx = yysMaterialProcurementPlanPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity();
+                Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                yysMaterialProcurementPlanQueryWrapper="asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase())?yysMaterialProcurementPlanQueryWrapper.orderByAsc(value):yysMaterialProcurementPlanQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<YysMaterialProcurementPlanEntity> page=new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize());
+                IPage<YysMaterialProcurementPlanEntity> userIPage=this.page(page, yysMaterialProcurementPlanQueryWrapper);
+                return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<YysMaterialProcurementPlanEntity> list = new ArrayList();
+                return yysMaterialProcurementPlanPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(yysMaterialProcurementPlanQueryWrapper);
+        }
+    }
+    @Override
+    public YysMaterialProcurementPlanEntity getInfo(String id){
+        QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(YysMaterialProcurementPlanEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, YysMaterialProcurementPlanEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(YysMaterialProcurementPlanEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** YysMaterialProcurementItem子表方法 */
+    @Override
+    public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id,YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){
+        Map<String, Object> newtabMap=YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="yysMaterialProcurementItem";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination,queryWrapper);
+        queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
+        generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper,YysMaterialProcurementItemEntity.class,"sub",tableName);
+        return yysMaterialProcurementItemService.list(queryWrapper);
+    }
+
+    /** YysMaterialProcurementItem子表方法 */
+    @Override
+    public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id){
+        QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
+        return yysMaterialProcurementItemService.list(queryWrapper);
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(YysMaterialProcurementPlanForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        //子表字段验证
+            if (form.getYysMaterialProcurementItemList()!=null){
+            }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param yysMaterialProcurementPlanForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(),yysMaterialProcurementPlanForm),YysMaterialProcurementPlanForm.class);
+        YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+        entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
+            entity.setId(mainId);
+        }else{
+        //entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
+        }
+        this.saveOrUpdate(entity);
+
+        //YysMaterialProcurementItem子表数据新增修改
+        if(!isSave){
+            QueryWrapper<YysMaterialProcurementItemEntity> YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>();
+            YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId());
+            yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper);
+        }
+        if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList()!=null){
+            List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(),YysMaterialProcurementItemEntity.class);
+            for(YysMaterialProcurementItemEntity entitys : tableField107){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setMaterialProcurementPlanId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                yysMaterialProcurementItemService.saveOrUpdate(entitys);
+            }
+        }
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java

@@ -0,0 +1,368 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.yysmaterialprocurementplan.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.*;
+import jnpf.annotation.JnpfField;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.base.entity.ProvinceEntity;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.exception.WorkFlowException;
+import org.springframework.web.multipart.MultipartFile;
+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;
+
+/**
+ * YysMaterialProcurementPlan
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-08
+ */
+@Slf4j
+@RestController
+@Tag(name = "YysMaterialProcurementPlan" , description = "example")
+@RequestMapping("/api/example/YysMaterialProcurementPlan")
+public class YysMaterialProcurementPlanController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private YysMaterialProcurementPlanService yysMaterialProcurementPlanService;
+
+    @Autowired
+    private YysMaterialProcurementItemService yysMaterialProcurementItemService;
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param yysMaterialProcurementPlanPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination)throws IOException{
+        List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysMaterialProcurementPlanEntity entity : list) {
+        Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
+        yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
+        //副表数据
+        //子表数据
+        List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination);
+        yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
+            realList.add(yysMaterialProcurementPlanMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(yysMaterialProcurementPlanPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param yysMaterialProcurementPlanForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) {
+        String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
+        if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysMaterialProcurementPlanEntity entity : list) {
+        Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
+        yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
+        //副表数据
+        //子表数据
+        List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination);
+        yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
+            realList.add(yysMaterialProcurementPlanMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())?yysMaterialProcurementPlanPagination.getSelectKey():new String[0];
+        UserInfo userInfo=userProvider.get();
+            DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 导出表格方法
+    */
+    public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
+        DownloadVO vo=DownloadVO.builder().build();
+        List<ExcelExportEntity> entitys=new ArrayList<>();
+        if(keys.length>0){
+            ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细","tableField107");
+            List<ExcelExportEntity> tableField107List = new ArrayList<>();
+            for(String key:keys){
+                switch(key){
+                    case "procurementNumber" :
+                    entitys.add(new ExcelExportEntity("采购计划单号" ,"procurementNumber"));
+                    break;
+                    case "procurementDate" :
+                    entitys.add(new ExcelExportEntity("单据日期" ,"procurementDate"));
+                    break;
+                    case "procurementYearMonth" :
+                    entitys.add(new ExcelExportEntity("年月" ,"procurementYearMonth"));
+                    break;
+                    case "planNumber" :
+                    entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber"));
+                    break;
+                    case "reamrk" :
+                    entitys.add(new ExcelExportEntity("备注" ,"reamrk"));
+                    break;
+                    case "tableField107-materialCode":
+                    tableField107List.add(new ExcelExportEntity("物料编码" ,"materialCode"));
+                    break;
+                    case "tableField107-materialName":
+                    tableField107List.add(new ExcelExportEntity("物料名称" ,"materialName"));
+                    break;
+                    case "tableField107-materialType":
+                    tableField107List.add(new ExcelExportEntity("物料类型" ,"materialType"));
+                    break;
+                    case "tableField107-specification":
+                    tableField107List.add(new ExcelExportEntity("规格型号" ,"specification"));
+                    break;
+                    case "tableField107-lackNumber":
+                    tableField107List.add(new ExcelExportEntity("欠缺量" ,"lackNumber"));
+                    break;
+                    case "tableField107-procurementPlanNumber":
+                    tableField107List.add(new ExcelExportEntity("拟采购量" ,"procurementPlanNumber"));
+                    break;
+                    case "tableField107-unit":
+                    tableField107List.add(new ExcelExportEntity("计量单位" ,"unit"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+            if(tableField107List.size() > 0){
+                tableField107ExcelEntity.setList(tableField107List);
+                entitys.add(tableField107ExcelEntity);
+            }
+        }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+            @Cleanup Workbook workbook = new HSSFWorkbook();
+            if (entitys.size()>0){
+                if (list.size()==0){
+                    list.add(new HashMap<>());
+                }
+                //去除空数据
+                List<Map<String, Object>> dataList = new ArrayList<>();
+                for (Map<String, Object> map : list) {
+                    int i = 0;
+                    for (String key : keys) {
+                        //子表
+                        if (key.toLowerCase().startsWith("tablefield")) {
+                            String tableField = key.substring(0, key.indexOf("-" ));
+                            String field = key.substring(key.indexOf("-" ) + 1);
+                            Object o = map.get(tableField);
+                            if (o != null) {
+                                List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
+                                for (Map<String, Object> childMap : childList) {
+                                    if (childMap.get(field) != null) {
+                                        i++;
+                                    }
+                                }
+                            }
+                        } else {
+                            Object o = map.get(key);
+                            if (o != null) {
+                                i++;
+                            }
+                        }
+                    }
+                    if (i > 0) {
+                        dataList.add(map);
+                    }
+                }
+                //复杂表头-表头和数据处理
+                ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(YysMaterialProcurementPlanConstant.getColumnData(), ColumnDataModel.class);
+                List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+                if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+                    entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+                    dataList =  VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
+                }
+
+                workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
+            }
+            String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param yysMaterialProcurementPlanForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        yysMaterialProcurementPlanForm.setId(id);
+        if (!isImport) {
+            String b =  yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
+        if(entity!=null){
+            try{
+                yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            yysMaterialProcurementPlanService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
+        yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
+        //副表数据
+        //子表数据
+        List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
+        yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
+        yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),"590930391657874309",false);
+        return ActionResult.success(yysMaterialProcurementPlanMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
+        yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
+        //副表数据
+        //子表数据
+        List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
+        yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
+        yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),YysMaterialProcurementPlanConstant.TABLEFIELDKEY,YysMaterialProcurementPlanConstant.TABLERENAMES);
+        return ActionResult.success(yysMaterialProcurementPlanMap);
+    }
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementItemEntity.java

@@ -0,0 +1,61 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 物料采购条目
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-08
+ */
+@Data
+@TableName("yys_material_procurement_item")
+public class YysMaterialProcurementItemEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("MATERIAL_PROCUREMENT_PLAN_ID")
+    private String materialProcurementPlanId;
+    @TableField(value = "MATERIAL_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String materialCode;
+    @TableField(value = "MATERIAL_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String materialName;
+    @TableField(value = "MATERIAL_TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String materialType;
+    @TableField(value = "SPECIFICATION" , updateStrategy = FieldStrategy.IGNORED)
+    private String specification;
+    @TableField(value = "LACK_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal lackNumber;
+    @TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String unit;
+    @TableField(value = "PROCUREMENT_PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal procurementPlanNumber;
+    @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "F_LAST_MODIFY_TIME" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "F_LAST_MODIFY_USER_ID" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "F_DELETE_TIME" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "F_DELETE_USER_ID" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "F_DELETE_MARK" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementPlanEntity.java

@@ -0,0 +1,55 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 物料采购计划
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-08
+ */
+@Data
+@TableName("yys_material_procurement_plan")
+public class YysMaterialProcurementPlanEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "PROCUREMENT_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String procurementNumber;
+    @TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String planNumber;
+    @TableField(value = "PROCUREMENT_YEAR_MONTH" , updateStrategy = FieldStrategy.IGNORED)
+    private Date procurementYearMonth;
+    @TableField(value = "PROCUREMENT_DATE" , updateStrategy = FieldStrategy.IGNORED)
+    private Date procurementDate;
+    @TableField("PROCUREMENT_STATUS")
+    private String procurementStatus;
+    @TableField(value = "REAMRK" , updateStrategy = FieldStrategy.IGNORED)
+    private String reamrk;
+    @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "F_LAST_MODIFY_TIME" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "F_LAST_MODIFY_USER_ID" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "F_DELETE_TIME" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "F_DELETE_USER_ID" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "F_DELETE_MARK" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementplan/YysMaterialProcurementItemModel.java

@@ -0,0 +1,44 @@
+package jnpf.model.yysmaterialprocurementplan;
+
+import lombok.Data;
+import java.util.List;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * YysMaterialProcurementPlan
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-08
+ */
+@Data
+public class YysMaterialProcurementItemModel  {
+    /** 物料编码 **/
+    @JSONField(name = "materialCode")
+    private String materialCode;
+    /** 物料名称 **/
+    @JSONField(name = "materialName")
+    private String materialName;
+    /** 物料类型 **/
+    @JSONField(name = "materialType")
+    private String materialType;
+    /** 规格型号 **/
+    @JSONField(name = "specification")
+    private String specification;
+    /** 欠缺量 **/
+    @JSONField(name = "lackNumber")
+    private BigDecimal lackNumber;
+
+    /** 拟采购量 **/
+    @JSONField(name = "procurementPlanNumber")
+    private BigDecimal procurementPlanNumber;
+
+    /** 计量单位 **/
+    @JSONField(name = "unit")
+    private String unit;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementplan/YysMaterialProcurementPlanForm.java

@@ -0,0 +1,38 @@
+package jnpf.model.yysmaterialprocurementplan;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * YysMaterialProcurementPlan
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-08
+ */
+@Data
+public class YysMaterialProcurementPlanForm  {
+    /** 主键 */
+    private String id;
+    /** 子表数据 **/
+    @JsonProperty("yysMaterialProcurementItemList")
+    private List<YysMaterialProcurementItemModel> yysMaterialProcurementItemList;
+
+    /** 采购计划单号 **/
+    @JsonProperty("procurementNumber")
+    private String procurementNumber;
+    /** 单据日期 **/
+    @JsonProperty("procurementDate")
+    private String procurementDate;
+    /** 年月 **/
+    @JsonProperty("procurementYearMonth")
+    private String procurementYearMonth;
+    /** 物料需求计划单号 **/
+    @JsonProperty("planNumber")
+    private String planNumber;
+    /** 备注 **/
+    @JsonProperty("reamrk")
+    private String reamrk;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementplan/YysMaterialProcurementPlanPagination.java

@@ -0,0 +1,39 @@
+package jnpf.model.yysmaterialprocurementplan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * YysMaterialProcurementPlan
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-08
+ */
+@Data
+public class YysMaterialProcurementPlanPagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+    /** 采购计划单号 */
+    @JsonProperty("procurementNumber")
+    private Object procurementNumber;
+    /** 年月 */
+    @JsonProperty("procurementYearMonth")
+    private Object procurementYearMonth;
+    /** 单据日期 */
+    @JsonProperty("procurementDate")
+    private Object procurementDate;
+}

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue

@@ -0,0 +1,177 @@
+<template>
+<transition name="el-zoom-in-center">
+<div class="JNPF-preview-main">
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+    <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack"
+                        content="详情"/>
+        <div class="options">
+            <el-button @click="goBack">取 消</el-button>
+        </div>
+    </div>
+<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="采购计划单号"  
+ prop="procurementNumber"  >
+                        <p>{{dataForm.procurementNumber}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="单据日期"  
+ prop="procurementDate"  >
+                        <p>{{dataForm.procurementDate}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="年月"  
+ prop="procurementYearMonth"  >
+                        <p>{{dataForm.procurementYearMonth}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="物料需求计划单号"  
+ prop="planNumber"  >
+                        <p>{{dataForm.planNumber}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="备注"  
+ prop="reamrk"  >
+                        <p>{{dataForm.reamrk}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+    <el-col :span="24"  >
+    <jnpf-form-tip-item label-width="0">
+            <div class="JNPF-common-title">
+              <h2>物料明细</h2>
+            </div>
+    <el-table :data="dataForm.tableField107" size='mini'   >
+        <el-table-column type="index" width="50" label="序号" align="center" />
+            <el-table-column prop="materialCode" label="物料编码" >
+            <template slot-scope="scope">
+                            <p>{{scope.row.materialCode}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="materialName" label="物料名称" >
+            <template slot-scope="scope">
+                            <p>{{scope.row.materialName}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="materialType" label="物料类型" >
+            <template slot-scope="scope">
+                            <p>{{scope.row.materialType}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="specification" label="规格型号" >
+            <template slot-scope="scope">
+                            <p>{{scope.row.specification}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="lackNumber" label="欠缺量" >
+            <template slot-scope="scope">
+                    <JnpfNumber   v-model="scope.row.lackNumber"
+ placeholder="数字文本"   disabled
+ :step="1" >
+                </JnpfNumber>
+        </template>
+        </el-table-column>
+            <el-table-column prop="procurementPlanNumber" label="拟采购量" >
+            <template slot-scope="scope">
+                    <JnpfNumber   v-model="scope.row.procurementPlanNumber"
+ placeholder="数字文本"   disabled
+ :step="1" >
+                </JnpfNumber>
+        </template>
+        </el-table-column>
+            <el-table-column prop="unit" label="计量单位" >
+            <template slot-scope="scope">
+                            <p>{{scope.row.unit}}</p>
+        </template>
+        </el-table-column>
+    </el-table>
+    </jnpf-form-tip-item>
+    </el-col>
+    </template>
+</el-form>
+    </el-row>
+    </div>
+</transition>
+</template>
+<script>
+    import request from '@/utils/request'
+
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import jnpf from '@/utils/jnpf'
+    import Detail from '@/views/basic/dynamicModel/list/detail'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { Detail},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                detailVisible: false,
+                loading: false,
+
+            dataForm: {
+                id :'',
+                            procurementNumber : '',
+                            procurementDate : '',
+                            procurementYearMonth : '',
+                            planNumber : "",
+                            reamrk : '',
+                        yysmaterialprocurementitemList:[],
+            },
+
+        }
+        },
+        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
+            },
+
+                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/YysMaterialProcurementPlan/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue

@@ -0,0 +1,606 @@
+
+
+
+    <template>
+            <transition name="el-zoom-in-center">
+            <div class="JNPF-preview-main">
+                <div class="JNPF-common-page-header">
+                    <el-page-header @back="goBack"
+                                    :content="!dataForm.id ? '新建':'编辑'"/>
+                    <div class="options">
+                            <el-dropdown class="dropdown" placement="bottom">
+                                <el-button style="width:70px">
+                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                                </el-button>
+                                <el-dropdown-menu slot="dropdown">
+                                        <template v-if="dataForm.id">
+                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                                                {{'上一条'}}
+                                            </el-dropdown-item>
+                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                                                {{'下一条'}}
+                                            </el-dropdown-item>
+                                        </template>
+                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
+                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+                                </el-dropdown-menu>
+                            </el-dropdown>
+                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
+                        <el-button @click="goBack"> 取 消</el-button>
+                    </div>
+                </div>
+            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px" label-position="right" >
+    <template v-if="!loading">
+        <!-- 具体表单 -->
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="采购计划单号"   prop="procurementNumber" >
+        <JnpfInput   v-model="dataForm.procurementNumber" @change="changeData('procurementNumber',-1)" 
+ placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="单据日期"   prop="procurementDate" >
+        <JnpfDatePicker   v-model="dataForm.procurementDate" @change="changeData('procurementDate',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="年月"   prop="procurementYearMonth" >
+        <JnpfDatePicker   v-model="dataForm.procurementYearMonth" @change="changeData('procurementYearMonth',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="month"  format="yyyy-MM" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="物料需求计划单号"   prop="planNumber" >
+        <JnpfPopupSelect   v-model="dataForm.planNumber" @change="changeData('planNumber',-1)" 
+ :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.planNumber"  placeholder="请选择"  propsValue="plan_number"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='plan_number'  field='planNumber'  interfaceId="591169965881556997"  :pageSize="20"  :columnOptions="planNumbercolumnOptions"  clearable  :style='{"width":"100%"}'>
+    </JnpfPopupSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24" >
+        <jnpf-form-tip-item
+ label="备注"   prop="reamrk" >
+        <JnpfTextarea   v-model="dataForm.reamrk" @change="changeData('reamrk',-1)" 
+ placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
+    </JnpfTextarea>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  >
+            <jnpf-form-tip-item label-width="0">
+                    <div class="JNPF-common-title">
+                        <h2>物料明细</h2>
+                    </div>
+                <el-table :data="dataForm.yysMaterialProcurementItemList" size='mini' >
+                    <el-table-column type="index" width="50" label="序号" align="center" />
+        <el-table-column
+ label="物料编码"   prop="materialCode" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>物料编码
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.materialCode" @change="changeData('yysmaterialprocurementitem-materialCode',scope.$index)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="物料名称"   prop="materialName" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>物料名称
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.materialName" @change="changeData('yysmaterialprocurementitem-materialName',scope.$index)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="物料类型"   prop="materialType" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>物料类型
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.materialType" @change="changeData('yysmaterialprocurementitem-materialType',scope.$index)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="规格型号"   prop="specification" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>规格型号
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.specification" @change="changeData('yysmaterialprocurementitem-specification',scope.$index)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="欠缺量"   prop="lackNumber" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>欠缺量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInputNumber   v-model="scope.row.lackNumber" @change="changeData('yysmaterialprocurementitem-lackNumber',scope.$index)" 
+ placeholder="数字文本"  :precision="2"  :step="1" >
+    </JnpfInputNumber>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="拟采购量"   prop="procurementPlanNumber" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>拟采购量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInputNumber   v-model="scope.row.procurementPlanNumber" @change="changeData('yysmaterialprocurementitem-procurementPlanNumber',scope.$index)" 
+ placeholder="数字文本"  :precision="2"  :step="1" >
+    </JnpfInputNumber>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="计量单位"   prop="unit" >
+                <template slot="header"  v-if="false"  >
+                    <span class="required-sign"  >*</span>计量单位
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.unit" @change="changeData('yysmaterialprocurementitem-unit',scope.$index)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+                        <el-table-column label="操作" width="50"  >
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delyysMaterialProcurementItemList(scope.$index)">删除</el-button>
+                            </template>
+                        </el-table-column>
+                </el-table>
+                    <div class="table-actions" @click="addyysMaterialProcurementItemList()" >
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+            </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    </el-form>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-row>
+    </div>
+    </transition>
+    </template>
+
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { },
+        props: [],
+        data() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting:{},
+            eventType: '',
+            userBoxVisible:false,
+            selectDialogVisible: false,
+            currTableConf:{},
+            dataValueAll:{},
+            addTableConf:{
+                            yysMaterialProcurementItemList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+                    yysMaterialProcurementItemList:{
+                            materialCode : '',
+                                materialCodeOptions:[],
+                            materialName : '',
+                                materialNameOptions:[],
+                            materialType : '',
+                                materialTypeOptions:[],
+                            specification : '',
+                                specificationOptions:[],
+                            lackNumber : undefined,
+                                lackNumberOptions:[],
+                            procurementPlanNumber : undefined,
+                                procurementPlanNumberOptions:[],
+                            unit : '',
+                                unitOptions:[],
+                    enabledmark:undefined
+            },
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                procurementNumber : undefined,
+                                procurementDate : undefined,
+                                procurementYearMonth : undefined,
+                                    planNumber : undefined,
+                                reamrk : undefined,
+                        yysMaterialProcurementItemList:[],
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+            },
+                    planNumbercolumnOptions:[ {"label":"物料需求计划单","value":"plan_number"}, {"label":"物料信息","value":"material_names"}, {"label":"年月","value":"plan_year_month"}, {"label":"单据日期","value":"order_date"}, {"label":"备注","value":"reamrk"},],
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        procurementNumber:[] ,
+                        procurementDate:[] ,
+                        procurementYearMonth:[] ,
+                        planNumber:[] ,
+                        reamrk:[] ,
+                            yysmaterialprocurementitemmaterialCode: [] ,
+                            yysmaterialprocurementitemmaterialName: [] ,
+                            yysmaterialprocurementitemmaterialType: [] ,
+                            yysmaterialprocurementitemspecification: [] ,
+                            yysmaterialprocurementitemlackNumber: [] ,
+                            yysmaterialprocurementitemprocurementPlanNumber: [] ,
+                            yysmaterialprocurementitemunit: [] ,
+            },
+        }
+        },
+        computed: {
+            ...mapGetters(['userInfo'])
+        },
+        watch: {},
+        created() {
+            this.dataAll()
+            this.initDefaultData()
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            prev() {
+                this.index--
+                if (this.index === 0) {
+                    this.prevDis = true
+                }
+                this.nextDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            next() {
+                this.index++
+                if (this.index === this.allList.length - 1) {
+                    this.nextDis = true
+                }
+                this.prevDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            getInfo(id) {
+                request({
+                    url: '/api/example/YysMaterialProcurementPlan/'+ id,
+                    method: 'get'
+                }).then(res => {
+                    this.dataInfo(res.data)
+                });
+            },
+            goBack() {
+                this.visible = false
+                this.$emit('refreshDataList', true)
+            },
+            changeData(model, index) {
+                this.isEdit = false
+                this.childIndex = index
+                let modelAll = model.split("-");
+                let faceMode = "";
+                for (let i = 0; i < modelAll.length; i++) {
+                    faceMode += modelAll[i];
+                }
+                for (let key in this.interfaceRes) {
+                    if (key != faceMode) {
+                        let faceReList = this.interfaceRes[key]
+                        for (let i = 0; i < faceReList.length; i++) {
+                            if (faceReList[i].relationField == model) {
+                                let options = 'get' + key + 'Options';
+                                if(this[options]){
+                                    this[options]()
+                                }
+                                this.changeData(key, index)
+                            }
+                        }
+                    }
+                }
+            },
+            changeDataFormData(type, data, model,index,defaultValue) {
+                if(!this.isEdit) {
+                    if (type == 2) {
+                        for (let i = 0; i < this.dataForm[data].length; i++) {
+                            if (index == -1) {
+                                this.dataForm[data][i][model] = defaultValue
+                            } else if (index == i) {
+                                this.dataForm[data][i][model] = defaultValue
+                            }
+                        }
+                    } else {
+                        this.dataForm[data] = defaultValue
+                    }
+                }
+            },
+            dataAll(){
+            },
+                yysmaterialprocurementitemExist() {
+                let isOk = true;
+            for(let i=0;i<this.dataForm.yysMaterialProcurementItemList.length;i++){
+                const e = this.dataForm.yysMaterialProcurementItemList[i];
+            }
+                return isOk;
+            },
+                goBack() {
+                this.$emit('refresh')
+            },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            init(id,isDetail,allList) {
+                this.prevDis = false
+                this.nextDis = false
+                this.allList = allList || []
+                if (allList.length) {
+                    this.index = this.allList.findIndex(item => item.id === id)
+                    if (this.index == 0) {
+                        this.prevDis = true
+                    }
+                    if (this.index == this.allList.length - 1) {
+                        this.nextDis = true
+                    }
+                } else {
+                    this.prevDis = true
+                    this.nextDis = true
+                }
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/YysMaterialProcurementPlan/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        });
+                    }else{
+                        this.clearData()
+                        this.initDefaultData()
+                    }
+                });
+                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+            // 表单提交
+            dataFormSubmit(type) {
+                this.dataFormSubmitType = type ? type : 0
+                this.$refs['formRef'].validate((valid) => {
+                    if (valid) {
+                            if (!this.yysmaterialprocurementitemExist()) return
+                        this.request()
+                    }
+                })
+            },
+            request() {
+                let _data =this.dataList()
+                if (this.dataFormSubmitType == 2) {
+                    this.continueBtnLoading = true
+                } else {
+                    this.btnLoading = true
+                }
+                if (!this.dataForm.id) {
+                    request({
+                        url: '/api/example/YysMaterialProcurementPlan',
+                        method: 'post',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) {
+                                    this.$nextTick(() => {
+                                        this.clearData()
+                                        this.initDefaultData()
+                                    })
+                                    this.continueBtnLoading = false
+                                    return
+                                }
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }else{
+                    request({
+                        url: '/api/example/YysMaterialProcurementPlan/'+this.dataForm.id,
+                        method: 'PUT',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }
+            },
+                addyysMaterialProcurementItemList(){
+                let item = {
+                            materialCode:undefined,
+                            materialName:undefined,
+                            materialType:undefined,
+                            specification:undefined,
+                            lackNumber:undefined,
+                            procurementPlanNumber:undefined,
+                            unit:undefined,
+            }
+                this.getyysMaterialProcurementItemList(item)
+            },
+                delyysMaterialProcurementItemList(index) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.dataForm.yysMaterialProcurementItemList.splice(index, 1);
+                }).catch(() => {
+                });
+            },
+                getyysMaterialProcurementItemList(value){
+                let item={...this.tableRows.yysMaterialProcurementItemList,...value}
+                this.dataForm.yysMaterialProcurementItemList.push(item)
+                this.childIndex=this.dataForm.yysMaterialProcurementItemList.length-1
+                this.isEdit = true
+                this.isEdit = false
+                this.childIndex = -1
+            },
+            openSelectDialog(key) {
+                this.currTableConf=this.addTableConf[key]
+                this.currVmodel=key
+                this.selectDialogVisible = true
+                this.$nextTick(() => {
+                    this.$refs.selectDialog.init()
+                })
+            },
+            addForSelect(data) {
+                for (let i = 0; i < data.length; i++) {
+                    let t = data[i]
+                    if(this['get'+this.currVmodel]){
+                        this['get'+this.currVmodel](t)
+                    }
+                }
+            },
+            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+                let timeDataValue = null;
+                let timeValue = Number(timeValueData)
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = new Date().getTime()
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getBeforeData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                        }
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getLaterData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+                        }
+                    }
+                }
+                return timeDataValue;
+            },
+            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+                let timeDataValue = null
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue || '00:00:00'
+                        if (timeDataValue.split(':').length == 3) {
+                            timeDataValue = timeDataValue
+                        } else {
+                            timeDataValue = timeDataValue + ':00'
+                        }
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = this.jnpf.toDate(new Date(), format)
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        previousDate = getBeforeTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        previousDate = getLaterTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    }
+                }
+                return timeDataValue;
+            },
+            dataList(){
+                var _data = this.dataForm;
+                return _data;
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+                this.isEdit = true
+                this.dataAll()
+                    for(let i=0;i<_dataAll.yysMaterialProcurementItemList.length;i++){
+                        this.childIndex = i
+                    }
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/index.vue

@@ -0,0 +1,479 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="采购计划单号">
+                                        <el-input v-model="query.procurementNumber" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="年月">
+                                        <JnpfDateRangePicker v-model="query.procurementYearMonth"
+                                                             format="yyyy-MM" startPlaceholder="开始日期"
+                                                             endPlaceholder="结束日期" >
+                                        </JnpfDateRangePicker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="单据日期">
+                                        <JnpfDateRangePicker v-model="query.procurementDate"
+                                                             format="yyyy-MM-dd" startPlaceholder="开始日期"
+                                                             endPlaceholder="结束日期" >
+                                        </JnpfDateRangePicker>
+                                </el-form-item>
+                            </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                                    <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"  v-has="'btn_download'" >导出
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                            <el-tooltip content="高级查询" placement="top" v-if="true">
+                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                         @click="openSuperQuery()" />
+                            </el-tooltip>
+                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                         @click="initData()" />
+                            </el-tooltip>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
+ :span-method="arraySpanMethod"  
+
+>
+                                                <el-table-column
+                                                            prop="procurementNumber"
+ label="采购计划单号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="procurementDate"
+ label="单据日期"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="procurementYearMonth"
+ label="年月"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="planNumber"
+ label="物料需求计划单号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="reamrk"
+ label="备注"  align="left"
+ >
+                                                </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text"
+                                                       @click="addOrUpdateHandle(scope.row)"  v-has="'btn_edit'" >编辑
+                                            </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"   v-has="'btn_detail'" 
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+             </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+
+
+
+
+        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+                        @superQuery="superQuery" />
+    </div>
+</template>
+
+<script>
+
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './form'
+    import Detail from './Detail'
+    import ExportBox from '@/components/ExportBox'
+    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+            import columnList from './columnList'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+        import SuperQuery from '@/components/SuperQuery'
+        import superQueryJson from './superQueryJson'
+
+    export default {
+        components: {
+                JNPFForm,
+                Detail,
+ ExportBox,ToFormDetail , SuperQuery
+        },
+        data() {
+            return {
+
+                keyword:'',
+                expandsTree: true,
+                refreshTree: true,
+                toFormDetailVisible:false,
+                                expandObj:{},
+                columnOptions: [],
+                mergeList: [],
+                exportList:[],
+                    columnList,
+
+                    superQueryVisible: false,
+                    superQueryJson,
+                uploadBoxVisible: false,
+                detailVisible: false,
+                query: {
+                        procurementNumber:undefined,
+                        procurementYearMonth:undefined,
+                        procurementDate:undefined,
+            },
+            treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id',
+                    isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+                    total: 0,
+            queryData: {},
+            listQuery: {
+                    superQueryJson: '',
+                        currentPage: 1,
+                        pageSize: 20,
+                sort: "desc",
+                        sidx: "procurementDate",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+                                                                                                                                                interfaceRes: {
+                        planNumber:[] ,
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+        },
+        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.toFormDetailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            toggleTreeExpand(expands) {
+                this.refreshTree = false
+                this.expandsTree = expands
+                this.$nextTick(() => {
+                    this.refreshTree = true
+                    this.$nextTick(() => {
+                        this.$refs.treeBox.setCurrentKey(null)
+                    })
+                })
+            },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data[this.treeProps.label].indexOf(value) !== -1;
+            },
+            loadNode(node, resolve) {
+                const nodeData = node.data
+                const config ={
+                    treeInterfaceId:"",
+                    treeTemplateJson:[]
+                }
+                if (config.treeInterfaceId) {
+                    //这里是为了拿到参数中关联的字段的值，后端自行拿
+                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                            const element = config.treeTemplateJson[i];
+                            element.defaultValue = nodeData[element.relationField] || ''
+                        }
+                    }
+                    //参数
+                    let query = {
+                        paramList: config.treeTemplateJson || [],
+                    }
+                    //接口
+                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                        let data = res.data
+                        if (Array.isArray(data)) {
+                            resolve(data);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            },
+                        getColumnList() {
+                    // 没有开启权限
+                    this.columnOptions = this.transformColumnList(this.columnList)
+            },
+            transformColumnList(columnList) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    const e = columnList[i];
+                    if (!e.prop.includes('-')) {
+                        list.push(e)
+                    } else {
+                        let prop = e.prop.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let vModel = e.prop.split('-')[1]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        e.vModel = vModel
+                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                this.getMergeList(list)
+                this.getExportList(list)
+                return list
+            },
+            arraySpanMethod({ column }) {
+                for (let i = 0; i < this.mergeList.length; i++) {
+                    if (column.property == this.mergeList[i].prop) {
+                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                    }
+                }
+            },
+            getMergeList(list) {
+                let newList = JSON.parse(JSON.stringify(list))
+                newList.forEach(item => {
+                    if (item.children && item.children.length) {
+                        let child = {
+                            prop: item.prop + '-child-first'
+                        }
+                        item.children.unshift(child)
+                    }
+                })
+                newList.forEach(item => {
+                    if (item.children && item.children.length ) {
+                        item.children.forEach((child, index) => {
+                            if (index == 0) {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 1,
+                                    colspan: item.children.length
+                                })
+                            } else {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 0,
+                                    colspan: 0
+                                })
+                            }
+                        })
+                    } else {
+                        this.mergeList.push({
+                            prop: item.prop,
+                            rowspan: 1,
+                            colspan: 1
+                        })
+                    }
+                })
+            },
+            getExportList(list) {
+                let exportList = []
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].jnpfKey === 'table') {
+                        for (let j = 0; j < list[i].children.length; j++) {
+                            exportList.push(list[i].children[j])
+                        }
+                    } else {
+                        exportList.push(list[i])
+                    }
+                }
+                this.exportList = exportList
+            },
+            goDetail(id){
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(id)
+                })
+            },
+            sortChange({column, prop, order}) {
+                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+                this.listQuery.sidx = !order ? '' : prop
+                this.initData()
+            },
+            async initSearchDataAndListData() {
+                await this.initSearchData()
+                this.initData()
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                        keyword: this.keyword,
+                        dataType: 0,
+                    menuId:this.menuId,
+                    moduleId:'590930391657874309',
+                    type:1,
+                };
+                request({
+                    url: `/api/example/YysMaterialProcurementPlan/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =res.data.list;
+                                            this.list = _list.map(o => ({
+                            ...o,
+                            ...this.expandObj,
+                        }))
+                            this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/example/YysMaterialProcurementPlan/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+            handelUpload(){
+                this.uploadBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.UploadBox.init("","example/YysMaterialProcurementPlan")
+                })
+            },
+                openSuperQuery() {
+                    this.superQueryVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.SuperQuery.init()
+                    })
+                },
+                superQuery(queryJson) {
+                    this.listQuery.superQueryJson = queryJson
+                    this.listQuery.currentPage = 1
+                    this.initData()
+                },
+            addOrUpdateHandle(row, isDetail) {
+                let id = row?row.id:""
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail,this.list)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.exportList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/example/YysMaterialProcurementPlan/Actions/Export`,
+                    method: 'post',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    this.jnpf.downloadFile(res.data.url)
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+            search() {
+                    this.listQuery.currentPage=1
+                        this.listQuery.pageSize=20
+                    this.listQuery.sort="desc"
+                this.listQuery.sidx="procurementDate"
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                this.query = JSON.parse(JSON.stringify(this.queryData))
+                this.search()
+            },
+            colseFlow(isrRefresh) {
+                this.flowVisible = false
+                if (isrRefresh) this.reset()
+            },
+        }
+    }
+</script>