Merge branch 'master_cj_zq' into master_sample_order

# Conflicts:
#	xingyun-api/src/main/resources/db/chujiang/base.sql

@@ -1097,6 +1097,70 @@ CREATE TABLE `pending_delivery_order` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='待交付订单'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='待交付订单'
 
 
 
 
+alter table shipments_order_info add column delivery_time datetime default null comment '签收时间';
+alter table shipments_plan add column auto_generate bool default true comment '是否系统自动生成';
+
+create table if not exists base_data_customer_short(
+    id varchar(32) primary key comment 'ID',
+    short_name varchar(32) not null comment '客户简称',
+    customer_id varchar(32) not null comment '客户ID',
+    type varchar(32) not null comment '客户类型',
+    dept_id varchar(32) not null comment '办事处ID',
+    region varchar(32) not null comment '区域ID',
+    create_by_id varchar(32) not null comment '创建人ID',
+    update_by_id varchar(32) not null comment '更新人ID',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间'
+) comment '客户简称';
+
+-- 应收款台账明细数据
+CREATE TABLE `receipt_ledger_info` (
+    `id` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
+    `customer_short_id` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '客户简称ID',
+    `quota` decimal(15,4) DEFAULT NULL COMMENT '额度',
+    `settle_term` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '结算期限',
+    `dept_id` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '办事处ID',
+    `region` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '区域',
+    `stock_up_company_id` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备货单位ID',
+    `customer_id` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '客户ID',
+    `factory_type` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '厂别',
+    `shipment_date` date DEFAULT NULL COMMENT '发货日期',
+    `start_account_receivable` decimal(15,4) DEFAULT NULL COMMENT '期初应收账款',
+    `arrival_date` date DEFAULT NULL COMMENT '到货日期',
+    `processed_date` date DEFAULT NULL COMMENT '应办理日期',
+    `actual_returned_date` date DEFAULT NULL COMMENT '实际回笼日期',
+    `returned_amount` decimal(15,4) DEFAULT NULL COMMENT '回笼金额',
+    `end_account_receivable` decimal(15,4) DEFAULT NULL COMMENT '期末应收账款',
+    `apply_status` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '申请状态',
+    `coordinate_date` date DEFAULT NULL COMMENT '协调办理日期',
+    `remark` varchar(200) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注',
+    `second_coordinate_date` date DEFAULT NULL COMMENT '二次协调日期',
+    `third_coordinate_date` date DEFAULT NULL COMMENT '三次协调日期',
+    `fourth_coordinate_date` date DEFAULT NULL COMMENT '四次协调日期',
+    `fifth_coordinate_date` date DEFAULT NULL COMMENT '五次协调日期',
+    `description` varchar(200) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '说明',
+    `del_flag` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+    `create_by_id` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '创建人ID',
+    `update_by_id` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '更新人ID',
+    `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `parent_id` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '父ID',
+    `debt_status` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '欠款状态',
+    `type` varchar(10) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '类型：INSIDE-内贸；OUTSIDE-外贸',
+    `shipment_order_id` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '发货单id',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='应收款台账号明细表'
+
+alter table customer_develop_plan modify column monthly_usage varchar(50) comment '月用量';
+alter table customer_develop_plan modify column target_quantity varchar(50) comment '目标量';
+alter table customer_develop_plan modify column thickness varchar(50) comment '厚度';
+alter table customer_develop_plan modify column width varchar(50) comment '宽度';
+alter table customer_develop_plan modify column settle_days varchar(50) comment '结算天数';
+
+alter table draft_request_car_ticket add column freeze bool default false comment '是否冻结';
+alter table purchase_order_info add column freeze_count int default 0 comment '冻结次数';
+alter table draft_request_car_ticket add column freeze_count int default 0 comment '冻结次数';
+
 create table if not exists sample_result_feedback(
 create table if not exists sample_result_feedback(
     id varchar(32) primary key comment 'ID',
     id varchar(32) primary key comment 'ID',
     customer_id varchar(32) not null comment '客户ID',
     customer_id varchar(32) not null comment '客户ID',

@@ -96,7 +96,7 @@
                 </if>
                 </if>
             </if>
             </if>
         </where>
         </where>
-        ORDER BY c.code
+        ORDER BY c.create_time desc
     </select>
     </select>
 
 
     <select id="getByName" resultMap="CustomerDto">
     <select id="getByName" resultMap="CustomerDto">
@@ -147,6 +147,6 @@
                 </choose>
                 </choose>
             </if>
             </if>
         </where>
         </where>
-        ORDER BY c.code
+        ORDER BY c.create_time desc
     </select>
     </select>
 </mapper>
 </mapper>

@@ -462,6 +462,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     @ApiModelProperty(value = "是否展示审核按钮")
     @ApiModelProperty(value = "是否展示审核按钮")
     private Boolean showExamine;
     private Boolean showExamine;
 
 
+    /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @ApiModelProperty(value = "是否展示审核按钮")
+    private Boolean showExamineDetail;
+
 
 
     /**
     /**
      * 企业操作类型
      * 企业操作类型

@@ -147,6 +147,12 @@ public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> {
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
     private BigDecimal packagingFee;
     private BigDecimal packagingFee;
 
 
+    /**
+     * 是否已发货
+     */
+    @ApiModelProperty("是否已发货")
+    private Boolean shipment;
+
     public GetPurchaseOrderLineBo() {
     public GetPurchaseOrderLineBo() {
 
 
     }
     }

@@ -128,7 +128,6 @@ public class GetReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
      */
      */
     @ApiModelProperty("状态名称")
     @ApiModelProperty("状态名称")
     private String statusName;
     private String statusName;
-
     /**
     /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */

@@ -71,6 +71,12 @@ public class GetDelayedShipmentBo extends BaseBo<DelayedShipment> {
     private Boolean showExamine;
     private Boolean showExamine;
 
 
     /**
     /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核详情按钮")
+    private Boolean showExamineDetail;
+
+    /**
      * 是否是创建人(非持久化字段)
      * 是否是创建人(非持久化字段)
      */
      */
     @ApiModelProperty("是否是创建人")
     @ApiModelProperty("是否是创建人")

@@ -4,7 +4,9 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -86,6 +88,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private ContractDistributorStandardService contractDistributorStandardService;
     private ContractDistributorStandardService contractDistributorStandardService;
     @Resource
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -500,11 +504,24 @@ public class CustomerCreditController extends DefaultBaseController {
                 data.setSupervisorReviewName(sysUser.getName());
                 data.setSupervisorReviewName(sysUser.getName());
             }
             }
         }
         }
+
+        //流程数据
+        List<String> ids = new ArrayList<>();
+        ids.add(credit.getId());
+        List<FlowInstanceWrapper> flowByBusinessIdList = flowInstanceWrapperService.getFlowByBusinessIdList(ids);
+        if (CollectionUtils.isNotEmpty(flowByBusinessIdList)) {
+            List<String> collect = flowByBusinessIdList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+            data.setShowExamineDetail(collect.contains(credit.getId()));
+        } else {
+            data.setShowExamineDetail(false);
+        }
         // 获取当前人员的待办任务数据
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
             List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             data.setShowExamine(businessIds.contains(credit.getId()));
             data.setShowExamine(businessIds.contains(credit.getId()));
+        } else {
+            data.setShowExamine(false);
         }
         }
         // enterpriseOperationType 转中文
         // enterpriseOperationType 转中文
         String opType = data.getEnterpriseOperationType();
         String opType = data.getEnterpriseOperationType();

@@ -415,6 +415,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("regionName", data.getRegionName() == null ? "" : data.getRegionName());
                     dataMap.put("regionName", data.getRegionName() == null ? "" : data.getRegionName());
                     //备货单位名称
                     //备货单位名称
                     dataMap.put("stockUpCompanyName", data.getStockUpCompanyName() == null ? "" : data.getStockUpCompanyName());
                     dataMap.put("stockUpCompanyName", data.getStockUpCompanyName() == null ? "" : data.getStockUpCompanyName());
+                    //价格表编号
+                    dataMap.put("priceListNo", data.getPriceListNo());
 
 
                     processTemplate(workbook, dataMap);
                     processTemplate(workbook, dataMap);
 
 

@@ -2,12 +2,16 @@ package com.lframework.xingyun.sc.controller.shipments;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
@@ -71,6 +75,8 @@ public class ReplenishmentOrderController extends DefaultBaseController {
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     @Resource
     private ReplenishmentOrderLineService replenishmentOrderLineService;
     private ReplenishmentOrderLineService replenishmentOrderLineService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
 
 
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
@@ -205,6 +211,12 @@ public class ReplenishmentOrderController extends DefaultBaseController {
         });
         });
 
 
         result.setReplenishmentOrderLineList(lineBoList);
         result.setReplenishmentOrderLineList(lineBoList);
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowTaskList)) {
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            result.setShowExamine(businessIds.contains(result.getId()));
+        }
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }
 
 

 package com.lframework.xingyun.sc.controller.shipments.car;
 package com.lframework.xingyun.sc.controller.shipments.car;
 
 
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -18,6 +22,7 @@ import com.lframework.xingyun.sc.vo.shipments.car.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -43,6 +48,8 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
     private DraftRequestCarTicketService draftRequestCarTicketService;
     private DraftRequestCarTicketService draftRequestCarTicketService;
     @Resource
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
     /**
     /**
      * 查询列表
      * 查询列表
      */
      */
@@ -104,6 +111,12 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
                 result.setDraftCreateBy(true);
                 result.setDraftCreateBy(true);
             }
             }
         }
         }
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            result.setShowExamine(businessIds.contains(result.getId()));
+        }
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }

 package com.lframework.xingyun.sc.controller.shipments.delay;
 package com.lframework.xingyun.sc.controller.shipments.delay;
 
 
 import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
@@ -9,6 +11,7 @@ import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.bo.shipments.delay.GetDelayedShipmentBo;
 import com.lframework.xingyun.sc.bo.shipments.delay.GetDelayedShipmentBo;
@@ -32,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -51,6 +55,8 @@ public class DelayedShipmentController extends DefaultBaseController {
     private DelayedShipmentDetailService delayedShipmentDetailService;
     private DelayedShipmentDetailService delayedShipmentDetailService;
     @Resource
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -103,24 +109,25 @@ public class DelayedShipmentController extends DefaultBaseController {
         QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
         QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
         vo.setDelayedShipmentId(id);
         vo.setDelayedShipmentId(id);
         List<DelayedShipmentDetail> delayedShipmentDetailList = delayedShipmentDetailService.query(vo);
         List<DelayedShipmentDetail> delayedShipmentDetailList = delayedShipmentDetailService.query(vo);
-        String currentUserId = SecurityUtil.getCurrentUser().getId();
-        // 判断 createById 是否等于当前用户 ID
-        boolean isCreateBy = false;
-        if (currentUserId.equals(data.getCreateById())) {
-            isCreateBy = true;
-        }
-        result.setDelayedCreateBy(isCreateBy);
+        result.setDelayedShipmentDetailList(delayedShipmentDetailList);
         // 获取当前人员的待办任务数据
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
-            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
-            if (ids.contains(data.getId())) {
-                result.setShowExamine(true);
-            } else {
-                result.setShowExamine(false);
-            }
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            result.setShowExamine(businessIds.contains(result.getId()));
+        } else {
+            result.setShowExamine(false);
+        }
+        //流程数据
+        List<String> ids = new ArrayList<>();
+        ids.add(result.getId());
+        List<FlowInstanceWrapper> flowByBusinessIdList = flowInstanceWrapperService.getFlowByBusinessIdList(ids);
+        if (CollectionUtils.isNotEmpty(flowByBusinessIdList)) {
+            List<String> collect = flowByBusinessIdList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+            result.setShowExamineDetail(collect.contains(result.getId()));
+        } else {
+            result.setShowExamineDetail(false);
         }
         }
-        result.setDelayedShipmentDetailList(delayedShipmentDetailList);
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }

@@ -369,6 +369,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private Boolean showExamine = false;
     private Boolean showExamine = false;
 
 
     /**
     /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamineDetail;
+
+    /**
      * 流程发起人(非持久化字段)
      * 流程发起人(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -72,6 +72,12 @@ public class DelayedShipment extends BaseEntity implements BaseDto {
     private Boolean showExamine = false;
     private Boolean showExamine = false;
 
 
     /**
     /**
+     * 是否展示审核按钮详情(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamineDetail;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;
 import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
@@ -111,6 +112,19 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<CustomerCredit> datas = this.query(vo);
         List<CustomerCredit> datas = this.query(vo);
         if (CollectionUtils.isNotEmpty(datas)) {
         if (CollectionUtils.isNotEmpty(datas)) {
+            //流程数据
+            List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(
+                    datas.stream().map(CustomerCredit::getId).collect(Collectors.toList()));
+            if (CollectionUtils.isNotEmpty(flowByConditionList)) {
+                List<String> idList = flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+                for (CustomerCredit customerCredit : datas) {
+                    if (idList.contains(customerCredit.getId())) {
+                        customerCredit.setShowExamineDetail(true);
+                    } else {
+                        customerCredit.setShowExamineDetail(false);
+                    }
+                }
+            }
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {

@@ -27,7 +27,10 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.utils.CommonUtil;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.*;
 import com.lframework.xingyun.sc.vo.shipments.plan.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +64,11 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     private SysRoleService sysRoleService;
     private SysRoleService sysRoleService;
     @Resource
     @Resource
     private SysUserDeptService sysUserDeptService;
     private SysUserDeptService sysUserDeptService;
+    @Resource
+    private DelayedShipmentService delayedShipmentService;
+    @Resource
+    private DelayedShipmentDetailService delayedShipmentDetailService;
+
 
 
 
 
     @Override
     @Override
@@ -208,12 +216,36 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 existOrderSpecIds.addAll(orderSpecIds);
                 existOrderSpecIds.addAll(orderSpecIds);
             }
             }
         }
         }
+        //延期发货单中审核中、审核驳回的数据不可被选择
+        QueryDelayedShipmentVo vo1 = new QueryDelayedShipmentVo();
+        vo1.setStatus("AUDIT");
+        List<DelayedShipment> query = delayedShipmentService.query(vo1);
+        List<String> ids = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(query)) {
+            ids = query.stream().map(DelayedShipment::getId).collect(Collectors.toList());
+        }
+        QueryDelayedShipmentVo vo2 = new QueryDelayedShipmentVo();
+        vo2.setStatus("REFUSE");
+        List<DelayedShipment> query1 = delayedShipmentService.query(vo2);
+        if (CollectionUtils.isNotEmpty(query1)) {
+            ids.addAll(query.stream().map(DelayedShipment::getId).collect(Collectors.toList()));
+        }
+        List<String> orderSpecIdList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            List<DelayedShipmentDetail> delayedShipmentDetails = delayedShipmentDetailService.queryByList(ids);
+            if (CollectionUtils.isNotEmpty(delayedShipmentDetails)) {
+                orderSpecIdList = delayedShipmentDetails.stream().map(DelayedShipmentDetail::getOrderSpecId).collect(Collectors.toList());
+            }
+        }
         List<String> orderSpecIds = vo.getOrderSpecIds();
         List<String> orderSpecIds = vo.getOrderSpecIds();
         if (CollectionUtils.isNotEmpty(orderSpecIds)) {
         if (CollectionUtils.isNotEmpty(orderSpecIds)) {
             orderSpecIds.addAll(existOrderSpecIds);
             orderSpecIds.addAll(existOrderSpecIds);
         } else {
         } else {
             orderSpecIds = existOrderSpecIds;
             orderSpecIds = existOrderSpecIds;
         }
         }
+        if (CollectionUtils.isNotEmpty(orderSpecIdList)) {
+            orderSpecIds.addAll(orderSpecIdList);
+        }
         vo.setOrderSpecIds(orderSpecIds);
         vo.setOrderSpecIds(orderSpecIds);
         // 业务员做权限控制
         // 业务员做权限控制
         List<String> userIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();

 package com.lframework.xingyun.sc.impl.shipments.delay;
 package com.lframework.xingyun.sc.impl.shipments.delay;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
@@ -48,6 +49,14 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS
     }
     }
 
 
     @Override
     @Override
+    public List<DelayedShipmentDetail> queryByList(List<String> delayedShipmentIds) {
+        LambdaQueryWrapper<DelayedShipmentDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(DelayedShipmentDetail.class);
+        lambdaQueryWrapper.in(DelayedShipmentDetail::getDelayedShipmentId, delayedShipmentIds);
+
+        return getBaseMapper().selectList(lambdaQueryWrapper);
+    }
+
+    @Override
     public DelayedShipmentDetail findById(String id) {
     public DelayedShipmentDetail findById(String id) {
 
 
         return getBaseMapper().findById(id);
         return getBaseMapper().findById(id);

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
@@ -29,10 +30,7 @@ import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.system.UserInfoDto;
 import com.lframework.starter.web.inner.dto.system.UserInfoDto;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
-import com.lframework.xingyun.sc.entity.DelayedShipment;
-import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
-import com.lframework.xingyun.sc.entity.RequestCarTicket;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
@@ -93,6 +91,19 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<DelayedShipment> datas = this.query(vo);
         List<DelayedShipment> datas = this.query(vo);
         if (CollectionUtils.isNotEmpty(datas)) {
         if (CollectionUtils.isNotEmpty(datas)) {
+            //流程数据
+            List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(
+                    datas.stream().map(DelayedShipment::getId).collect(Collectors.toList()));
+            if (CollectionUtils.isNotEmpty(flowByConditionList)) {
+                List<String> idList = flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+                for (DelayedShipment delayedShipment : datas) {
+                    if (idList.contains(delayedShipment.getId())) {
+                        delayedShipment.setShowExamineDetail(true);
+                    } else {
+                        delayedShipment.setShowExamineDetail(false);
+                    }
+                }
+            }
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
@@ -166,13 +177,16 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
                 LocalDate deliveryDate = createDelayedShipmentDetailVo.getDeliveryDate();
                 LocalDate deliveryDate = createDelayedShipmentDetailVo.getDeliveryDate();
                 applyShipmentDate = createDelayedShipmentDetailVo.getApplyShipmentDate();
                 applyShipmentDate = createDelayedShipmentDetailVo.getApplyShipmentDate();
                 if (deliveryDate != null && applyShipmentDate != null) {
                 if (deliveryDate != null && applyShipmentDate != null) {
+                    ShipmentsPlanDetail shipmentsPlanDetail = shipmentsPlanDetailService.findById(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
                     long daysBetween = Math.abs(ChronoUnit.DAYS.between(deliveryDate, applyShipmentDate));
                     long daysBetween = Math.abs(ChronoUnit.DAYS.between(deliveryDate, applyShipmentDate));
-                    if (daysBetween > 1) {
-                        ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
-                        delayedExceedOneDay = true;
-                    } else {
-                        //延期等于1天的自动加入后日预发
+                    if (daysBetween == 1 && StringUtil.isBlank(shipmentsPlanDetail.getShipmentOrderId())) {
+                        // 延期1天且不是发货单：自动加入后日预发（发货计划）
                         shipmentsPlanDetailService.updateShipmentDate(createDelayedShipmentDetailVo.getShipmentsPlanDetailId(), applyShipmentDate);
                         shipmentsPlanDetailService.updateShipmentDate(createDelayedShipmentDetailVo.getShipmentsPlanDetailId(), applyShipmentDate);
+                    } else {
+                        ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
+                        if (daysBetween > 1) {
+                            delayedExceedOneDay = true;
+                        }
                     }
                     }
                 }
                 }
             }
             }
@@ -297,7 +311,7 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             if (CollectionUtils.isNotEmpty(userIds)) {
             if (CollectionUtils.isNotEmpty(userIds)) {
                 userIdList.addAll(userIds);
                 userIdList.addAll(userIds);
             }
             }
-        } else if ("sfc".equals(workshopCode)) {
+        } else if ("ztfc".equals(workshopCode)) {
             //经营办计划员、经营办发货员、经营办主管
             //经营办计划员、经营办发货员、经营办主管
             codeList.add("ztfcjybjhy");
             codeList.add("ztfcjybjhy");
             codeList.add("ztfcjybfhy");
             codeList.add("ztfcjybfhy");

@@ -27,6 +27,13 @@ public interface DelayedShipmentDetailService extends BaseMpService<DelayedShipm
     List<DelayedShipmentDetail> query(QueryDelayedShipmentDetailVo vo);
     List<DelayedShipmentDetail> query(QueryDelayedShipmentDetailVo vo);
 
 
     /**
     /**
+     * 根据延期发货单ids，查询
+     * @param delayedShipmentIds
+     * @return
+     */
+    List<DelayedShipmentDetail> queryByList(List<String> delayedShipmentIds);
+
+    /**
      * 根据ID查询
      * 根据ID查询
      * @param id
      * @param id
      * @return
      * @return

@@ -25,6 +25,7 @@
         <result column="show_order" property="showOrder"/>
         <result column="show_order" property="showOrder"/>
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="packaging_fee" property="packagingFee"/>
+        <result column="shipment" property="shipment"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -57,6 +58,7 @@
             tb.show_order,
             tb.show_order,
             tb.assessment_exceeds_agreement,
             tb.assessment_exceeds_agreement,
             tb.packaging_fee,
             tb.packaging_fee,
+            tb.shipment,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,