Merge remote-tracking branch 'origin/master_sample_order' into master_sample_order

@@ -1097,6 +1097,70 @@ CREATE TABLE `pending_delivery_order` (
 ) 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(
     id varchar(32) primary key comment 'ID',
     customer_id varchar(32) not null comment '客户ID',
@@ -1152,3 +1216,18 @@ create table if not exists sample_feedback_tracking_detail(
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
 ) comment '样品反馈和追踪明细';
+
+--合同物料行新增字段
+ALTER TABLE tbl_contract_std_processing_line
+    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+
+ALTER TABLE tbl_contract_distributor_line
+    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+
+--订货单、订货单物料行新增字段
+ALTER TABLE purchase_order_info
+    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+
+ALTER TABLE tbl_purchase_order_line
+    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+

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

@@ -171,6 +171,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
     public GetContractDistributorLineBo() {
 
     }

@@ -217,6 +217,12 @@ public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessing
     @ApiModelProperty("前端用ID")
     private String itemId;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
     public GetContractStdProcessingLineBo() {
 
     }

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

@@ -320,6 +320,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("是否冻结")
     private boolean freeze;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty("是否为试样订单")
+    private boolean sampleOrder;
+
 
     public GetPurchaseOrderInfoBo() {
 

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

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

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

@@ -98,6 +98,14 @@ public class ContractFrameworkController extends DefaultBaseController {
 
             vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
         }
+        if (vo != null && StringUtils.isNotBlank(vo.getKeyword())) {
+            QueryCustomerVo queryCustomerVo = new QueryCustomerVo();
+            queryCustomerVo.setName(vo.getKeyword());
+            List<Customer> customerList = customerService.query(queryCustomerVo);
+            if (CollectionUtils.isNotEmpty(customerList)) {
+                vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
+            }
+        }
 
         PageResult<ContractFramework> pageResult = contractFrameworkService.query(getPageIndex(vo), getPageSize(vo), vo);
 

@@ -4,7 +4,9 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 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.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -86,6 +88,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private ContractDistributorStandardService contractDistributorStandardService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     /**
      * 查询列表
@@ -500,11 +504,24 @@ public class CustomerCreditController extends DefaultBaseController {
                 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());
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
             List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             data.setShowExamine(businessIds.contains(credit.getId()));
+        } else {
+            data.setShowExamine(false);
         }
         // enterpriseOperationType 转中文
         String opType = data.getEnterpriseOperationType();

@@ -415,6 +415,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("regionName", data.getRegionName() == null ? "" : data.getRegionName());
                     //备货单位名称
                     dataMap.put("stockUpCompanyName", data.getStockUpCompanyName() == null ? "" : data.getStockUpCompanyName());
+                    //价格表编号
+                    dataMap.put("priceListNo", data.getPriceListNo());
 
                     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.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.utils.CollectionUtil;
 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.InvokeResultBuilder;
 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.utils.PageResultUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
@@ -71,6 +75,8 @@ public class ReplenishmentOrderController extends DefaultBaseController {
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     private ReplenishmentOrderLineService replenishmentOrderLineService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
@@ -205,6 +211,12 @@ public class ReplenishmentOrderController extends DefaultBaseController {
         });
 
         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);
     }
 

 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.utils.CollectionUtil;
 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.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -43,6 +48,8 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
     private DraftRequestCarTicketService draftRequestCarTicketService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
     /**
      * 查询列表
      */
@@ -104,6 +111,12 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
                 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);
     }

 package com.lframework.xingyun.sc.controller.shipments.delay;
 
 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.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 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.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 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.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -51,6 +55,8 @@ public class DelayedShipmentController extends DefaultBaseController {
     private DelayedShipmentDetailService delayedShipmentDetailService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     /**
      * 查询列表
@@ -103,24 +109,25 @@ public class DelayedShipmentController extends DefaultBaseController {
         QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
         vo.setDelayedShipmentId(id);
         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());
         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);
     }

@@ -111,6 +111,11 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
     private String itemId;
 
     /**
+     * 是否为试样订单
+     */
+    private Boolean sampleOrder;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -173,6 +173,11 @@ public class ContractStdProcessingLine extends BaseEntity implements BaseDto {
     private String itemId;
 
     /**
+     * 是否为试样订单
+     */
+    private Boolean sampleOrder;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

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

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

@@ -280,6 +280,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private Integer freezeCount;
 
     /**
+     * 是否为试样订单
+     */
+    private boolean sampleOrder;
+
+    /**
      * 下单人(非持久化字段)
      */
     @TableField(exist = false)

@@ -265,6 +265,11 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private Boolean delFlag;
 
     /**
+     * 是否为试样订单
+     */
+    private boolean sampleOrder;
+
+    /**
      * 新增/删除/变更
      */
     @TableField(exist = false)

@@ -35,6 +35,8 @@ import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailSe
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
@@ -274,6 +276,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             purchaseOrderInfoService.updateStatus(businessId, "PASS");
+            //审核通过，物料行存在试样订单的需要对当前订单拆分
+            packPurchaseOrderInfo(businessId);
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
@@ -675,4 +679,100 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             messageHandler.sendMsg(null, roleCodes, businessType, businessId, null);
         }
     }
+
+    /**
+     * 处理订货单数据
+     *
+     * @param businessId 订货单ID
+     */
+    private void packPurchaseOrderInfo(String businessId) {
+        PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(businessId);
+
+        QueryPurchaseOrderLineVo vo1 = new QueryPurchaseOrderLineVo();
+        vo1.setPurchaseOrderId(purchaseOrderInfo.getId());
+        List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
+        if (CollectionUtils.isNotEmpty(lineVoList)) {
+            Map<Boolean, List<PurchaseOrderLine>> partitioned = lineVoList.stream()
+                    .collect(Collectors.partitioningBy(PurchaseOrderLine::isSampleOrder));
+
+            List<PurchaseOrderLine> sampleOrders = partitioned.get(true);   // 是试样订单
+            if (CollectionUtils.isEmpty(sampleOrders)) {
+                return;
+            }
+
+            CreatePurchaseOrderInfoVo vo = new CreatePurchaseOrderInfoVo();
+            vo.setContractId(purchaseOrderInfo.getContractId());
+            vo.setOrderNo(purchaseOrderInfo.getOrderNo() + "xp01");
+            vo.setSupplyUnit(purchaseOrderInfo.getSupplyUnit());
+            vo.setOrderingUnit(purchaseOrderInfo.getOrderingUnit());
+            vo.setOrderDate(purchaseOrderInfo.getOrderDate());
+            vo.setSettlementTerms(purchaseOrderInfo.getSettlementTerms());
+            vo.setDeliveryMethod(purchaseOrderInfo.getDeliveryMethod());
+            vo.setPriceListNo(purchaseOrderInfo.getPriceListNo());
+            vo.setExecutionStandard(purchaseOrderInfo.getExecutionStandard());
+            vo.setExecutionStandardRemarks(purchaseOrderInfo.getExecutionStandardRemarks());
+            vo.setInvoicingStatus(purchaseOrderInfo.getInvoicingStatus());
+            vo.setShippingCost(purchaseOrderInfo.getShippingCost());
+            vo.setPieceWeightHeader(purchaseOrderInfo.getPieceWeightHeader());
+            vo.setSurface(purchaseOrderInfo.getSurface());
+            vo.setTolerance(purchaseOrderInfo.getTolerance());
+            vo.setPerformance(purchaseOrderInfo.getPerformance());
+            vo.setElement(purchaseOrderInfo.getElement());
+            vo.setPackaging(purchaseOrderInfo.getPackaging());
+            vo.setRemarks(purchaseOrderInfo.getRemarks());
+            vo.setStatus(purchaseOrderInfo.getStatus());
+            vo.setExamineStatus(purchaseOrderInfo.getExamineStatus());
+            vo.setProductionProcess(purchaseOrderInfo.getProductionProcess());
+            vo.setDeptId(purchaseOrderInfo.getDeptId());
+            vo.setRegion(purchaseOrderInfo.getRegion());
+            vo.setStockUpCompanyId(purchaseOrderInfo.getStockUpCompanyId());
+            vo.setWorkshopId(purchaseOrderInfo.getWorkshopId());
+            vo.setType(purchaseOrderInfo.getType());
+            vo.setPackagingFee(purchaseOrderInfo.getPackagingFee());
+            vo.setContractCreateById(purchaseOrderInfo.getContractCreateById());
+            vo.setSampleOrder(true);
+            vo.setNoFlowInstance(true);
+
+            List<CreatePurchaseOrderLineVo> list = new ArrayList<>();
+            BigDecimal totalQuantity = new BigDecimal(0);
+            for (PurchaseOrderLine purchaseOrderLine : sampleOrders) {
+                CreatePurchaseOrderLineVo createPurchaseOrderLineVo = new CreatePurchaseOrderLineVo();
+                createPurchaseOrderLineVo.setIndustry(purchaseOrderLine.getIndustry());
+                createPurchaseOrderLineVo.setQuality(purchaseOrderLine.getQuality());
+                createPurchaseOrderLineVo.setBrand(purchaseOrderLine.getBrand());
+                createPurchaseOrderLineVo.setThickness(purchaseOrderLine.getThickness());
+                createPurchaseOrderLineVo.setThicknessTolPos(purchaseOrderLine.getThicknessTolPos());
+                createPurchaseOrderLineVo.setThicknessTolNeg(purchaseOrderLine.getThicknessTolNeg());
+                createPurchaseOrderLineVo.setWidth(purchaseOrderLine.getWidth());
+                createPurchaseOrderLineVo.setWidthTolPos(purchaseOrderLine.getWidthTolPos());
+                createPurchaseOrderLineVo.setWidthTolNeg(purchaseOrderLine.getWidthTolNeg());
+                createPurchaseOrderLineVo.setLength(purchaseOrderLine.getLength());
+                createPurchaseOrderLineVo.setLengthTolPos(purchaseOrderLine.getLengthTolPos());
+                createPurchaseOrderLineVo.setLengthTolNeg(purchaseOrderLine.getLengthTolNeg());
+                createPurchaseOrderLineVo.setStatus(purchaseOrderLine.getStatus());
+                createPurchaseOrderLineVo.setQuantity(purchaseOrderLine.getQuantity());
+                createPurchaseOrderLineVo.setSalesPrice(purchaseOrderLine.getSalesPrice());
+                createPurchaseOrderLineVo.setDeliveryDate(purchaseOrderLine.getDeliveryDate());
+                createPurchaseOrderLineVo.setShowOrder(purchaseOrderLine.getShowOrder());
+                createPurchaseOrderLineVo.setAssessmentExceedsAgreement(purchaseOrderLine.getAssessmentExceedsAgreement());
+                createPurchaseOrderLineVo.setPackagingFee(purchaseOrderLine.getPackagingFee());
+                createPurchaseOrderLineVo.setSampleOrder(purchaseOrderLine.isSampleOrder());
+                list.add(createPurchaseOrderLineVo);
+
+                totalQuantity = totalQuantity.add(purchaseOrderLine.getQuantity());
+                //删除原来的关联关系
+                purchaseOrderLineService.deleteById(purchaseOrderLine.getId());
+            }
+
+            vo.setTotalQuantity(totalQuantity);
+            vo.setCreatePurchaseOrderLineVoList(list);
+            purchaseOrderInfoService.create(vo);
+
+            //更新原来订货单总数量
+            if (purchaseOrderInfo.getTotalQuantity() != null) {
+                BigDecimal result = purchaseOrderInfo.getTotalQuantity().subtract(totalQuantity);
+                purchaseOrderInfoService.updateTotalQuantity(businessId, result);
+            }
+        }
+    }
 }

@@ -50,7 +50,6 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         return getBaseMapper().query(vo);
     }
 
-    @Cacheable(value = ContractDistributorLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     public ContractDistributorLine findById(String id) {
 
@@ -87,6 +86,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setLengthTolPos(vo.getLengthTolPos());
         data.setLengthTolNeg(vo.getLengthTolNeg());
         data.setItemId(vo.getItemId());
+        data.setSampleOrder(vo.getSampleOrder());
 
         getBaseMapper().insert(data);
 
@@ -130,6 +130,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getLengthTolPos, vo.getLengthTolPos())
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
                 .set(ContractDistributorLine::getItemId, vo.getItemId())
+                .set(ContractDistributorLine::getSampleOrder, vo.getSampleOrder())
                 .eq(ContractDistributorLine::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

@@ -731,6 +731,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createPurchaseOrderLineVo.setSalesPrice(contractDistributorLine.getUnitPrice());
                 createPurchaseOrderLineVo.setDeliveryDate(contractDistributorLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setShowOrder(contractDistributorLine.getShowOrder());
+                createPurchaseOrderLineVo.setSampleOrder(contractDistributorLine.getSampleOrder());
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
             });
         }
@@ -755,6 +756,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createPurchaseOrderLineVo.setSalesPrice(contractStdProcessingLine.getUnitPrice());
                 createPurchaseOrderLineVo.setDeliveryDate(contractStdProcessingLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setShowOrder(contractStdProcessingLine.getShowOrder());
+                createPurchaseOrderLineVo.setSampleOrder(contractStdProcessingLine.getSampleOrder());
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
             });
         }

@@ -50,7 +50,6 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
         return getBaseMapper().query(vo);
     }
 
-    @Cacheable(value = ContractStdProcessingLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     public ContractStdProcessingLine findById(String id) {
 
@@ -148,6 +147,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
         if (!StringUtil.isBlank(vo.getItemId())) {
             data.setItemId(vo.getItemId());
         }
+        data.setSampleOrder(vo.getSampleOrder());
 
         getBaseMapper().insert(data);
 
@@ -196,6 +196,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
                 .set(ContractStdProcessingLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(ContractStdProcessingLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(ContractStdProcessingLine::getItemId, StringUtil.isBlank(vo.getItemId()) ? null : vo.getItemId())
+                .set(ContractStdProcessingLine::getSampleOrder, vo.getSampleOrder())
                 .eq(ContractStdProcessingLine::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
 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.service.FlowDefinitionWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
@@ -111,6 +112,19 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<CustomerCredit> datas = this.query(vo);
         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());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {

@@ -240,6 +240,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!StringUtil.isBlank(vo.getContractCreateById())) {
             data.setContractCreateById(vo.getContractCreateById());
         }
+        data.setSampleOrder(vo.isSampleOrder());
 
 
         getBaseMapper().insert(data);
@@ -263,7 +264,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 data.setWorkshopCode(workshop.getCode());
             }
         }
-        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        if (!vo.isNoFlowInstance()) {
+            flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        }
 
         return data.getId();
     }

@@ -128,6 +128,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (vo.getPackagingFee() != null) {
             data.setPackagingFee(vo.getPackagingFee());
         }
+        data.setSampleOrder(vo.isSampleOrder());
 
         getBaseMapper().insert(data);
 
@@ -168,6 +169,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(PurchaseOrderLine::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
+                .set(PurchaseOrderLine::isSampleOrder, vo.isSampleOrder())
                 .eq(PurchaseOrderLine::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

@@ -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.shipments.ShipmentsPlanDetailService;
 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.vo.shipments.delay.QueryDelayedShipmentVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +64,11 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     private SysRoleService sysRoleService;
     @Resource
     private SysUserDeptService sysUserDeptService;
+    @Resource
+    private DelayedShipmentService delayedShipmentService;
+    @Resource
+    private DelayedShipmentDetailService delayedShipmentDetailService;
+
 
 
     @Override
@@ -208,12 +216,36 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 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();
         if (CollectionUtils.isNotEmpty(orderSpecIds)) {
             orderSpecIds.addAll(existOrderSpecIds);
         } else {
             orderSpecIds = existOrderSpecIds;
         }
+        if (CollectionUtils.isNotEmpty(orderSpecIdList)) {
+            orderSpecIds.addAll(orderSpecIdList);
+        }
         vo.setOrderSpecIds(orderSpecIds);
         // 业务员做权限控制
         List<String> userIds = new ArrayList<>();

 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.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
@@ -48,6 +49,14 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS
     }
 
     @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) {
 
         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.github.pagehelper.PageInfo;
 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.service.FlowInstanceWrapperService;
 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.service.system.SysUserRoleService;
 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.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
@@ -93,6 +91,19 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<DelayedShipment> datas = this.query(vo);
         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());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
@@ -166,13 +177,16 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
                 LocalDate deliveryDate = createDelayedShipmentDetailVo.getDeliveryDate();
                 applyShipmentDate = createDelayedShipmentDetailVo.getApplyShipmentDate();
                 if (deliveryDate != null && applyShipmentDate != null) {
+                    ShipmentsPlanDetail shipmentsPlanDetail = shipmentsPlanDetailService.findById(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
                     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);
+                    } else {
+                        ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
+                        if (daysBetween > 1) {
+                            delayedExceedOneDay = true;
+                        }
                     }
                 }
             }
@@ -297,7 +311,7 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             if (CollectionUtils.isNotEmpty(userIds)) {
                 userIdList.addAll(userIds);
             }
-        } else if ("sfc".equals(workshopCode)) {
+        } else if ("ztfc".equals(workshopCode)) {
             //经营办计划员、经营办发货员、经营办主管
             codeList.add("ztfcjybjhy");
             codeList.add("ztfcjybfhy");

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

@@ -37,14 +37,14 @@ public class LatexFormulaExcelExporterUtil {
             }
 
             latex.append(formatScientificNotation(comp.getBase()));
-            if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) > 0) {
+            if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) >= 0) {
                 latex.append("^{+").append(formatScientificNotation(comp.getSup())).append("}");
             }
             if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) < 0) {
                 latex.append("^{").append(formatScientificNotation(comp.getSup())).append("}");
             }
 
-            if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) > 0) {
+            if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) >= 0) {
                 latex.append("_{+").append(formatScientificNotation(comp.getSub())).append("}");
             }
             if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) < 0) {

@@ -191,4 +191,10 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
      */
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
+
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
 }

@@ -224,5 +224,11 @@ public class CreateContractStdProcessingLineVo implements BaseVo, Serializable {
     @Length(message = "前端用ID最多允许50个字符！")
     private String itemId;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
 }
 

@@ -92,4 +92,10 @@ public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializ
      */
     @ApiModelProperty("客户Id集合")
     private List<String> customerIdList;
+
+    /**
+     * 移动端搜索
+     */
+    @ApiModelProperty("移动端搜索")
+    private String keyword;
 }

@@ -194,5 +194,11 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
      */
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
+
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
 }
 

@@ -232,4 +232,11 @@ public class UpdateContractStdProcessingLineVo implements BaseVo, Serializable {
     @Length(message = "前端用ID最多允许50个字符！")
     private String itemId;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
+
 }

@@ -237,4 +237,16 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("合同创建人ID")
     private String contractCreateById;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty("是否为试样订单")
+    private boolean sampleOrder;
+
+    /**
+     * 不走审核流程
+     */
+    @ApiModelProperty("不走审核流程")
+    private boolean noFlowInstance = false;
+
 }

@@ -176,4 +176,10 @@ public class CreatePurchaseOrderLineVo implements BaseVo, Serializable {
     @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
     private BigDecimal packagingFee;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty("是否为试样订单")
+    private boolean sampleOrder;
+
 }

@@ -119,6 +119,12 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     private boolean freeze;
 
     /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty("是否为试样订单")
+    private boolean sampleOrder;
+
+    /**
      * 订货单位主键集合
      */
     @ApiModelProperty("订货单位主键集合")

@@ -176,4 +176,10 @@ public class UpdatePurchaseOrderLineVo implements BaseVo, Serializable {
     @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
     private BigDecimal packagingFee;
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty("是否为试样订单")
+    private boolean sampleOrder;
+
 }

@@ -33,6 +33,7 @@
         <result column="length_tol_pos" property="lengthTolPos"/>
         <result column="length_tol_neg" property="lengthTolNeg"/>
         <result column="item_id" property="itemId"/>
+        <result column="sample_order" property="sampleOrder"/>
     </resultMap>
 
     <sql id="ContractDistributorLine_sql">
@@ -65,7 +66,8 @@
                tb.width_tol_neg,
                tb.length_tol_pos,
                tb.length_tol_neg,
-               tb.item_id
+               tb.item_id,
+               tb.sample_order
         FROM tbl_contract_distributor_line AS tb
     </sql>
 

@@ -32,6 +32,7 @@
         <result column="delivery_date" property="deliveryDate"/>
         <result column="show_order" property="showOrder"/>
         <result column="item_id" property="itemId"/>
+        <result column="sample_order" property="sampleOrder"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -71,6 +72,7 @@
             tb.delivery_date,
             tb.show_order,
             tb.item_id,
+            tb.sample_order,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,

@@ -63,12 +63,31 @@
             <if test="vo.validityTimeEnd != null">
                 AND tb.validity_time &lt;= #{vo.validityTimeEnd}
             </if>
-            <if test="vo.customerIdList != null and vo.customerIdList.size() > 0">
-                AND tb.customer_id IN
-                <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
+            <choose>
+                <!-- 情况1：customerIdList 和 keyword 都有值 -->
+                <when test="vo.customerIdList != null and vo.customerIdList.size() > 0 and vo.keyword != null and vo.keyword != ''">
+                    AND (
+                    tb.customer_id IN
+                    <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
+                        #{item}
+                    </foreach>
+                    OR tb.code LIKE CONCAT('%', #{vo.keyword}, '%')
+                    )
+                </when>
+
+                <!-- 情况2：只有 customerIdList 有值 -->
+                <when test="vo.customerIdList != null and vo.customerIdList.size() > 0">
+                    AND tb.customer_id IN
+                    <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
+                        #{item}
+                    </foreach>
+                </when>
+
+                <!-- 情况3：只有 keyword 有值 -->
+                <when test="vo.keyword != null and vo.keyword != ''">
+                    AND tb.code LIKE CONCAT('%', #{vo.keyword}, '%')
+                </when>
+            </choose>
         </where>
         order by tb.create_time desc
     </select>

@@ -46,6 +46,7 @@
         <result column="packaging_fee" property="packagingFee"/>
         <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="contract_create_by_name" property="contractCreateByName"/>
+        <result column="sample_order" property="sampleOrder"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -100,6 +101,7 @@
             tb.contract_create_by_id,
             su.name as contract_create_by_name,
             tb.freeze,
+            tb.sample_order,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -157,6 +159,9 @@
             <if test="vo.freeze != null and vo.freeze != ''">
                 AND tb.freeze = #{vo.freeze}
             </if>
+            <if test="vo.sampleOrder != null and vo.sampleOrder != ''">
+                AND tb.sample_order = #{vo.sampleOrder}
+            </if>
             <if test="vo.orderingUnitNameOrOrderNo != null and vo.orderingUnitNameOrOrderNo != ''">
                 AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')
                 or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%'))
@@ -191,6 +196,10 @@
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
                 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
             </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (cu.name LIKE CONCAT('%', #{vo.searchKey},'%')
+                or tb.order_no LIKE CONCAT('%', #{vo.searchKey},'%'))
+            </if>
             <if test="vo.orderDateStart != null">
                 AND tb.order_date >= #{vo.orderDateStart}
             </if>
@@ -215,26 +224,29 @@
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             <choose>
-            <when test="vo.queryType == 'REVOKE'">
-            AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
-            tb.revoke_status='PARTIAL' OR tb.revoke_status IS NULL)
-            AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
-            AND tb.examine_status = 'PASS'
-            AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
-            </when>
-            <when test="vo.queryType == 'CHANGE'">
-                AND tb.examine_status = 'PASS'
-                AND tb.status NOT IN ('SHIPPED', 'DELIVERED', 'CANCEL')
-                AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
-                AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
-            </when>
-            <when test="vo.queryType == 'REPLENISHMENT'">
-                AND tb.examine_status = 'PASS'
-                AND tb.status IN ('TRANSIT', 'SHIPPED', 'DELIVERED')
-            </when>
-            <otherwise>
-                AND 1 = 0  <!-- 确保查询不到任何数据 -->
-            </otherwise>
+                <when test="vo.queryType == 'REVOKE'">
+                    AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
+                    tb.revoke_status='PARTIAL' OR tb.revoke_status IS NULL)
+                    AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
+                    AND tb.examine_status = 'PASS'
+                    AND tb.sample_order = false
+                    AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
+                </when>
+                <when test="vo.queryType == 'CHANGE'">
+                    AND tb.examine_status = 'PASS'
+                    AND tb.sample_order = false
+                    AND tb.status NOT IN ('SHIPPED', 'DELIVERED', 'CANCEL')
+                    AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
+                    AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
+                </when>
+                <when test="vo.queryType == 'REPLENISHMENT'">
+                    AND tb.examine_status = 'PASS'
+                    AND tb.sample_order = false
+                    AND tb.status IN ('TRANSIT', 'SHIPPED', 'DELIVERED')
+                </when>
+                <otherwise>
+                    AND 1 = 0  <!-- 确保查询不到任何数据 -->
+                </otherwise>
             </choose>
         </where>
         ORDER BY tb.update_time DESC

@@ -25,6 +25,8 @@
         <result column="show_order" property="showOrder"/>
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
         <result column="packaging_fee" property="packagingFee"/>
+        <result column="shipment" property="shipment"/>
+        <result column="sample_order" property="sampleOrder"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -57,6 +59,8 @@
             tb.show_order,
             tb.assessment_exceeds_agreement,
             tb.packaging_fee,
+            tb.shipment,
+            tb.sample_order,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -94,7 +98,7 @@
         length, length_tol_pos, length_tol_neg,
         status, quantity, sales_price, delivery_date, show_order,
         assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by,
-        create_time, update_time, parent_id,packaging_fee
+        create_time, update_time, parent_id,packaging_fee,sample_order
         ) VALUES
         <foreach collection="specList" item="item" separator=",">
             (
@@ -104,7 +108,7 @@
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
             #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy},
-            #{item.createTime}, #{item.updateTime}, #{item.parentId},#{item.packagingFee}
+            #{item.createTime}, #{item.updateTime}, #{item.parentId},#{item.packagingFee},#{sampleOrder}
             )
         </foreach>
     </insert>