liyg 2 năm trước cách đây
mục cha
commit
35bf60bb36

+ 1 - 0
src/main/java/com/steerinfo/dil/controller/TmstruckLoadResultController.java

@@ -177,6 +177,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return failed("装货异常,请联系管理员!");
             }
         } catch (Exception e) {
+            e.printStackTrace();
             System.out.println(e.getMessage());
         }
         return failed("装货异常,请联系管理员!");

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -2425,7 +2425,7 @@
                                LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2 ON RAS2.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
                                LEFT JOIN RMS_CONSIGNEE RC ON ASO.receive_id = RC.CONSIGNEE_ID
                                LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-                               LEFT JOIN omstruck_order oo ON oo.order_plan_id = asom.sale_order_material_id
+                               LEFT JOIN omstruck_order oo ON oo.order_plan_id = asom.sale_order_material_id AND OO.ORDER_STATUS IN (2,4,5)
                                LEFT JOIN ams_dispatch_sale_order adso ON adso.sale_order_material_id = asom.sale_order_material_id
                                LEFT JOIN rms_carrier r_carrier ON r_carrier.carrier_id = 3642
                                LEFT JOIN rms_capacity r_cap ON r_cap.capacity_id = oo.capacity_id