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

@@ -39,6 +39,7 @@ import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 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;
@@ -52,6 +53,8 @@ import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -138,6 +141,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private ProductSampleConfirmationSlipService productSampleConfirmationSlipService;
     @Resource
     private SampleResultTrackingService sampleResultTrackingService;
+    @Resource
+    private OrderDetailReportService orderDetailReportService;
 
 
 
@@ -349,6 +354,14 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                         totalQuantity = totalQuantity.add(result);
                         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);
+                    }
                 }
                 //更新总数量
                 purchaseOrderInfoService.updateTotalQuantity(revoke.getPurchaseOrderId(), totalQuantity);
@@ -882,4 +895,50 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             sampleResultTrackingService.updateStatus(businessId, "REFUSE");
         }
     }
+
+    private void createOrderDetailReport(String id, BigDecimal quantity, OrderDetailReport orderDetailReport) {
+        CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
+        vo.setPurchaseOrderLineId(id);
+        vo.setOrderNo(orderDetailReport.getOrderNo());
+        vo.setOrderDate(orderDetailReport.getOrderDate());
+        vo.setWorkshopId(orderDetailReport.getWorkshopId());
+        vo.setDeptName(orderDetailReport.getDeptName());
+        vo.setRegionName(orderDetailReport.getRegionName());
+        vo.setOrderingUnitName(orderDetailReport.getOrderingUnitName());
+        vo.setIndustry(orderDetailReport.getIndustry());
+        vo.setBrand(orderDetailReport.getBrand());
+        vo.setThickness(orderDetailReport.getThickness());
+        vo.setThicknessTolPos(orderDetailReport.getThicknessTolPos());
+        vo.setThicknessTolNeg(orderDetailReport.getThicknessTolNeg());
+        vo.setWidth(orderDetailReport.getWidth());
+        vo.setWidthTolPos(orderDetailReport.getWidthTolPos());
+        vo.setWidthTolNeg(orderDetailReport.getWidthTolNeg());
+        vo.setLength(orderDetailReport.getLength());
+        vo.setLengthTolPos(orderDetailReport.getLengthTolPos());
+        vo.setLengthTolNeg(orderDetailReport.getLengthTolNeg());
+        vo.setStatus(orderDetailReport.getStatus());
+        vo.setQuantity(quantity);
+        vo.setSuggestedPrice(orderDetailReport.getSuggestedPrice());
+        vo.setDeliveryDate(orderDetailReport.getDeliveryDate());
+        vo.setAssessmentExceedsAgreement(orderDetailReport.getAssessmentExceedsAgreement());
+        vo.setSalesPrice(orderDetailReport.getSalesPrice());
+        vo.setPriceListNo(orderDetailReport.getPriceListNo());
+        vo.setPackagingFee(orderDetailReport.getPackagingFee());
+        vo.setInvoicingStatus(orderDetailReport.getInvoicingStatus());
+        vo.setPieceWeightHeader(orderDetailReport.getPieceWeightHeader());
+        vo.setSurface(orderDetailReport.getSurface());
+        vo.setTolerance(orderDetailReport.getTolerance());
+        vo.setPerformance(orderDetailReport.getPerformance());
+        vo.setPackaging(orderDetailReport.getPackaging());
+        vo.setRemarks(orderDetailReport.getRemarks());
+        vo.setReturnShippingCost(orderDetailReport.getReturnShippingCost());
+        vo.setShippingCost(orderDetailReport.getShippingCost());
+        vo.setCustomerType(orderDetailReport.getCustomerType());
+        vo.setQuality(orderDetailReport.getQuality());
+        vo.setContractType(orderDetailReport.getContractType());
+        vo.setStockUpCompanyName(orderDetailReport.getStockUpCompanyName());
+        vo.setOrderType(orderDetailReport.getOrderType());
+        vo.setShowOrder(1);
+        orderDetailReportService.create(vo);
+    }
 }

@@ -360,4 +360,14 @@ public class FlowTaskServiceImpl implements FlowTaskService {
         String id = String.valueOf(i);
         sampleResultTrackingService.updateExamine(id, nodeCode, message);
     }
+
+    @Override
+    public Map<String, Object> findById(String s) {
+        ProductSampleConfirmationSlip slip = productSampleConfirmationSlipService.findById(s);
+        Map<String, Object> map = new HashMap<>();
+        if (slip != null) {
+            map = JsonUtil.parseMap(JsonUtil.toJsonString(slip), String.class, Object.class);
+        }
+        return map;
+    }
 }

@@ -441,6 +441,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) {
             for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) {
                 purchaseOrderLineService.update(updatePurchaseOrderLineVo);
+                PurchaseOrderLine line = purchaseOrderLineService.findById(updatePurchaseOrderLineVo.getId());
 
                 //修改订单详情
                 UpdateOrderDetailReportVo vo1 = new UpdateOrderDetailReportVo();
@@ -459,6 +460,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setShippingCost(vo.getShippingCost());
                 vo1.setSalesPrice(updatePurchaseOrderLineVo.getSalesPrice());
+                vo1.setAssessmentExceedsAgreement(line.getAssessmentExceedsAgreement());
                 orderDetailReportService.update(vo1);
             }
         }

@@ -63,5 +63,6 @@
                 )
             </if>
         </where>
+        ORDER BY tb.create_time DESC
     </select>
 </mapper>

@@ -96,6 +96,7 @@
                 OR poi.order_no LIKE CONCAT('%', #{vo.searchKey},'%'))
             </if>
         </where>
+        ORDER BY tb.create_time DESC
     </select>
 
     <select id="findById" resultType="com.lframework.xingyun.sc.entity.SampleResultTracking">