2021年12月17日13:47:19

src/main/java/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.java

@@ -57,6 +57,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     Map<String, Object> getBillOrder(String orderNumber);
 
     List<Map<String, Object>> getBillOrderMaterial(String orderNumber);
+
 //    通过运输订单获取零星物资进厂实绩
     List<Map<String, Object>> getSporadicSuppliesEnFactoryResult(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -71,8 +71,10 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
     Map<String, BigDecimal> selectByOrderId(BigDecimal orderId);
+
 //    根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getSporadicSuppliesJiPiResult(Map<String, Object> map);
+
 //    根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getSporadicSuppliesJiMiaoResult(Map<String, Object> map);
 }

src/main/resources/bootstrap.yml

@@ -122,8 +122,8 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8008
-#  port: 8088
+#  port: 8008
+  port: 8088
 
 
 

src/main/resources/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.xml

@@ -1233,39 +1233,31 @@
         select *
         from (
         select TER.RESULT_ID "resultId",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        RS1.SUPPLIER_NAME "supplierName",
-        RS2.SHIPPER_NAME "shipperName",
-        RC.CARRIER_NAME "carrierName",
-        RG.GATEPOST_NAME "gatepostName",
-        TER.RESULT_ENTRY_MODE "resultEntryMode",
-        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
-        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
-
+               OO.ORDER_ID      "orderId",
+                OO.ORDER_NUMBER "orderNumber",
+                RS1.SUPPLIER_NAME "sendCompany",
+                RS2.SUPPLIER_NAME "receiveCompany",
+                RC.CARRIER_NAME "carrierName",
+                RG.GATEPOST_NAME "gatepostName",
+                TER.RESULT_ENTRY_MODE "resultEntryMode",
+                TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime"
         from TMSTRUCK_ENFACTORY_RESULT TER
         left join TMSTRUCK_TOTAL_RESULT TTR
-        on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
-        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
-        ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN RMS_SUPPLIER RS1
-        ON RS1.SUPPLIER_ID = TLR.LOADING_ID
-        LEFT JOIN RMS_SHIPPER RS2
-        ON RS2.SHIPPER_ID = TUR.RESULT_UNLOAD_PLACE_ID
+            on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
-        on TTR.ORDER_ID = OO.ORDER_ID
+            on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+            on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+        LEFT JOIN RMS_SUPPLIER RS1
+        ON RS1.SUPPLIER_ID = ASO.SEND_UNIT_ID
+        LEFT JOIN RMS_SUPPLIER RS2
+        ON RS2.SUPPLIER_ID = ASO.RECEIVE_UNIT_ID
         left join RMS_CARRIER RC
-        on RC.CARRIER_ID = OO.CAPACITY_ID
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on OOM.ORDER_ID = OO.ORDER_ID
-        left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        on RC.CARRIER_ID = ASO.CARRIER_ID
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TER.GATEPOST_ID
         where TER.RESULT_ENTRY_GATE_TIME is not null
-        and OO.ORDER_TYPE = 12
+        and OO.ORDER_TYPE in (12, 13)
         )
         <where>
             <if test="materialName != null">

src/main/resources/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.xml

@@ -891,14 +891,14 @@
     SELECT *
     FROM (
     SELECT TUR.RESULT_ID             "resultId",
-    OO.ORDER_NUMBER           "orderNumber",
-    RC.CARRIER_NAME        "carrierName",
-    RM.MATERIAL_NAME          "materialName",
-    OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-    TUR.RESULT_START_TIME     "resultStartTime",
-    TUR.RESULT_END_TIME       "resultEndTime",
-    TUR.RESULT_DURATION       "resultDuration",
-    RW.WAREHOUSE_NAME         "warehouseName"
+            OO.ORDER_NUMBER           "orderNumber",
+            RC.CARRIER_NAME        "carrierName",
+            RM.MATERIAL_NAME          "materialName",
+            OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+            TUR.RESULT_START_TIME     "resultStartTime",
+            TUR.RESULT_END_TIME       "resultEndTime",
+            TUR.RESULT_DURATION       "resultDuration",
+            RW.WAREHOUSE_NAME         "warehouseName"
     FROM TMSTRUCK_UNLOAD_RESULT TUR
     LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
     ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -2278,18 +2278,18 @@
         select *
         from (
         select
-        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.SPORADIC_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CARRIER_NAME "carrierName",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
-        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        RS.SUPPLIER_NAME "supplierName",
-        RCON.SHIPPER_NAME "consigneeCompanyName",
-        OO.ORDER_ID "orderId",
-        OO.ORDER_STATUS "orderStatus"
+                TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+                APO.SPORADIC_ORDER_NO "purchaseOrderNo",
+                RM.MATERIAL_NAME "materialName",
+                OO.ORDER_NUMBER "orderNumber",
+                RC.CARRIER_NAME "carrierName",
+                RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+                TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+                TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+                RS.SUPPLIER_NAME "supplierName",
+                RCON.SHIPPER_NAME "consigneeCompanyName",
+                OO.ORDER_ID "orderId",
+                OO.ORDER_STATUS "orderStatus"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID