统计报表：订单明细

@@ -282,7 +282,10 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     private void createOrderDetailReport(String businessId) {
         PurchaseOrderInfo purchaseOrderInfo = this.findById(businessId);
         ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
-        CustomerCredit customerCredit = customerCreditService.findById(purchaseOrderInfo.getCustomerCreditId());
+        CustomerCredit customerCredit = null;
+        if (StringUtils.isNotEmpty(purchaseOrderInfo.getCustomerCreditId())) {
+            customerCredit = customerCreditService.findById(purchaseOrderInfo.getCustomerCreditId());
+        }
         QueryPurchaseOrderLineVo vo1 = new QueryPurchaseOrderLineVo();
         vo1.setPurchaseOrderId(purchaseOrderInfo.getId());
         List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
@@ -326,9 +329,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 }
                 vo.setDeliveryDate(line.getDeliveryDate());
                 vo.setAssessmentExceedsAgreement(line.getAssessmentExceedsAgreement());
-                vo.setSalesPrice(line.getSalesPrice().toPlainString());
+                if (line.getSalesPrice() != null) {
+                    vo.setSalesPrice(line.getSalesPrice().toPlainString());
+                }
                 vo.setPriceListNo(purchaseOrderInfo.getPriceListNo());
-                vo.setPackagingFee(line.getPackagingFee().toPlainString());
+                if (line.getPackagingFee() != null) {
+                    vo.setPackagingFee(line.getPackagingFee().toPlainString());
+                }
                 vo.setInvoicingStatus(purchaseOrderInfo.getInvoicingStatus());
                 vo.setPieceWeightHeader(purchaseOrderInfo.getPieceWeightHeader());
                 vo.setSurface(purchaseOrderInfo.getSurface());

@@ -74,7 +74,7 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
     @Override
     public OrderDetailReport findById(String id) {
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增订单明细，ID：{}", params = {"#id"})

@@ -15,10 +15,19 @@ import java.util.List;
  */
 public interface OrderDetailReportMapper extends BaseMapper<OrderDetailReport> {
 
-	/**
+    /**
      * 查询列表
+     *
      * @param vo
      * @return
      */
     List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @return OrderDetailReport
+     */
+    OrderDetailReport findById(@Param("id") String id);
 }

@@ -38,7 +38,7 @@
         <result column="performance" property="performance"/>
         <result column="packaging" property="packaging"/>
         <result column="remarks" property="remarks"/>
-        <result column="shipping_fee" property="shippingFee"/>
+        <result column="shipping_cost" property="shippingCost"/>
         <result column="return_shipping_cost" property="returnShippingCost"/>
         <result column="customer_type" property="customerType"/>
         <result column="quality" property="quality"/>
@@ -91,7 +91,7 @@
             tb.performance,
             tb.packaging,
             tb.remarks,
-            tb.shipping_fee,
+            tb.shipping_cost,
             tb.return_shipping_cost,
             tb.customer_type,
             tb.quality,
@@ -109,9 +109,93 @@
         left join base_data_workshop as ws on ws.id = tb.workshop_id
     </sql>
 
-    <select id="query" resultMap="OrderDetailReport">
+<!--    <select id="query" resultMap="OrderDetailReport">-->
+<!--        <include refid="OrderDetailReport_sql"/>-->
+<!--        <where>-->
+<!--            <if test="vo.purchaseOrderLineId != null and vo.purchaseOrderLineId != ''">-->
+<!--                AND tb.purchase_order_line_id = #{vo.purchaseOrderLineId}-->
+<!--            </if>-->
+<!--            <if test="vo.orderNo != null and vo.orderNo != ''">-->
+<!--                AND tb.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')-->
+<!--            </if>-->
+<!--            <if test="vo.workshopId != null and vo.workshopId != ''">-->
+<!--                AND tb.workshop_id = #{vo.workshopId}-->
+<!--            </if>-->
+<!--            <if test="vo.deptName != null and vo.deptName != ''">-->
+<!--                AND tb.dept_name LIKE CONCAT('%', #{vo.deptName}, '%')-->
+<!--            </if>-->
+<!--            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">-->
+<!--                AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.OrderDetailReport">
         <include refid="OrderDetailReport_sql"/>
         <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
+
+    <select id="query" resultMap="OrderDetailReport">
+        SELECT *
+        FROM (
+        SELECT
+        tb.id,
+        tb.purchase_order_line_id,
+        tb.order_no,
+        tb.order_date,
+        tb.workshop_id,
+        ws.name AS workshop_name,
+        tb.dept_name,
+        tb.region_name,
+        tb.ordering_unit_name,
+        tb.industry,
+        tb.brand,
+        tb.thickness,
+        tb.thickness_tol_pos,
+        tb.thickness_tol_neg,
+        tb.width,
+        tb.width_tol_pos,
+        tb.width_tol_neg,
+        tb.length,
+        tb.length_tol_pos,
+        tb.length_tol_neg,
+        tb.status,
+        tb.quantity,
+        tb.suggested_price,
+        tb.delivery_date,
+        tb.assessment_exceeds_agreement,
+        tb.sales_price,
+        tb.price_list_no,
+        tb.packaging_fee,
+        tb.invoicing_status,
+        tb.piece_weight_header,
+        tb.surface,
+        tb.tolerance,
+        tb.performance,
+        tb.packaging,
+        tb.remarks,
+        tb.shipping_cost,
+        tb.return_shipping_cost,
+        tb.customer_type,
+        tb.quality,
+        tb.contract_type,
+        tb.stock_up_company_name,
+        tb.order_type,
+        tb.show_order,
+        tb.create_by_id,
+        tb.create_by,
+        tb.update_by_id,
+        tb.update_by,
+        tb.create_time,
+        tb.update_time,
+        MAX(tb.create_time) OVER (PARTITION BY tb.order_no, tb.purchase_order_line_id) AS group_latest_time
+        FROM order_detail_report tb
+        LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id
+        <where>
             <if test="vo.purchaseOrderLineId != null and vo.purchaseOrderLineId != ''">
                 AND tb.purchase_order_line_id = #{vo.purchaseOrderLineId}
             </if>
@@ -121,12 +205,18 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
-            <if test="vo.deptName != null and vo.deptName != ''">
+            <if test="vo.deptName != null and vo.dedeptName != ''">
                 AND tb.dept_name LIKE CONCAT('%', #{vo.deptName}, '%')
             </if>
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
                 AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
             </if>
         </where>
+        ) t
+        ORDER BY
+        t.group_latest_time DESC,
+        t.order_no ASC,
+        t.purchase_order_line_id ASC,
+        t.show_order ASC
     </select>
 </mapper>