试样订单：订货单新增试样订单字段、生成试样订单；撤销单、变更单、补货单排除试样订单

@@ -1224,3 +1224,10 @@ ALTER TABLE tbl_contract_std_processing_line
 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 '是否为试样订单';
+

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

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

@@ -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);
+            }
+        }
+    }
 }

@@ -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);
             });
         }

@@ -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);

@@ -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;
+
 }

@@ -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},'%'))
@@ -215,26 +220,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