补送订单

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/RedeliveryOrderMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.RedeliveryOrderMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/RedeliveryOriginalorderRelationMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.RedeliveryOriginalorderRelationMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/RedeliveryProductRelationMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.RedeliveryProductRelationMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RedeliveryOrderMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RedeliveryOriginalorderRelationMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RedeliveryProductRelationMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RedeliveryOrderService.java

@@ -0,0 +1,43 @@
+package jnpf.service;
+
+import jnpf.model.redeliveryorder.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * redeliveryOrder
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-05
+ */
+public interface RedeliveryOrderService extends IService<RedeliveryOrderEntity> {
+    List<RedeliveryOrderEntity> getList(RedeliveryOrderPagination redeliveryOrderPagination);
+
+    List<RedeliveryOrderEntity> getTypeList(RedeliveryOrderPagination redeliveryOrderPagination,String dataType);
+
+    RedeliveryOrderEntity getInfo(String id);
+
+    void delete(RedeliveryOrderEntity entity);
+
+    void create(RedeliveryOrderEntity entity);
+
+    boolean update(String id, RedeliveryOrderEntity entity);
+
+    //子表方法
+    List<RedeliveryOriginalorderRelationEntity> getRedeliveryOriginalorderRelationList(String id,RedeliveryOrderPagination redeliveryOrderPagination);
+
+    List<RedeliveryOriginalorderRelationEntity> getRedeliveryOriginalorderRelationList(String id);
+
+    List<RedeliveryProductRelationEntity> getRedeliveryProductRelationList(String id,RedeliveryOrderPagination redeliveryOrderPagination);
+
+    List<RedeliveryProductRelationEntity> getRedeliveryProductRelationList(String id);
+
+    //副表数据方法
+	String checkForm(RedeliveryOrderForm form,int i);
+
+    void saveOrUpdate(RedeliveryOrderForm redeliveryOrderForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RedeliveryOriginalorderRelationService.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RedeliveryProductRelationService.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RedeliveryOrderServiceImpl.java

@@ -0,0 +1,468 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.RedeliveryOrderMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.redeliveryorder.*;
+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;
+/**
+ *
+ * redeliveryOrder
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-05
+ */
+@Service
+public class RedeliveryOrderServiceImpl extends ServiceImpl<RedeliveryOrderMapper, RedeliveryOrderEntity> implements RedeliveryOrderService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private RedeliveryOriginalorderRelationService redeliveryOriginalorderRelationService;
+    @Autowired
+    private RedeliveryProductRelationService redeliveryProductRelationService;
+    @Override
+    public List<RedeliveryOrderEntity> getList(RedeliveryOrderPagination redeliveryOrderPagination){
+        return getTypeList(redeliveryOrderPagination,redeliveryOrderPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<RedeliveryOrderEntity> getTypeList(RedeliveryOrderPagination redeliveryOrderPagination,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 ? RedeliveryOrderConstant.getAppColumnData() : RedeliveryOrderConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int redeliveryOrderNum =0;
+        QueryWrapper<RedeliveryOrderEntity> redeliveryOrderQueryWrapper=new QueryWrapper<>();
+        int redeliveryOriginalorderRelationNum =0;
+        QueryWrapper<RedeliveryOriginalorderRelationEntity> redeliveryOriginalorderRelationQueryWrapper=new QueryWrapper<>();
+        int redeliveryProductRelationNum =0;
+        QueryWrapper<RedeliveryProductRelationEntity> redeliveryProductRelationQueryWrapper=new QueryWrapper<>();
+        long redeliveryOriginalorderRelationcount = redeliveryOriginalorderRelationService.count();
+        long redeliveryProductRelationcount = redeliveryProductRelationService.count();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(redeliveryOrderPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = redeliveryOrderPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<RedeliveryOrderEntity> redeliveryOrderSuperWrapper = new QueryWrapper<>();
+            redeliveryOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(redeliveryOrderSuperWrapper,RedeliveryOrderEntity.class,queryJson,"0"));
+            int redeliveryOrderNum1 = redeliveryOrderSuperWrapper.getExpression().getNormal().size();
+            if (redeliveryOrderNum1>0){
+                List<String> redeliveryOrderList =this.list(redeliveryOrderSuperWrapper).stream().map(RedeliveryOrderEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(redeliveryOrderList);
+                intersectionSuperList.add(redeliveryOrderList);
+                superNum++;
+            }
+            String redeliveryOriginalorderRelationTable = "jg_redelivery_originalorder_relation";
+            boolean redeliveryOriginalorderRelationHasSql = queryJson.contains(redeliveryOriginalorderRelationTable);
+            List<String> redeliveryOriginalorderRelationList = generaterSwapUtil.selectIdsByChildCondition(RedeliveryOrderConstant.getTableList(), redeliveryOriginalorderRelationTable , queryJson, null);
+            if (redeliveryOriginalorderRelationHasSql){
+                allSuperList.addAll(redeliveryOriginalorderRelationList);
+                intersectionSuperList.add(redeliveryOriginalorderRelationList);
+                superNum++;
+            }
+            String redeliveryProductRelationTable = "jg_redelivery_product_relation";
+            boolean redeliveryProductRelationHasSql = queryJson.contains(redeliveryProductRelationTable);
+            List<String> redeliveryProductRelationList = generaterSwapUtil.selectIdsByChildCondition(RedeliveryOrderConstant.getTableList(), redeliveryProductRelationTable , queryJson, null);
+            if (redeliveryProductRelationHasSql){
+                allSuperList.addAll(redeliveryProductRelationList);
+                intersectionSuperList.add(redeliveryProductRelationList);
+                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<RedeliveryOrderEntity> redeliveryOrderSuperWrapper = new QueryWrapper<>();
+            redeliveryOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(redeliveryOrderSuperWrapper,RedeliveryOrderEntity.class,ruleJson,"0"));
+            int redeliveryOrderNum1 = redeliveryOrderSuperWrapper.getExpression().getNormal().size();
+            if (redeliveryOrderNum1>0){
+                List<String> redeliveryOrderList =this.list(redeliveryOrderSuperWrapper).stream().map(RedeliveryOrderEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(redeliveryOrderList);
+                intersectionRuleList.add(redeliveryOrderList);
+                ruleNum++;
+            }
+            String redeliveryOriginalorderRelationTable = "jg_redelivery_originalorder_relation";
+            boolean redeliveryOriginalorderRelationHasSql = ruleJson.contains(redeliveryOriginalorderRelationTable);
+            List<String> redeliveryOriginalorderRelationList = generaterSwapUtil.selectIdsByChildCondition(RedeliveryOrderConstant.getTableList(), redeliveryOriginalorderRelationTable , ruleJson, null);
+            if (redeliveryOriginalorderRelationHasSql){
+                allRuleList.addAll(redeliveryOriginalorderRelationList);
+                intersectionRuleList.add(redeliveryOriginalorderRelationList);
+                ruleNum++;
+            }
+            String redeliveryProductRelationTable = "jg_redelivery_product_relation";
+            boolean redeliveryProductRelationHasSql = ruleJson.contains(redeliveryProductRelationTable);
+            List<String> redeliveryProductRelationList = generaterSwapUtil.selectIdsByChildCondition(RedeliveryOrderConstant.getTableList(), redeliveryProductRelationTable , ruleJson, null);
+            if (redeliveryProductRelationHasSql){
+                allRuleList.addAll(redeliveryProductRelationList);
+                intersectionRuleList.add(redeliveryProductRelationList);
+                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 redeliveryOrderObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(redeliveryOrderQueryWrapper,RedeliveryOrderEntity.class,redeliveryOrderPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(redeliveryOrderObj)){
+        return new ArrayList<>();
+        } else {
+        redeliveryOrderQueryWrapper = (QueryWrapper<RedeliveryOrderEntity>)redeliveryOrderObj;
+        if( redeliveryOrderQueryWrapper.getExpression().getNormal().size()>0){
+        redeliveryOrderNum++;
+        }
+        }
+        Object redeliveryOriginalorderRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(redeliveryOriginalorderRelationQueryWrapper,RedeliveryOriginalorderRelationEntity.class,redeliveryOrderPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(redeliveryOriginalorderRelationObj)){
+        return new ArrayList<>();
+        } else {
+        redeliveryOriginalorderRelationQueryWrapper = (QueryWrapper<RedeliveryOriginalorderRelationEntity>)redeliveryOriginalorderRelationObj;
+        if( redeliveryOriginalorderRelationQueryWrapper.getExpression().getNormal().size()>0){
+        redeliveryOriginalorderRelationNum++;
+        }
+        }
+        Object redeliveryProductRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(redeliveryProductRelationQueryWrapper,RedeliveryProductRelationEntity.class,redeliveryOrderPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(redeliveryProductRelationObj)){
+        return new ArrayList<>();
+        } else {
+        redeliveryProductRelationQueryWrapper = (QueryWrapper<RedeliveryProductRelationEntity>)redeliveryProductRelationObj;
+        if( redeliveryProductRelationQueryWrapper.getExpression().getNormal().size()>0){
+        redeliveryProductRelationNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object redeliveryOrderObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(redeliveryOrderQueryWrapper,RedeliveryOrderEntity.class,redeliveryOrderPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(redeliveryOrderObj)){
+        return new ArrayList<>();
+        } else {
+        redeliveryOrderQueryWrapper = (QueryWrapper<RedeliveryOrderEntity>)redeliveryOrderObj;
+        if( redeliveryOrderQueryWrapper.getExpression().getNormal().size()>0){
+        redeliveryOrderNum++;
+        }
+        }
+
+
+        Object redeliveryOriginalorderRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(redeliveryOriginalorderRelationQueryWrapper,RedeliveryOriginalorderRelationEntity.class,redeliveryOrderPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(redeliveryOriginalorderRelationObj)){
+        return new ArrayList<>();
+        } else {
+        redeliveryOriginalorderRelationQueryWrapper = (QueryWrapper<RedeliveryOriginalorderRelationEntity>)redeliveryOriginalorderRelationObj;
+        if( redeliveryOriginalorderRelationQueryWrapper.getExpression().getNormal().size()>0){
+        redeliveryOriginalorderRelationNum++;
+        }
+        }
+
+
+        Object redeliveryProductRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(redeliveryProductRelationQueryWrapper,RedeliveryProductRelationEntity.class,redeliveryOrderPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(redeliveryProductRelationObj)){
+        return new ArrayList<>();
+        } else {
+        redeliveryProductRelationQueryWrapper = (QueryWrapper<RedeliveryProductRelationEntity>)redeliveryProductRelationObj;
+        if( redeliveryProductRelationQueryWrapper.getExpression().getNormal().size()>0){
+        redeliveryProductRelationNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(redeliveryOrderPagination.getRedeliveryOrderCode())){
+            redeliveryOrderNum++;
+
+                String value = redeliveryOrderPagination.getRedeliveryOrderCode() instanceof List ?
+                    JsonUtil.getObjectToString(redeliveryOrderPagination.getRedeliveryOrderCode()) :
+                    String.valueOf(redeliveryOrderPagination.getRedeliveryOrderCode());
+                redeliveryOrderQueryWrapper.lambda().like(RedeliveryOrderEntity::getRedeliveryOrderCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(redeliveryOrderPagination.getPreparationTime())){
+            redeliveryOrderNum++;
+
+                List PreparationTimeList =  JsonUtil.getJsonToList(redeliveryOrderPagination.getPreparationTime(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(PreparationTimeList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(PreparationTimeList.get(1)));
+
+                    redeliveryOrderQueryWrapper.lambda().ge(RedeliveryOrderEntity::getPreparationTime, new Date(fir))
+                    .le(RedeliveryOrderEntity::getPreparationTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+        }
+            if(redeliveryOriginalorderRelationNum>0){
+            List<String> redeliveryOriginalorderRelationIdList = redeliveryOriginalorderRelationService.list(redeliveryOriginalorderRelationQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getRedeliveryOrderId())).map(t->t.getRedeliveryOrderId()).collect(Collectors.toList());
+            long count = redeliveryOriginalorderRelationService.count();
+            if (count>0){
+            intersectionList.add(redeliveryOriginalorderRelationIdList);
+            }
+            AllIdList.addAll(redeliveryOriginalorderRelationIdList);
+            }
+            total+=redeliveryOriginalorderRelationNum;
+            if(redeliveryProductRelationNum>0){
+            List<String> redeliveryProductRelationIdList = redeliveryProductRelationService.list(redeliveryProductRelationQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getRedeliveryOrderId())).map(t->t.getRedeliveryOrderId()).collect(Collectors.toList());
+            long count = redeliveryProductRelationService.count();
+            if (count>0){
+            intersectionList.add(redeliveryProductRelationIdList);
+            }
+            AllIdList.addAll(redeliveryProductRelationIdList);
+            }
+            total+=redeliveryProductRelationNum;
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            redeliveryOrderQueryWrapper.lambda().in(RedeliveryOrderEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            redeliveryOrderQueryWrapper.lambda().and(t->t.in(RedeliveryOrderEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            redeliveryOrderQueryWrapper.lambda().and(t->t.in(RedeliveryOrderEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        redeliveryOrderQueryWrapper.lambda().isNull(RedeliveryOrderEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(redeliveryOrderPagination.getSidx())){
+            redeliveryOrderQueryWrapper.lambda().orderByDesc(RedeliveryOrderEntity::getId);
+        }else{
+            try {
+                String sidx = redeliveryOrderPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                RedeliveryOrderEntity redeliveryOrderEntity = new RedeliveryOrderEntity();
+                Field declaredField = redeliveryOrderEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                redeliveryOrderQueryWrapper="asc".equals(redeliveryOrderPagination.getSort().toLowerCase())?redeliveryOrderQueryWrapper.orderByAsc(value):redeliveryOrderQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<RedeliveryOrderEntity> page=new Page<>(redeliveryOrderPagination.getCurrentPage(), redeliveryOrderPagination.getPageSize());
+                IPage<RedeliveryOrderEntity> userIPage=this.page(page, redeliveryOrderQueryWrapper);
+                return redeliveryOrderPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<RedeliveryOrderEntity> list = new ArrayList();
+                return redeliveryOrderPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(redeliveryOrderQueryWrapper);
+        }
+    }
+    @Override
+    public RedeliveryOrderEntity getInfo(String id){
+        QueryWrapper<RedeliveryOrderEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(RedeliveryOrderEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(RedeliveryOrderEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, RedeliveryOrderEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(RedeliveryOrderEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** RedeliveryOriginalorderRelation子表方法 */
+    @Override
+    public List<RedeliveryOriginalorderRelationEntity> getRedeliveryOriginalorderRelationList(String id,RedeliveryOrderPagination redeliveryOrderPagination){
+        Map<String, Object> newtabMap=RedeliveryOrderConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="redeliveryOriginalorderRelation";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<RedeliveryOriginalorderRelationEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = redeliveryOriginalorderRelationService.getChild(redeliveryOrderPagination,queryWrapper);
+        queryWrapper.lambda().eq(RedeliveryOriginalorderRelationEntity::getRedeliveryOrderId, id);
+        generaterSwapUtil.wrapperHandle(RedeliveryOrderConstant.getColumnData(), RedeliveryOrderConstant.getAppColumnData(), queryWrapper,RedeliveryOriginalorderRelationEntity.class,"sub",tableName);
+        return redeliveryOriginalorderRelationService.list(queryWrapper);
+    }
+
+    /** RedeliveryOriginalorderRelation子表方法 */
+    @Override
+    public List<RedeliveryOriginalorderRelationEntity> getRedeliveryOriginalorderRelationList(String id){
+        QueryWrapper<RedeliveryOriginalorderRelationEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(RedeliveryOriginalorderRelationEntity::getRedeliveryOrderId, id);
+        return redeliveryOriginalorderRelationService.list(queryWrapper);
+    }
+    /** RedeliveryProductRelation子表方法 */
+    @Override
+    public List<RedeliveryProductRelationEntity> getRedeliveryProductRelationList(String id,RedeliveryOrderPagination redeliveryOrderPagination){
+        Map<String, Object> newtabMap=RedeliveryOrderConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="redeliveryProductRelation";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<RedeliveryProductRelationEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = redeliveryProductRelationService.getChild(redeliveryOrderPagination,queryWrapper);
+        queryWrapper.lambda().eq(RedeliveryProductRelationEntity::getRedeliveryOrderId, id);
+        generaterSwapUtil.wrapperHandle(RedeliveryOrderConstant.getColumnData(), RedeliveryOrderConstant.getAppColumnData(), queryWrapper,RedeliveryProductRelationEntity.class,"sub",tableName);
+        return redeliveryProductRelationService.list(queryWrapper);
+    }
+
+    /** RedeliveryProductRelation子表方法 */
+    @Override
+    public List<RedeliveryProductRelationEntity> getRedeliveryProductRelationList(String id){
+        QueryWrapper<RedeliveryProductRelationEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(RedeliveryProductRelationEntity::getRedeliveryOrderId, id);
+        return redeliveryProductRelationService.list(queryWrapper);
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(RedeliveryOrderForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        //子表字段验证
+            if (form.getRedeliveryOriginalorderRelationList()!=null){
+            }
+            if (form.getRedeliveryProductRelationList()!=null){
+            }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param redeliveryOrderForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(RedeliveryOrderForm redeliveryOrderForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        redeliveryOrderForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(RedeliveryOrderConstant.getFormData(),redeliveryOrderForm),RedeliveryOrderForm.class);
+        RedeliveryOrderEntity entity = JsonUtil.getJsonToBean(redeliveryOrderForm, RedeliveryOrderEntity.class);
+
+        if(isSave){
+            String mainId = id ;
+        entity.setRedeliveryOrderCode(generaterSwapUtil.getBillNumber("redeliveryOrder", false));
+            entity.setId(mainId);
+            entity.setFlowId(redeliveryOrderForm.getFlowId());
+            entity.setVersion(0);
+        }else{
+        entity.setRedeliveryOrderCode(generaterSwapUtil.getBillNumber("redeliveryOrder", false));
+            entity.setFlowId(redeliveryOrderForm.getFlowId());
+        }
+        this.saveOrUpdate(entity);
+
+        //RedeliveryOriginalorderRelation子表数据新增修改
+        if(!isSave){
+            QueryWrapper<RedeliveryOriginalorderRelationEntity> RedeliveryOriginalorderRelationqueryWrapper = new QueryWrapper<>();
+            RedeliveryOriginalorderRelationqueryWrapper.lambda().eq(RedeliveryOriginalorderRelationEntity::getRedeliveryOrderId, entity.getId());
+            redeliveryOriginalorderRelationService.remove(RedeliveryOriginalorderRelationqueryWrapper);
+        }
+        if (redeliveryOrderForm.getRedeliveryOriginalorderRelationList()!=null){
+            List<RedeliveryOriginalorderRelationEntity> tableField106 = JsonUtil.getJsonToList(redeliveryOrderForm.getRedeliveryOriginalorderRelationList(),RedeliveryOriginalorderRelationEntity.class);
+            for(RedeliveryOriginalorderRelationEntity entitys : tableField106){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setRedeliveryOrderId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                redeliveryOriginalorderRelationService.saveOrUpdate(entitys);
+            }
+        }
+        //RedeliveryProductRelation子表数据新增修改
+        if(!isSave){
+            QueryWrapper<RedeliveryProductRelationEntity> RedeliveryProductRelationqueryWrapper = new QueryWrapper<>();
+            RedeliveryProductRelationqueryWrapper.lambda().eq(RedeliveryProductRelationEntity::getRedeliveryOrderId, entity.getId());
+            redeliveryProductRelationService.remove(RedeliveryProductRelationqueryWrapper);
+        }
+        if (redeliveryOrderForm.getRedeliveryProductRelationList()!=null){
+            List<RedeliveryProductRelationEntity> tableField118 = JsonUtil.getJsonToList(redeliveryOrderForm.getRedeliveryProductRelationList(),RedeliveryProductRelationEntity.class);
+            for(RedeliveryProductRelationEntity entitys : tableField118){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setRedeliveryOrderId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                redeliveryProductRelationService.saveOrUpdate(entitys);
+            }
+        }
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RedeliveryOriginalorderRelationServiceImpl.java

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.RedeliveryOriginalorderRelationMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.redeliveryorder.*;
+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;
+/**
+ *
+ * redeliveryOrder
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-05
+ */
+@Service
+public class RedeliveryOriginalorderRelationServiceImpl extends ServiceImpl<RedeliveryOriginalorderRelationMapper, RedeliveryOriginalorderRelationEntity> implements RedeliveryOriginalorderRelationService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<RedeliveryOriginalorderRelationEntity> getChild(RedeliveryOrderPagination pagination, QueryWrapper<RedeliveryOriginalorderRelationEntity> redeliveryOriginalorderRelationQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?RedeliveryOrderConstant.getColumnData():RedeliveryOrderConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return redeliveryOriginalorderRelationQueryWrapper;
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RedeliveryProductRelationServiceImpl.java

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.RedeliveryProductRelationMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.redeliveryorder.*;
+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;
+/**
+ *
+ * redeliveryOrder
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-05
+ */
+@Service
+public class RedeliveryProductRelationServiceImpl extends ServiceImpl<RedeliveryProductRelationMapper, RedeliveryProductRelationEntity> implements RedeliveryProductRelationService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<RedeliveryProductRelationEntity> getChild(RedeliveryOrderPagination pagination, QueryWrapper<RedeliveryProductRelationEntity> redeliveryProductRelationQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?RedeliveryOrderConstant.getColumnData():RedeliveryOrderConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return redeliveryProductRelationQueryWrapper;
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java

@@ -236,6 +236,16 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
             }
 
+            if(ObjectUtil.isNotEmpty(voucherPagination.getVoucherStatus())){
+                voucherNum++;
+
+                String value = voucherPagination.getVoucherStatus() instanceof List ?
+                        JsonUtil.getObjectToString(voucherPagination.getVoucherStatus()) :
+                        String.valueOf(voucherPagination.getVoucherStatus());
+                voucherQueryWrapper.lambda().like(VoucherEntity::getVoucherStatus,value);
+
+            }
+
             if(ObjectUtil.isNotEmpty(voucherPagination.getVoucherCode())){
             voucherNum++;
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RedeliveryOrderController.java

@@ -0,0 +1,480 @@
+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.redeliveryorder.*;
+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;
+
+/**
+ * redeliveryOrder
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-05
+ */
+@Slf4j
+@RestController
+@Tag(name = "redeliveryOrder" , description = "scm")
+@RequestMapping("/api/scm/RedeliveryOrder")
+public class RedeliveryOrderController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private RedeliveryOrderService redeliveryOrderService;
+
+    @Autowired
+    private RedeliveryOriginalorderRelationService redeliveryOriginalorderRelationService;
+    @Autowired
+    private RedeliveryProductRelationService redeliveryProductRelationService;
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param redeliveryOrderPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody RedeliveryOrderPagination redeliveryOrderPagination)throws IOException{
+        List<RedeliveryOrderEntity> list= redeliveryOrderService.getList(redeliveryOrderPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (RedeliveryOrderEntity entity : list) {
+        Map<String, Object> redeliveryOrderMap=JsonUtil.entityToMap(entity);
+        redeliveryOrderMap.put("id", redeliveryOrderMap.get("id"));
+        //副表数据
+        //子表数据
+        List<RedeliveryOriginalorderRelationEntity> redeliveryOriginalorderRelationList = redeliveryOrderService.getRedeliveryOriginalorderRelationList(entity.getId(),redeliveryOrderPagination);
+        redeliveryOrderMap.put("tableField106",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryOriginalorderRelationList)));
+        List<RedeliveryProductRelationEntity> redeliveryProductRelationList = redeliveryOrderService.getRedeliveryProductRelationList(entity.getId(),redeliveryOrderPagination);
+        redeliveryOrderMap.put("tableField118",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryProductRelationList)));
+            realList.add(redeliveryOrderMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, RedeliveryOrderConstant.getFormData(), RedeliveryOrderConstant.getColumnData(), redeliveryOrderPagination.getModuleId(),false);
+
+        //流程状态添加
+        for(Map<String, Object> vo:realList){
+            FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(String.valueOf(vo.get("id")), FlowTaskEntity::getStatus);
+            if (flowTaskEntity!=null){
+                vo.put("flowState",flowTaskEntity.getStatus());
+            }else{
+                vo.put("flowState",null);
+            }
+            //添加流程id
+            String flowId="";
+            if(vo.get("flowid")!=null){
+                flowId = String.valueOf(vo.get("flowid"));
+            }
+            if(vo.get("flowid".toUpperCase())!=null){
+                flowId = String.valueOf(vo.get("flowid".toUpperCase()));
+            }
+            if(StringUtil.isNotEmpty(flowId)){
+                vo.put("flowId" ,flowId);
+            }
+        }
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(redeliveryOrderPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param redeliveryOrderForm
+    * @return
+    */
+    @PostMapping("/{id}")
+    @Operation(summary = "创建")
+    public ActionResult create(@PathVariable("id") String id, @RequestBody @Valid RedeliveryOrderForm redeliveryOrderForm) {
+        String b = redeliveryOrderService.checkForm(redeliveryOrderForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            redeliveryOrderService.saveOrUpdate(redeliveryOrderForm, id ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody RedeliveryOrderPagination redeliveryOrderPagination) throws IOException {
+        if (StringUtil.isEmpty(redeliveryOrderPagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<RedeliveryOrderEntity> list= redeliveryOrderService.getList(redeliveryOrderPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (RedeliveryOrderEntity entity : list) {
+        Map<String, Object> redeliveryOrderMap=JsonUtil.entityToMap(entity);
+        redeliveryOrderMap.put("id", redeliveryOrderMap.get("id"));
+        //副表数据
+        //子表数据
+        List<RedeliveryOriginalorderRelationEntity> redeliveryOriginalorderRelationList = redeliveryOrderService.getRedeliveryOriginalorderRelationList(entity.getId(),redeliveryOrderPagination);
+        redeliveryOrderMap.put("tableField106",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryOriginalorderRelationList)));
+        List<RedeliveryProductRelationEntity> redeliveryProductRelationList = redeliveryOrderService.getRedeliveryProductRelationList(entity.getId(),redeliveryOrderPagination);
+        redeliveryOrderMap.put("tableField118",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryProductRelationList)));
+            realList.add(redeliveryOrderMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, RedeliveryOrderConstant.getFormData(), RedeliveryOrderConstant.getColumnData(), redeliveryOrderPagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(redeliveryOrderPagination.getSelectKey())?redeliveryOrderPagination.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 tableField106ExcelEntity = new ExcelExportEntity("","tableField106");
+            List<ExcelExportEntity> tableField106List = new ArrayList<>();
+            ExcelExportEntity tableField118ExcelEntity = new ExcelExportEntity("","tableField118");
+            List<ExcelExportEntity> tableField118List = new ArrayList<>();
+            for(String key:keys){
+                switch(key){
+                    case "redeliveryOrderCode" :
+                    entitys.add(new ExcelExportEntity("补送订单编号" ,"redeliveryOrderCode"));
+                    break;
+                    case "preparationTime" :
+                    entitys.add(new ExcelExportEntity("制单时间" ,"preparationTime"));
+                    break;
+                    case "remake" :
+                    entitys.add(new ExcelExportEntity("备注" ,"remake"));
+                    break;
+                    case "tableField106-businessOrderCode":
+                    tableField106List.add(new ExcelExportEntity("单据编号" ,"businessOrderCode"));
+                    break;
+                    case "tableField106-customName":
+                    tableField106List.add(new ExcelExportEntity("客户名称" ,"customName"));
+                    break;
+                    case "tableField106-deliveryWarehouse":
+                    tableField106List.add(new ExcelExportEntity("发货仓库" ,"deliveryWarehouse"));
+                    break;
+                    case "tableField106-productName":
+                    tableField106List.add(new ExcelExportEntity("商品名称" ,"productName"));
+                    break;
+                    case "tableField106-saleUnit":
+                    tableField106List.add(new ExcelExportEntity("销售单位" ,"saleUnit"));
+                    break;
+                    case "tableField106-saleNum":
+                    tableField106List.add(new ExcelExportEntity("销售数量" ,"saleNum"));
+                    break;
+                    case "tableField106-planDeliveryNum":
+                    tableField106List.add(new ExcelExportEntity("计划发货数量" ,"planDeliveryNum"));
+                    break;
+                    case "tableField106-shortageNum":
+                    tableField106List.add(new ExcelExportEntity("缺货数量" ,"shortageNum"));
+                    break;
+                    case "tableField106-reserveTime":
+                    tableField106List.add(new ExcelExportEntity("订货时间" ,"reserveTime"));
+                    break;
+                    case "tableField118-productName":
+                    tableField118List.add(new ExcelExportEntity("商品名称" ,"productName"));
+                    break;
+                    case "tableField118-deliveryWarehouse":
+                    tableField118List.add(new ExcelExportEntity("发货仓库" ,"deliveryWarehouse"));
+                    break;
+                    case "tableField118-customName":
+                    tableField118List.add(new ExcelExportEntity("客户名称" ,"customName"));
+                    break;
+                    case "tableField118-spec":
+                    tableField118List.add(new ExcelExportEntity("规格" ,"spec"));
+                    break;
+                    case "tableField118-inventoryUnit":
+                    tableField118List.add(new ExcelExportEntity("库存单位" ,"inventoryUnit"));
+                    break;
+                    case "tableField118-saleUnit":
+                    tableField118List.add(new ExcelExportEntity("销售单位" ,"saleUnit"));
+                    break;
+                    case "tableField118-oldSaleNum":
+                    tableField118List.add(new ExcelExportEntity("原销售数量" ,"oldSaleNum"));
+                    break;
+                    case "tableField118-oldExpectArriveTimeStart":
+                    tableField118List.add(new ExcelExportEntity("原期望送达时间开始" ,"oldExpectArriveTimeStart"));
+                    break;
+                    case "tableField118-newSaleNum":
+                    tableField118List.add(new ExcelExportEntity("新销售数量" ,"newSaleNum"));
+                    break;
+                    case "tableField118-newExpectArriveTimeStart":
+                    tableField118List.add(new ExcelExportEntity("新期望送达时间开始" ,"newExpectArriveTimeStart"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+            if(tableField106List.size() > 0){
+                tableField106ExcelEntity.setList(tableField106List);
+                entitys.add(tableField106ExcelEntity);
+            }
+            if(tableField118List.size() > 0){
+                tableField118ExcelEntity.setList(tableField118List);
+                entitys.add(tableField118ExcelEntity);
+            }
+        }
+
+        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(RedeliveryOrderConstant.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 ids
+    * @return
+    */
+    @DeleteMapping("/batchRemove")
+    @Transactional
+    @Operation(summary = "批量删除")
+    public ActionResult batchRemove(@RequestBody String ids){
+    List<String> idList = JsonUtil.getJsonToList(ids, String.class);
+    List<String> columnIdList = new ArrayList<>(20);
+    int i =0;
+    String errInfo = "";
+    for (String allId : idList){
+        FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(allId, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
+        if (taskEntity==null){
+            columnIdList.add(allId);
+            this.delete(allId);
+        }else if (taskEntity.getStatus().equals(0) || taskEntity.getStatus().equals(4)){
+            try {
+                generaterSwapUtil.deleteFlowTask(taskEntity);
+                columnIdList.add(allId);
+                this.delete(allId);
+                i++;
+            } catch (WorkFlowException e) {
+                errInfo = e.getMessage();
+                e.printStackTrace();
+            }
+        }
+    }
+    if (i == 0 && columnIdList.size()==0){
+        return ActionResult.fail("流程已发起，无法删除");
+    }
+    if (StringUtil.isNotEmpty(errInfo)){
+        return ActionResult.fail(errInfo);
+    }
+    return ActionResult.success("删除成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param redeliveryOrderForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RedeliveryOrderForm redeliveryOrderForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        redeliveryOrderForm.setId(id);
+        if (!isImport) {
+            String b =  redeliveryOrderService.checkForm(redeliveryOrderForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        RedeliveryOrderEntity entity= redeliveryOrderService.getInfo(id);
+        if(entity!=null){
+            try{
+                redeliveryOrderService.saveOrUpdate(redeliveryOrderForm,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){
+        RedeliveryOrderEntity entity= redeliveryOrderService.getInfo(id);
+        if(entity!=null){
+            FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(id, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
+            if (taskEntity != null) {
+                try {
+                    generaterSwapUtil.deleteFlowTask(taskEntity);
+                } catch (WorkFlowException e) {
+                    e.printStackTrace();
+                }
+            }
+            //假删除
+            entity.setDeleteMark(1);
+            redeliveryOrderService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        RedeliveryOrderEntity entity= redeliveryOrderService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> redeliveryOrderMap=JsonUtil.entityToMap(entity);
+        redeliveryOrderMap.put("id", redeliveryOrderMap.get("id"));
+        //副表数据
+        //子表数据
+        List<RedeliveryOriginalorderRelationEntity> redeliveryOriginalorderRelationList = redeliveryOrderService.getRedeliveryOriginalorderRelationList(entity.getId());
+        redeliveryOrderMap.put("tableField106",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryOriginalorderRelationList)));
+        List<RedeliveryProductRelationEntity> redeliveryProductRelationList = redeliveryOrderService.getRedeliveryProductRelationList(entity.getId());
+        redeliveryOrderMap.put("tableField118",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryProductRelationList)));
+        redeliveryOrderMap = generaterSwapUtil.swapDataDetail(redeliveryOrderMap,RedeliveryOrderConstant.getFormData(),"524130475623583109",false);
+        return ActionResult.success(redeliveryOrderMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        RedeliveryOrderEntity entity= redeliveryOrderService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> redeliveryOrderMap=JsonUtil.entityToMap(entity);
+        redeliveryOrderMap.put("id", redeliveryOrderMap.get("id"));
+        //副表数据
+        //子表数据
+        List<RedeliveryOriginalorderRelationEntity> redeliveryOriginalorderRelationList = redeliveryOrderService.getRedeliveryOriginalorderRelationList(entity.getId());
+        redeliveryOrderMap.put("redeliveryOriginalorderRelationList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryOriginalorderRelationList)));
+        List<RedeliveryProductRelationEntity> redeliveryProductRelationList = redeliveryOrderService.getRedeliveryProductRelationList(entity.getId());
+        redeliveryOrderMap.put("redeliveryProductRelationList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(redeliveryProductRelationList)));
+        redeliveryOrderMap = generaterSwapUtil.swapDataForm(redeliveryOrderMap,RedeliveryOrderConstant.getFormData(),RedeliveryOrderConstant.TABLEFIELDKEY,RedeliveryOrderConstant.TABLERENAMES);
+        return ActionResult.success(redeliveryOrderMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOrderEntity.java

@@ -0,0 +1,53 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 补送订单表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-05
+ */
+@Data
+@TableName("jg_redelivery_order")
+public class RedeliveryOrderEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "REDELIVERY_ORDER_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String redeliveryOrderCode;
+    @TableField(value = "PREPARATION_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date preparationTime;
+    @TableField("ORIGINAL_SALE_ORDER_ID")
+    private String originalSaleOrderId;
+    @TableField(value = "REMAKE" , updateStrategy = FieldStrategy.IGNORED)
+    private String remake;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("COMPANY_ID")
+    private String companyId;
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+    @TableField("F_FLOW_TASK_ID")
+    private String flowTaskId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOriginalorderRelationEntity.java

@@ -0,0 +1,57 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 补送订单与原订单关系表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-05
+ */
+@Data
+@TableName("jg_redelivery_originalorder_relation")
+public class RedeliveryOriginalorderRelationEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("REDELIVERY_ORDER_ID")
+    private String redeliveryOrderId;
+    @TableField("BUSINESS_ORDER_ID")
+    private String businessOrderId;
+    @TableField(value = "BUSINESS_ORDER_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String businessOrderCode;
+    @TableField(value = "CUSTOM_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String customName;
+    @TableField(value = "DELIVERY_WAREHOUSE" , updateStrategy = FieldStrategy.IGNORED)
+    private String deliveryWarehouse;
+    @TableField(value = "PRODUCT_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String productName;
+    @TableField(value = "SALE_UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String saleUnit;
+    @TableField(value = "SALE_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private Long saleNum;
+    @TableField(value = "PLAN_DELIVERY_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private Long planDeliveryNum;
+    @TableField(value = "SHORTAGE_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private Long shortageNum;
+    @TableField(value = "RESERVE_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date reserveTime;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryProductRelationEntity.java

@@ -0,0 +1,65 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 补送订单与商品关系表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-05
+ */
+@Data
+@TableName("jg_redelivery_product_relation")
+public class RedeliveryProductRelationEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("REDELIVERY_ORDER_ID")
+    private String redeliveryOrderId;
+    @TableField("PRODUCT_ID")
+    private String productId;
+    @TableField(value = "PRODUCT_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String productName;
+    @TableField(value = "DELIVERY_WAREHOUSE" , updateStrategy = FieldStrategy.IGNORED)
+    private String deliveryWarehouse;
+    @TableField(value = "CUSTOM_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String customName;
+    @TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED)
+    private String spec;
+    @TableField(value = "INVENTORY_UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String inventoryUnit;
+    @TableField(value = "SALE_UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String saleUnit;
+    @TableField(value = "OLD_SALE_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private Long oldSaleNum;
+    @TableField(value = "OLD_EXPECT_ARRIVE_TIME_START" , updateStrategy = FieldStrategy.IGNORED)
+    private Date oldExpectArriveTimeStart;
+    @TableField("OLD_EXPECT_ARRIVE_TIME_END")
+    private Date oldExpectArriveTimeEnd;
+    @TableField(value = "NEW_SALE_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private Long newSaleNum;
+    @TableField(value = "NEW_EXPECT_ARRIVE_TIME_START" , updateStrategy = FieldStrategy.IGNORED)
+    private Date newExpectArriveTimeStart;
+    @TableField("NEW_EXPECT_ARRIVE_TIME_END")
+    private Date newExpectArriveTimeEnd;
+    @TableField("REMAKE")
+    private String remake;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/redeliveryorder/RedeliveryOrderForm.java

@@ -0,0 +1,41 @@
+package jnpf.model.redeliveryorder;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * redeliveryOrder
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-05
+ */
+@Data
+public class RedeliveryOrderForm  {
+    /** 主键 */
+    private String id;
+    /** 子表数据 **/
+    @JsonProperty("redeliveryOriginalorderRelationList")
+    private List<RedeliveryOriginalorderRelationModel> redeliveryOriginalorderRelationList;
+    /** 子表数据 **/
+    @JsonProperty("redeliveryProductRelationList")
+    private List<RedeliveryProductRelationModel> redeliveryProductRelationList;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+    /** 流程id **/
+    @JsonProperty("flowId")
+    private String flowId;
+
+    /** 补送订单编号 **/
+    @JsonProperty("redeliveryOrderCode")
+    private String redeliveryOrderCode;
+    /** 制单时间 **/
+    @JsonProperty("preparationTime")
+    private String preparationTime;
+    /** 备注 **/
+    @JsonProperty("remake")
+    private String remake;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/redeliveryorder/RedeliveryOrderPagination.java

@@ -0,0 +1,36 @@
+package jnpf.model.redeliveryorder;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * redeliveryOrder
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-05
+ */
+@Data
+public class RedeliveryOrderPagination 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("redeliveryOrderCode")
+    private Object redeliveryOrderCode;
+    /** 制单时间 */
+    @JsonProperty("preparationTime")
+    private Object preparationTime;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/redeliveryorder/RedeliveryOriginalorderRelationModel.java

@@ -0,0 +1,49 @@
+package jnpf.model.redeliveryorder;
+
+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;
+
+/**
+ *
+ * redeliveryOrder
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-05
+ */
+@Data
+public class RedeliveryOriginalorderRelationModel  {
+    /** 单据编号 **/
+    @JSONField(name = "businessOrderCode")
+    private String businessOrderCode;
+    /** 客户名称 **/
+    @JSONField(name = "customName")
+    private String customName;
+    /** 发货仓库 **/
+    @JSONField(name = "deliveryWarehouse")
+    private String deliveryWarehouse;
+    /** 商品名称 **/
+    @JSONField(name = "productName")
+    private String productName;
+    /** 销售单位 **/
+    @JSONField(name = "saleUnit")
+    private String saleUnit;
+    /** 销售数量 **/
+    @JSONField(name = "saleNum")
+    private String saleNum;
+    /** 计划发货数量 **/
+    @JSONField(name = "planDeliveryNum")
+    private String planDeliveryNum;
+    /** 缺货数量 **/
+    @JSONField(name = "shortageNum")
+    private String shortageNum;
+    /** 订货时间 **/
+    @JSONField(name = "reserveTime")
+    private Long reserveTime;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/redeliveryorder/RedeliveryProductRelationModel.java

@@ -0,0 +1,53 @@
+package jnpf.model.redeliveryorder;
+
+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;
+
+/**
+ *
+ * redeliveryOrder
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-05
+ */
+@Data
+public class RedeliveryProductRelationModel  {
+    /** 商品名称 **/
+    @JSONField(name = "productName")
+    private String productName;
+    /** 发货仓库 **/
+    @JSONField(name = "deliveryWarehouse")
+    private String deliveryWarehouse;
+    /** 客户名称 **/
+    @JSONField(name = "customName")
+    private String customName;
+    /** 规格 **/
+    @JSONField(name = "spec")
+    private String spec;
+    /** 库存单位 **/
+    @JSONField(name = "inventoryUnit")
+    private String inventoryUnit;
+    /** 销售单位 **/
+    @JSONField(name = "saleUnit")
+    private String saleUnit;
+    /** 原销售数量 **/
+    @JSONField(name = "oldSaleNum")
+    private String oldSaleNum;
+    /** 原期望送达时间开始 **/
+    @JSONField(name = "oldExpectArriveTimeStart")
+    private Object oldExpectArriveTimeStart;
+
+    /** 新销售数量 **/
+    @JSONField(name = "newSaleNum")
+    private String newSaleNum;
+    /** 新期望送达时间开始 **/
+    @JSONField(name = "newExpectArriveTimeStart")
+    private Object newExpectArriveTimeStart;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java

@@ -113,4 +113,7 @@ public class VoucherForm  {
     /** 关联单据号 **/
     @JsonProperty("associatedDocumentNo")
     private String associatedDocumentNo;
+    /** 单据来源 **/
+    @JsonProperty("voucherSource")
+    private Object voucherSource;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java

@@ -42,4 +42,7 @@ public class VoucherPagination extends Pagination {
     /** -商品名称 */
     @JsonProperty("tableField111_productId")
     private Object tableField111_productId;
+    /** 凭证状态 */
+    @JsonProperty("voucherStatus")
+    private Object voucherStatus;
 }

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue

@@ -309,16 +309,18 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8" v-if="judgeShow('vehiclePictures')">
+          <el-row>
+            <el-col :span="6" v-if="judgeShow('vehiclePictures')">
               <jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')"
                 prop="vehiclePictures">
                 <JnpfUploadImg v-model="dataForm.vehiclePictures"
-                @change="changeData('vehiclePictures',-1)" :disabled="judgeWrite('vehiclePictures')"
-                :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                  @change="changeData('vehiclePictures',-1)"
+                  :disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB" :limit="9"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('vehiclePictures1')">
+            <el-col :span="6" v-if="judgeShow('vehiclePictures1')">
               <jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')"
                 prop="vehiclePictures1">
                 <JnpfUploadImg v-model="dataForm.vehiclePictures1"
@@ -328,7 +330,7 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('vehiclePictures2')">
+            <el-col :span="6" v-if="judgeShow('vehiclePictures2')">
               <jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')"
                 prop="vehiclePictures2">
                 <JnpfUploadImg v-model="dataForm.vehiclePictures2"
@@ -338,7 +340,10 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('driverPictures')">
+            <el-col :span="6"></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6" v-if="judgeShow('driverPictures')">
               <jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')"
                 prop="driverPictures">
                 <JnpfUploadImg v-model="dataForm.driverPictures"
@@ -347,25 +352,30 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('driverPictures1')">
+            <el-col :span="6" v-if="judgeShow('driverPictures1')">
               <jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')"
                 prop="driverPictures1">
                 <JnpfUploadImg v-model="dataForm.driverPictures1"
-                @change="changeData('driverPictures1',-1)" :disabled="judgeWrite('driverPictures1')"
-                :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                  @change="changeData('driverPictures1',-1)"
+                  :disabled="judgeWrite('driverPictures1')" :fileSize="10" sizeUnit="MB" :limit="9"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('driverPictures2')">
+            <el-col :span="6" v-if="judgeShow('driverPictures2')">
               <jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')"
                 prop="driverPictures2">
                 <JnpfUploadImg v-model="dataForm.driverPictures2"
-                @change="changeData('driverPictures2',-1)" :disabled="judgeWrite('driverPictures2')"
-                :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                  @change="changeData('driverPictures2',-1)"
+                  :disabled="judgeWrite('driverPictures2')" :fileSize="10" sizeUnit="MB" :limit="9"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('weighPictures')">
+            <el-col :span="6"></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6" v-if="judgeShow('weighPictures')">
               <jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')"
                 prop="weighPictures">
                 <JnpfUploadImg v-model="dataForm.weighPictures"
@@ -374,7 +384,7 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('weighPictures1')">
+            <el-col :span="6" v-if="judgeShow('weighPictures1')">
               <jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')"
                 prop="weighPictures1">
                 <JnpfUploadImg v-model="dataForm.weighPictures1"
@@ -383,7 +393,7 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('weighPictures2')">
+            <el-col :span="6" v-if="judgeShow('weighPictures2')">
               <jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')"
                 prop="weighPictures2">
                 <JnpfUploadImg v-model="dataForm.weighPictures2"
@@ -392,7 +402,7 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
-          <el-col :span="8" v-if="judgeShow('weighPictures3')">
+            <el-col :span="6" v-if="judgeShow('weighPictures3')">
               <jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')"
                 prop="weighPictures3">
                 <JnpfUploadImg v-model="dataForm.weighPictures3"
@@ -401,6 +411,7 @@
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
+          </el-row>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
@@ -618,12 +629,13 @@ export default {
         weighPictures1: [],
         weighPictures2: [],
         weighPictures3: [],
-        voucherStatus: undefined,
-        documentType: undefined,
         associatedDocumentNo: undefined,
         voucherProductList: [],
         voucherVehicleList: [],
         version: 0,
+        voucherSource: '1',
+        voucherStatus: '1',
+        documentType: '2',
       },
       tableRequiredData: {},
       dataRule:

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue

@@ -15,6 +15,13 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="凭证状态">
+              <JnpfSelect v-model="query.voucherStatus" placeholder="请选择" clearable
+                :options="voucherStatusOptions" :props="voucherStatusProps" multiple>
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
               <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/form.vue

@@ -0,0 +1,740 @@
+
+
+
+
+    <template>
+    <div :style="{margin: '0 auto',width:'100%'}">
+    <el-row :gutter="15" class="">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"  :disabled="setting.readonly" >
+    <template v-if="!loading && formOperates">
+        <!-- 具体表单 -->
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="基础信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="12"  v-if="judgeShow('redeliveryOrderCode')" >
+        <jnpf-form-tip-item
+ label="补送订单编号"  v-if="judgeShow('redeliveryOrderCode')"   prop="redeliveryOrderCode" >
+        <JnpfInput   v-model="dataForm.redeliveryOrderCode" @change="changeData('redeliveryOrderCode',-1)" 
+ placeholder="系统自动生成"  :disabled="judgeWrite('redeliveryOrderCode')"  readonly  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="12"  v-if="judgeShow('preparationTime')" >
+        <jnpf-form-tip-item
+ label="制单时间"  v-if="judgeShow('preparationTime')"   prop="preparationTime" >
+        <JnpfDatePicker   v-model="dataForm.preparationTime" @change="changeData('preparationTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  :disabled="judgeWrite('preparationTime')"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('remake')" >
+        <jnpf-form-tip-item
+ label="备注"  v-if="judgeShow('remake')"   prop="remake" >
+        <JnpfTextarea   v-model="dataForm.remake" @change="changeData('remake',-1)" 
+ placeholder="请输入"  :disabled="judgeWrite('remake')"  :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>
+                    <JnpfGroupTitle 
+ content="原订单信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="24"   v-if="judgeShow('-${html.relationField}')" >
+            <jnpf-form-tip-item label-width="0">
+                    <div class="JNPF-common-title">
+                        <h2></h2>
+                    </div>
+                <el-table :data="dataForm.redeliveryoriginalorderrelationList" size='mini' >
+                    <el-table-column type="index" width="50" label="序号" align="center" />
+        <el-table-column
+ label="单据编号"  v-if="judgeShow('redeliveryoriginalorderrelation-businessOrderCode')"   prop="businessOrderCode" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-businessOrderCode')" >*</span>单据编号
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.businessOrderCode" @change="changeData('redeliveryoriginalorderrelation-businessOrderCode',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-businessOrderCode')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="客户名称"  v-if="judgeShow('redeliveryoriginalorderrelation-customName')"   prop="customName" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-customName')" >*</span>客户名称
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.customName" @change="changeData('redeliveryoriginalorderrelation-customName',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-customName')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="发货仓库"  v-if="judgeShow('redeliveryoriginalorderrelation-deliveryWarehouse')"   prop="deliveryWarehouse" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-deliveryWarehouse')" >*</span>发货仓库
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.deliveryWarehouse" @change="changeData('redeliveryoriginalorderrelation-deliveryWarehouse',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-deliveryWarehouse')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="商品名称"  v-if="judgeShow('redeliveryoriginalorderrelation-productName')"   prop="productName" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-productName')" >*</span>商品名称
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.productName" @change="changeData('redeliveryoriginalorderrelation-productName',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-productName')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="销售单位"  v-if="judgeShow('redeliveryoriginalorderrelation-saleUnit')"   prop="saleUnit" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-saleUnit')" >*</span>销售单位
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.saleUnit" @change="changeData('redeliveryoriginalorderrelation-saleUnit',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-saleUnit')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="销售数量"  v-if="judgeShow('redeliveryoriginalorderrelation-saleNum')"   prop="saleNum" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-saleNum')" >*</span>销售数量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.saleNum" @change="changeData('redeliveryoriginalorderrelation-saleNum',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-saleNum')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="计划发货数量"  v-if="judgeShow('redeliveryoriginalorderrelation-planDeliveryNum')"   prop="planDeliveryNum" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-planDeliveryNum')" >*</span>计划发货数量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.planDeliveryNum" @change="changeData('redeliveryoriginalorderrelation-planDeliveryNum',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-planDeliveryNum')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="缺货数量"  v-if="judgeShow('redeliveryoriginalorderrelation-shortageNum')"   prop="shortageNum" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-shortageNum')" >*</span>缺货数量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.shortageNum" @change="changeData('redeliveryoriginalorderrelation-shortageNum',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-shortageNum')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+
+        <el-table-column
+ label="订货时间"  v-if="judgeShow('redeliveryoriginalorderrelation-reserveTime')"   prop="reserveTime" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryoriginalorderrelationList-reserveTime')" >*</span>订货时间
+                </template>
+        <template slot-scope="scope">
+        <JnpfDatePicker   v-model="scope.row.reserveTime" @change="changeData('redeliveryoriginalorderrelation-reserveTime',scope.$index)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  :disabled="judgeWrite('redeliveryoriginalorderrelationList')||judgeWrite('redeliveryoriginalorderrelationList-reserveTime')"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+            </template>
+    </el-table-column>
+                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('redeliveryoriginalorderrelationList')">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delredeliveryoriginalorderrelationList(scope.$index)">删除</el-button>
+                            </template>
+                        </el-table-column>
+                </el-table>
+                    <div class="table-actions" @click="addredeliveryoriginalorderrelationList()"  v-if="!judgeWrite('redeliveryoriginalorderrelationList')">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+            </jnpf-form-tip-item>
+        </el-col>
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="客户订货信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="24"   v-if="judgeShow('redeliveryoriginalorderrelation-${html.relationField}')" >
+            <jnpf-form-tip-item label-width="0">
+                    <div class="JNPF-common-title">
+                        <h2></h2>
+                    </div>
+                <el-table :data="dataForm.redeliveryproductrelationList" size='mini' >
+                    <el-table-column type="index" width="50" label="序号" align="center" />
+        <el-table-column
+ label="商品名称"  v-if="judgeShow('redeliveryproductrelation-productName')"   prop="productName" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-productName')" >*</span>商品名称
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.productName" @change="changeData('redeliveryproductrelation-productName',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-productName')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="发货仓库"  v-if="judgeShow('redeliveryproductrelation-deliveryWarehouse')"   prop="deliveryWarehouse" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-deliveryWarehouse')" >*</span>发货仓库
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.deliveryWarehouse" @change="changeData('redeliveryproductrelation-deliveryWarehouse',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-deliveryWarehouse')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="客户名称"  v-if="judgeShow('redeliveryproductrelation-customName')"   prop="customName" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-customName')" >*</span>客户名称
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.customName" @change="changeData('redeliveryproductrelation-customName',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-customName')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="规格"  v-if="judgeShow('redeliveryproductrelation-spec')"   prop="spec" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-spec')" >*</span>规格
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.spec" @change="changeData('redeliveryproductrelation-spec',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-spec')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="库存单位"  v-if="judgeShow('redeliveryproductrelation-inventoryUnit')"   prop="inventoryUnit" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-inventoryUnit')" >*</span>库存单位
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.inventoryUnit" @change="changeData('redeliveryproductrelation-inventoryUnit',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-inventoryUnit')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="销售单位"  v-if="judgeShow('redeliveryproductrelation-saleUnit')"   prop="saleUnit" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-saleUnit')" >*</span>销售单位
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.saleUnit" @change="changeData('redeliveryproductrelation-saleUnit',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-saleUnit')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="原销售数量"  v-if="judgeShow('redeliveryproductrelation-oldSaleNum')"   prop="oldSaleNum" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-oldSaleNum')" >*</span>原销售数量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.oldSaleNum" @change="changeData('redeliveryproductrelation-oldSaleNum',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-oldSaleNum')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="原期望送达时间开始"  v-if="judgeShow('redeliveryproductrelation-oldExpectArriveTimeStart')"   prop="oldExpectArriveTimeStart" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-oldExpectArriveTimeStart')" >*</span>原期望送达时间开始
+                </template>
+        <template slot-scope="scope">
+        <JnpfSelect   v-model="scope.row.oldExpectArriveTimeStart" @change="changeData('redeliveryproductrelation-oldExpectArriveTimeStart',scope.$index)" 
+ placeholder="请选择"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-oldExpectArriveTimeStart')"  clearable  :style='{"width":"100%"}' :options="redeliveryproductrelationoldExpectArriveTimeStartOptions" :props="redeliveryproductrelationoldExpectArriveTimeStartProps" >
+    </JnpfSelect>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="新销售数量"  v-if="judgeShow('redeliveryproductrelation-newSaleNum')"   prop="newSaleNum" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-newSaleNum')" >*</span>新销售数量
+                </template>
+        <template slot-scope="scope">
+        <JnpfInput   v-model="scope.row.newSaleNum" @change="changeData('redeliveryproductrelation-newSaleNum',scope.$index)" 
+ placeholder="请输入"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-newSaleNum')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+            </template>
+    </el-table-column>
+        <el-table-column
+ label="新期望送达时间开始"  v-if="judgeShow('redeliveryproductrelation-newExpectArriveTimeStart')"   prop="newExpectArriveTimeStart" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('redeliveryproductrelationList-newExpectArriveTimeStart')" >*</span>新期望送达时间开始
+                </template>
+        <template slot-scope="scope">
+        <JnpfSelect   v-model="scope.row.newExpectArriveTimeStart" @change="changeData('redeliveryproductrelation-newExpectArriveTimeStart',scope.$index)" 
+ placeholder="请选择"  :disabled="judgeWrite('redeliveryproductrelationList')||judgeWrite('redeliveryproductrelationList-newExpectArriveTimeStart')"  clearable  :style='{"width":"100%"}' :options="redeliveryproductrelationnewExpectArriveTimeStartOptions" :props="redeliveryproductrelationnewExpectArriveTimeStartProps" >
+    </JnpfSelect>
+            </template>
+    </el-table-column>
+                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('redeliveryproductrelationList')">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delredeliveryproductrelationList(scope.$index)">删除</el-button>
+                            </template>
+                        </el-table-column>
+                </el-table>
+                    <div class="table-actions" @click="addredeliveryproductrelationList()"  v-if="!judgeWrite('redeliveryproductrelationList')">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+            </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-form>
+    </el-row>
+    <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
+    </div>
+    </template>
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getFormById} from '@/api/workFlow/FormDesign'
+    import comMixin from '@/views/workFlow/workFlowForm/mixin';
+    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 {
+        mixins: [comMixin],
+        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:{
+                            redeliveryoriginalorderrelationList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
+                            redeliveryproductrelationList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+                    redeliveryoriginalorderrelationList:{
+                            businessOrderCode : '',
+                                businessOrderCodeOptions:[],
+                            customName : '',
+                                customNameOptions:[],
+                            deliveryWarehouse : '',
+                                deliveryWarehouseOptions:[],
+                            productName : '',
+                                productNameOptions:[],
+                            saleUnit : '',
+                                saleUnitOptions:[],
+                            saleNum : '',
+                                saleNumOptions:[],
+                            planDeliveryNum : '',
+                                planDeliveryNumOptions:[],
+                            shortageNum : '',
+                                shortageNumOptions:[],
+                            reserveTime : '',
+                                reserveTimeOptions:[],
+                    enabledmark:undefined
+            },
+                    redeliveryproductrelationList:{
+                            productName : '',
+                                productNameOptions:[],
+                            deliveryWarehouse : '',
+                                deliveryWarehouseOptions:[],
+                            customName : '',
+                                customNameOptions:[],
+                            spec : '',
+                                specOptions:[],
+                            inventoryUnit : '',
+                                inventoryUnitOptions:[],
+                            saleUnit : '',
+                                saleUnitOptions:[],
+                            oldSaleNum : '',
+                                oldSaleNumOptions:[],
+                                oldExpectArriveTimeStartOptions:[],
+                            newSaleNum : '',
+                                newSaleNumOptions:[],
+                                newExpectArriveTimeStartOptions:[],
+                    enabledmark:undefined
+            },
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                redeliveryOrderCode : undefined,
+                                preparationTime : undefined,
+                                remake : undefined,
+                        redeliveryoriginalorderrelationList:[],
+                        redeliveryproductrelationList:[],
+                    version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                            preparationTime: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+            },
+                                redeliveryproductrelationoldExpectArriveTimeStartOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+                                redeliveryproductrelationoldExpectArriveTimeStartProps:{"label":"fullName","value":"id"  },
+                                redeliveryproductrelationnewExpectArriveTimeStartOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+                                redeliveryproductrelationnewExpectArriveTimeStartProps:{"label":"fullName","value":"id"  },
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        redeliveryOrderCode:[] ,
+                        preparationTime:[] ,
+                        remake:[] ,
+                            redeliveryoriginalorderrelationbusinessOrderCode: [] ,
+                            redeliveryoriginalorderrelationcustomName: [] ,
+                            redeliveryoriginalorderrelationdeliveryWarehouse: [] ,
+                            redeliveryoriginalorderrelationproductName: [] ,
+                            redeliveryoriginalorderrelationsaleUnit: [] ,
+                            redeliveryoriginalorderrelationsaleNum: [] ,
+                            redeliveryoriginalorderrelationplanDeliveryNum: [] ,
+                            redeliveryoriginalorderrelationshortageNum: [] ,
+                            redeliveryoriginalorderrelationreserveTime: [] ,
+                            redeliveryproductrelationproductName: [] ,
+                            redeliveryproductrelationdeliveryWarehouse: [] ,
+                            redeliveryproductrelationcustomName: [] ,
+                            redeliveryproductrelationspec: [] ,
+                            redeliveryproductrelationinventoryUnit: [] ,
+                            redeliveryproductrelationsaleUnit: [] ,
+                            redeliveryproductrelationoldSaleNum: [] ,
+                            redeliveryproductrelationoldExpectArriveTimeStart: [] ,
+                            redeliveryproductrelationnewSaleNum: [] ,
+                            redeliveryproductrelationnewExpectArriveTimeStart: [] ,
+            },
+        }
+        },
+        computed: {
+            formOperates() {
+                return this.setting.formOperates
+            }
+        },
+        watch: {},
+        created() {
+            this.getFormById()
+            if(this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
+                this.initDefaultData()
+            }
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            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(){
+            },
+            selfGetInfo(dataForm) {
+                this.dataInfo(dataForm)
+            },
+            beforeSubmit(){
+                const _data =this.dataList()
+                return _data
+            },
+            selfInit() {
+                this.dataAll()
+            },
+            getFormById() {
+                getFormById("524130475623583109").then(res => {
+                    this.dataForm.flowId = res.data&&res.data.flowId
+                    // this.encode = res.data&&res.data.encode
+                })
+            },
+            exist() {
+                let isOk = true
+                for (let key in this.tableRequiredData) {
+                    if (this.dataForm[key] && Array.isArray(this.dataForm[key])) {
+                        for (let i = 0; i < this.dataForm[key].length; i++) {
+                            let item = this.dataForm[key][i]
+                            inner: for (let id in item) {
+                                let arr = this.tableRequiredData[key].filter(o => o.id === id) || []
+                                if (!arr.length) continue inner
+                                if (arr[0].required) {
+                                    let msg = `${arr[0].name}不能为空`
+                                    let boo = true
+                                    if (arr[0].dataType === 'array') {
+                                        boo = !this.jnpf.isEmptyArray(item[id])
+                                    } else {
+                                        boo = !this.jnpf.isEmpty(item[id])
+                                    }
+                                    if (!boo) {
+                                        this.$message({
+                                            message: msg,
+                                            type: 'error',
+                                            duration: 1000
+                                        })
+                                        isOk = false
+                                        break
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                    if (!this.redeliveryoriginalorderrelationExist()) return
+                    if (!this.redeliveryproductrelationExist()) return
+                    return isOk
+                },
+                redeliveryoriginalorderrelationExist() {
+                let isOk = true;
+            for(let i=0;i<this.dataForm.redeliveryoriginalorderrelationList.length;i++){
+                const e = this.dataForm.redeliveryoriginalorderrelationList[i];
+            }
+                return isOk;
+            },
+                redeliveryproductrelationExist() {
+                let isOk = true;
+            for(let i=0;i<this.dataForm.redeliveryproductrelationList.length;i++){
+                const e = this.dataForm.redeliveryproductrelationList[i];
+            }
+                return isOk;
+            },
+                goBack() {
+                this.$emit('refresh')
+            },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+                addredeliveryoriginalorderrelationList(){
+                let item = {
+                            businessOrderCode:undefined,
+                            customName:undefined,
+                            deliveryWarehouse:undefined,
+                            productName:undefined,
+                            saleUnit:undefined,
+                            saleNum:undefined,
+                            planDeliveryNum:undefined,
+                            shortageNum:undefined,
+                            reserveTime:undefined,
+            }
+                this.getredeliveryoriginalorderrelationList(item)
+            },
+                delredeliveryoriginalorderrelationList(index) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.dataForm.redeliveryoriginalorderrelationList.splice(index, 1);
+                }).catch(() => {
+                });
+            },
+                getredeliveryoriginalorderrelationList(value){
+                let item={...this.tableRows.redeliveryoriginalorderrelationList,...value}
+                this.dataForm.redeliveryoriginalorderrelationList.push(item)
+                this.childIndex=this.dataForm.redeliveryoriginalorderrelationList.length-1
+                this.isEdit = true
+                this.isEdit = false
+                this.childIndex = -1
+            },
+                addredeliveryproductrelationList(){
+                let item = {
+                            productName:undefined,
+                            deliveryWarehouse:undefined,
+                            customName:undefined,
+                            spec:undefined,
+                            inventoryUnit:undefined,
+                            saleUnit:undefined,
+                            oldSaleNum:undefined,
+                            oldExpectArriveTimeStart:'',
+                            newSaleNum:undefined,
+                            newExpectArriveTimeStart:'',
+            }
+                this.getredeliveryproductrelationList(item)
+            },
+                delredeliveryproductrelationList(index) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.dataForm.redeliveryproductrelationList.splice(index, 1);
+                }).catch(() => {
+                });
+            },
+                getredeliveryproductrelationList(value){
+                let item={...this.tableRows.redeliveryproductrelationList,...value}
+                this.dataForm.redeliveryproductrelationList.push(item)
+                this.childIndex=this.dataForm.redeliveryproductrelationList.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.redeliveryoriginalorderrelationList.length;i++){
+                        this.childIndex = i
+                    }
+                    for(let i=0;i<_dataAll.redeliveryproductrelationList.length;i++){
+                        this.childIndex = i
+                    }
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue

@@ -0,0 +1,650 @@
+
+
+
+
+
+
+
+<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.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" 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>
+            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'">批量删除
+            </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' has-c
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          <el-table-column prop="redeliveryOrderCode" label="补送订单编号" align="left">
+          </el-table-column>
+          <el-table-column prop="preparationTime" label="制单时间" align="left">
+          </el-table-column>
+          <el-table-column prop="remake" label="备注" align="left">
+          </el-table-column>
+          <el-table-column prop="tableField106" label="" align="center">
+            <el-table-column prop="tableField106-child-first" width="1px"
+              label-class-name="table-child-first">
+              <template slot-scope="scope" v-if="!scope.row.top">
+                <div class="child-table-column">
+                  <template v-if="!scope.row.tableField106Expand">
+                    <tr v-for="(item, index) in scope.row.tableField106.slice(0, 3)"
+                      class="child-table__row" :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.customName}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <template v-if="scope.row.tableField106Expand">
+                    <tr v-for="(item, index) in scope.row.tableField106" class="child-table__row"
+                      :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.customName}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <div class="expand-more-btn" v-if="scope.row.tableField106.length > 3">
+                    <el-button v-if="scope.row.tableField106Expand" type="text"
+                      @click="scope.row.tableField106Expand=!scope.row.tableField106Expand">隐藏部分</el-button>
+                    <el-button v-if="!scope.row.tableField106Expand" type="text"
+                      @click="scope.row.tableField106Expand=!scope.row.tableField106Expand">加载更多</el-button>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="tableField106-customName" label="客户名称" width="100" />
+          </el-table-column>
+          <el-table-column prop="tableField118" label="" align="center">
+            <el-table-column prop="tableField118-child-first" width="1px"
+              label-class-name="table-child-first">
+              <template slot-scope="scope" v-if="!scope.row.top">
+                <div class="child-table-column">
+                  <template v-if="!scope.row.tableField118Expand">
+                    <tr v-for="(item, index) in scope.row.tableField118.slice(0, 3)"
+                      class="child-table__row" :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.productName}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <template v-if="scope.row.tableField118Expand">
+                    <tr v-for="(item, index) in scope.row.tableField118" class="child-table__row"
+                      :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.productName}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <div class="expand-more-btn" v-if="scope.row.tableField118.length > 3">
+                    <el-button v-if="scope.row.tableField118Expand" type="text"
+                      @click="scope.row.tableField118Expand=!scope.row.tableField118Expand">隐藏部分</el-button>
+                    <el-button v-if="!scope.row.tableField118Expand" type="text"
+                      @click="scope.row.tableField118Expand=!scope.row.tableField118Expand">加载更多</el-button>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="tableField118-productName" label="商品名称" width="100" />
+          </el-table-column>
+          <el-table-column prop="flowState" label="状态" width="100">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
+              <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+              <el-tag type="warning" v-else>等待提交</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
+                @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn"
+                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
+              </el-button>
+              <el-button size="mini" type="text" :disabled="!scope.row.flowState"
+                @click="updateHandle(scope.row,scope.row.flowState)">详情</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" />
+
+    <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
+      <el-scrollbar class="template-list">
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{item.fullName}}
+        </div>
+      </el-scrollbar>
+    </el-dialog>
+
+    <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 { getFormById } from '@/api/workFlow/FormDesign'
+import { getFlowList } from '@/api/workFlow/FlowEngine'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+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: {
+    FlowBox,
+    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: {
+        redeliveryOrderCode: undefined,
+        preparationTime: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [], total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      tableField118_oldExpectArriveTimeStartOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+      tableField118_oldExpectArriveTimeStartProps: { "label": "fullName", "value": "id" },
+      tableField118_newExpectArriveTimeStartOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+      tableField118_newExpectArriveTimeStartProps: { "label": "fullName", "value": "id" },
+      interfaceRes: {
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("524130475623583109").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+  },
+  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: '524130475623583109',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/RedeliveryOrder/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/scm/RedeliveryOrder/${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("", "scm/RedeliveryOrder")
+      })
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const ids = this.multipleSelection
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/api/scm/RedeliveryOrder/batchRemove`,
+          data: ids,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      this.initData()
+    },
+    addOrUpdateHandle(row, flowState) {
+      if (!row) {
+        this.addHandle();
+      } else {
+        this.updateHandle(row, flowState)
+      }
+    },
+    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/scm/RedeliveryOrder/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 = ""
+      this.initData()
+    },
+    //流程改造后相关调用方法
+    updateHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    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>

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundCheck.vue

@@ -41,7 +41,7 @@
             <el-col :span="12">
               <jnpf-form-tip-item label="发货仓库" prop="deliveryWarehouse">
                 <JnpfInput v-model="dataForm.deliveryWarehouse"
-                  @change="changeData('deliveryWarehouse',-1)" placeholder="请输入" disabled clearable
+                  @change="changeData('deliveryWarehouse',-1)" placeholder="请输入" readonly clearable
                   :style='{"width":"100%"}'>
                 </JnpfInput>
               </jnpf-form-tip-item>
@@ -49,7 +49,7 @@
             <el-col :span="12">
               <jnpf-form-tip-item label="选择订单数量" prop="orderNum">
                 <JnpfInput v-model="dataForm.orderNum" @change="changeData('orderNum',-1)"
-                  placeholder="请输入" disabled clearable :style='{"width":"100%"}'>
+                  placeholder="请输入" readonly clearable :style='{"width":"100%"}'>
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
@@ -73,7 +73,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.code"
                         @change="changeData('businessordervoucherrelational-orderId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -84,7 +84,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.code"
                         @change="changeData('businessordervoucherrelational-voucherId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -95,7 +95,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.deliveryWarehouse"
                         @change="changeData('businessordervoucherrelational-orderType',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -108,7 +108,7 @@
                         @change="changeData('businessordervoucherrelational-cargoAreaId',scope.$index)"
                         placeholder="请选择" clearable :style='{"width":"100%"}'
                         :options="businessordervoucherrelationalcargoAreaIdOptions"
-                        :props="businessordervoucherrelationalcargoAreaIdProps">
+                        :props="businessordervoucherrelationalcargoAreaIdProps" readonly>
                       </JnpfSelect>
                     </template>
                   </el-table-column>
@@ -122,7 +122,7 @@
                         @change="changeData('businessordervoucherrelational-creatorTime',scope.$index)"
                         :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
                         placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
-                        format="yyyy-MM-dd">
+                        format="yyyy-MM-dd" readonly>
                       </JnpfDatePicker>
                     </template>
                   </el-table-column>
@@ -136,7 +136,7 @@
                         @change="changeData('businessordervoucherrelational-lastModifyTime',scope.$index)"
                         :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
                         placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
-                        format="yyyy-MM-dd">
+                        format="yyyy-MM-dd" readonly>
                       </JnpfDatePicker>
                     </template>
                   </el-table-column>
@@ -150,7 +150,7 @@
                         @change="changeData('businessordervoucherrelational-deleteTime',scope.$index)"
                         :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
                         placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
-                        format="yyyy-MM-dd">
+                        format="yyyy-MM-dd" readonly>
                       </JnpfDatePicker>
                     </template>
                   </el-table-column>
@@ -186,7 +186,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.productId"
                         @change="changeData('businessorderproductrelational-productId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -197,7 +197,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.businessOrderId"
                         @change="changeData('businessorderproductrelational-businessOrderId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -208,7 +208,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.spec"
                         @change="changeData('businessorderproductrelational-spec',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -219,7 +219,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.unitId"
                         @change="changeData('businessorderproductrelational-unitId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -230,7 +230,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.salesMainUnitId"
                         @change="changeData('businessorderproductrelational-salesMainUnitId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -241,7 +241,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.realBound"
                         @change="changeData('businessorderproductrelational-realBound',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -252,7 +252,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.useBound"
                         @change="changeData('businessorderproductrelational-useBound',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -263,7 +263,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.creatorTime"
                         @change="changeData('businessorderproductrelational-creatorTime',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -274,7 +274,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.creatorUserId"
                         @change="changeData('businessorderproductrelational-creatorUserId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -285,7 +285,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.businessPrice"
                         @change="changeData('businessorderproductrelational-businessPrice',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -296,7 +296,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.businessNum"
                         @change="changeData('businessorderproductrelational-businessNum',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -307,7 +307,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.lastModifyUserId"
                         @change="changeData('businessorderproductrelational-lastModifyUserId',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
                       </JnpfInput>
                     </template>
                   </el-table-column>

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundLock.vue

@@ -516,7 +516,7 @@ export default {
     goBack() {
       debugger
       this.visible = false
-      this.$router.push({ path: '/scm/saleCenter/saleOrder' })
+      this.$router.go(-1)
       // this.$emit('refreshDataList', true)
     },
     changeData(model, index) {

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue

@@ -1,8 +1,4 @@
-
-
-
-
-    <template>
+<template>
   <div :style="{margin: '0 auto',width:'100%'}">
     <el-row :gutter="15" class="">
       <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
@@ -108,11 +104,10 @@
               <jnpf-form-tip-item label="关联合同" v-if="judgeShow('contractId')" prop="contractId">
                 <JnpfPopupSelect v-model="dataForm.contractId" @change="changeData('contractId',-1)"
                   :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractId"
-                  placeholder="请选择" :disabled="judgeWrite('contractId')" propsValue="id"
-                  popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                  relationField='contract_name' field='contractId' interfaceId="523139566396246597"
-                  :pageSize="20" :columnOptions="contractIdcolumnOptions" clearable
-                  :style='{"width":"100%"}'>
+                  placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                  popupType="dialog" relationField='contract_name' field='contractId'
+                  interfaceId="523139566396246597" :pageSize="20"
+                  :columnOptions="contractIdcolumnOptions" clearable :style='{"width":"100%"}'>
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
@@ -554,11 +549,10 @@
                       @change="changeData('businessorderproductrelational-productId',scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.businessorderproductrelationalproductId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('businessorderproductrelationalList')||judgeWrite('businessorderproductrelationalList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='commodity_name' :field="'productId'+scope.$index"
-                      interfaceId="523160915206474309" :pageSize="20"
+                      placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='commodity_name'
+                      :field="'productId'+scope.$index" interfaceId="523160915206474309"
+                      :pageSize="20"
                       :columnOptions="businessorderproductrelationalproductIdcolumnOptions"
                       clearable :style='{"width":"100%"}'>
                     </JnpfPopupSelect>