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

@@ -355,12 +355,15 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                         purchaseOrderLineService.updateQuantity(purchaseOrderRevokeLine.getPurchaseOrderLineId(), result);
                     }
                     //新增订单明细
-                    QueryOrderDetailReportVo vo2 = new QueryOrderDetailReportVo();
-                    vo2.setPurchaseOrderLineId(purchaseOrderRevokeLine.getPurchaseOrderLineId());
-                    List<OrderDetailReport> detailReports = orderDetailReportService.query(vo2);
-                    if (CollectionUtils.isNotEmpty(detailReports)) {
-                        OrderDetailReport orderDetailReport = detailReports.get(0);
-                        createOrderDetailReport(purchaseOrderRevokeLine.getId(), revokeQuantity.negate(), orderDetailReport);
+                    if (purchaseOrderRevokeLine.getRevokeQuantity() != null) {
+                        QueryOrderDetailReportVo vo2 = new QueryOrderDetailReportVo();
+                        vo2.setPurchaseOrderLineId(purchaseOrderRevokeLine.getPurchaseOrderLineId());
+                        vo2.setShowOrder(0);
+                        List<OrderDetailReport> detailReports = orderDetailReportService.query(vo2);
+                        if (CollectionUtils.isNotEmpty(detailReports)) {
+                            OrderDetailReport orderDetailReport = detailReports.get(0);
+                            createOrderDetailReport(revokeQuantity.negate(), orderDetailReport);
+                        }
                     }
                 }
                 //更新总数量
@@ -896,9 +899,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
     }
 
-    private void createOrderDetailReport(String id, BigDecimal quantity, OrderDetailReport orderDetailReport) {
+    private void createOrderDetailReport(BigDecimal quantity, OrderDetailReport orderDetailReport) {
         CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
-        vo.setPurchaseOrderLineId(id);
+        vo.setPurchaseOrderLineId(orderDetailReport.getPurchaseOrderLineId());
         vo.setOrderNo(orderDetailReport.getOrderNo());
         vo.setOrderDate(orderDetailReport.getOrderDate());
         vo.setWorkshopId(orderDetailReport.getWorkshopId());

@@ -253,6 +253,7 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                 .set(OrderDetailReport::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
                 .set(OrderDetailReport::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
                 .set(OrderDetailReport::getSuggestedPrice, StringUtil.isBlank(vo.getSuggestedPrice()) ? null : vo.getSuggestedPrice())
+                .eq(OrderDetailReport::getShowOrder, 0)
                 .eq(OrderDetailReport::getPurchaseOrderLineId, vo.getPurchaseOrderLineId());
 
         getBaseMapper().update(updateWrapper);

@@ -47,4 +47,10 @@ public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("导出类型")
     private String exportType;
 
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer showOrder;
+
 }

@@ -211,6 +211,9 @@
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
                 AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
             </if>
+            <if test="vo.showOrder != null">
+                AND tb.show_order = #{vo.showOrder}
+            </if>
         </where>
         ) t
         ORDER BY