修改

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

@@ -145,4 +145,7 @@ public interface UtilsMapper {
 
     //修改显示抵达签收
     int updateArrival(Map<String,Object> map);
+
+    BigDecimal getOrderType(String orderNumber);
+
 }

src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java

@@ -337,6 +337,9 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             //运单实际状态筛选
             Map<String,Object> filterorderStatusActuallyMap = new HashMap<>();
             filterorderStatusActuallyMap.put("text",stringObjectMap.get("orderStatusActually"));
+            if("已派单".equals(stringObjectMap.get("orderStatusActually"))) {
+                filterorderStatusActuallyMap.put("text","已派单(未接收)");
+            }
             filterorderStatusActuallyMap.put("value",stringObjectMap.get("orderStatusActually"));
             filterorderStatusActually.add(filterorderStatusActuallyMap);
             //收货地址筛选

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -284,6 +284,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", true);
             }
         }
+        try {
+            addMeasureCommission(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         measureCommission.put("orderType",1);
         System.out.println(measureCommission);
         return sendMesToMeasure(measureCommission);

src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -426,7 +426,13 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
             }
             //计算完成
             Map<String, Object> orderMes = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
-            BigDecimal orderType =DataChange.dataToBigDecimal(orderMes.get("orderType"));
+            BigDecimal orderTypeNew = utilsMapper.getOrderType(orderNumber);
+            BigDecimal orderType = new BigDecimal(21);
+            if(orderMes != null) {
+                orderType = DataChange.dataToBigDecimal(orderMes.get("orderType"));
+            }else{
+                orderType = orderTypeNew;
+            }
             if (orderType.intValue()==21) {
                 //生成计时计费详单
                 genernateInwardTime(map);

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

@@ -1981,7 +1981,7 @@
                     ELSE
                         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
                         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
-                    END) || ASOM.SALE_ORDER_CONSIGNEE_TEL  "addressPlace",
+                    END)   "addressPlace",
                     RRP.PLACE_ID "placeId",
                     RRP.ADDRESS_DELIVERY_ADDRESS "place",
                     RRA.ADDRESS_ID "shipperAddressId",
@@ -2027,6 +2027,7 @@
                     THEN TWR.RESULT_NET_WEIGHT
                     WHEN ASM.IS_POUND_SALE = 1 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
                     THEN ASM.MATERIAL_WEIGHT
+                    ELSE ASM.MATERIAL_WEIGHT
                     END) "materialThoWeight",
                     R_CARRIER.CARRIER_ID        "carrierId",
                     (CASE WHEN
@@ -4214,7 +4215,7 @@
         T5."truckThoWeight",
         T4."trainWeight",
         T6."trainThoWeight",
-        T1."unloadThoWeight"
+        T5."unloadThoWeight"
         FROM
         (SELECT DISTINCT
         ASM.TRANSFER_OUT_OF_WAREHOUSE "target",
@@ -4248,12 +4249,7 @@
         COUNT(DISTINCT OO_UN_RECEIVE.ORDER_ID) "unReceiveNum",--未接收数量
         COUNT(DISTINCT OO_EN .ORDER_ID) "EnNum",--进场待装数量
         SUM(TWR.RESULT_NET_WEIGHT) "totalNet",--总净重
-        SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight",
-        SUM(CASE WHEN
-        TWR.RESULT_NET_WEIGHT IS NULL
-        THEN ASM.MATERIAL_WEIGHT
-        ELSE 0
-        END) "unloadThoWeight"
+        SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4515,7 +4511,12 @@
         THEN TWR.RESULT_NET_WEIGHT
         WHEN ASM.IS_POUND_SALE = 1 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
-        END) "truckThoWeight"
+        END) "truckThoWeight",
+        SUM(CASE WHEN
+        TWR.RESULT_NET_WEIGHT IS NULL
+        THEN ASM.MATERIAL_WEIGHT
+        ELSE 0
+        END) "unloadThoWeight"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4536,6 +4537,7 @@
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
+        AND OO.CAPACITY_ID!=35128
         AND NVL(OO.ORDER_TYPE,0) IN(0,1)
         AND ASM.SALE_MATERIAL_ID IS NOT NULL
         AND ASM.SALE_ORDER_ID != -1
@@ -4562,7 +4564,7 @@
         T5."truckThoWeight",
         0 "trainWeight",
         0 "trainThoWeight",
-        T1."unloadThoWeight"
+        T5."unloadThoWeight"
         FROM
         (
         --查询自提
@@ -4579,12 +4581,7 @@
         COUNT(DISTINCT OO_RECEIVED.ORDER_ID) "receivedNum",--已接单数量
         COUNT(DISTINCT OO_UN_RECEIVE.ORDER_ID) "unReceiveNum",--未接收数量
         SUM(TWR.RESULT_NET_WEIGHT) "totalNet",--总净重
-        SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight",
-        SUM(CASE WHEN
-        TWR.RESULT_NET_WEIGHT IS NULL
-        THEN ASM.MATERIAL_WEIGHT
-        ELSE 0
-        END) "unloadThoWeight"
+        SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4772,7 +4769,12 @@
         THEN TWR.RESULT_NET_WEIGHT
         WHEN ASM.IS_POUND_SALE = 1 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
-        END) "truckThoWeight"
+        END) "truckThoWeight",
+        SUM(CASE WHEN
+        TWR.RESULT_NET_WEIGHT IS NULL
+        THEN ASM.MATERIAL_WEIGHT
+        ELSE 0
+        END) "unloadThoWeight"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4793,6 +4795,7 @@
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
+        AND OO.CAPACITY_ID!=35128
         AND NVL(OO.ORDER_TYPE,0) IN(0,1)
         AND ASM.SALE_MATERIAL_ID IS NOT NULL
         AND ASM.SALE_ORDER_ID != -1

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

@@ -404,4 +404,9 @@
         SELECT OO.ORDER_LINE_SEQUENCE FROM OMSTRUCK_ORDER OO
         where oo.ORDER_ID = #{orderId}
     </select>
+    <select id="getOrderType" resultType="java.math.BigDecimal" parameterType="string">
+        SELECT OO.ORDER_TYPE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+        FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>