xiuhga

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -872,16 +872,16 @@ public class StatisticalReportController extends BaseRESTfulController {
             if(areaName==null || areaName.equals("") || speNum >= 7 || speNum <=0){
                 continue;
             }
-            if(areaName.contains("重庆")){
+            if(areaName.contains("重庆组")){
                 spellingData.get(speNum-1).put("chongQinSpellingData",total + Integer.parseInt(spellingData.get(speNum-1).get("chongQinSpellingData").toString()));
                 spellingData.get(speNum-1).put("AllSpellingData",total+(int) spellingData.get(speNum-1).get("AllSpellingData"));
-            }else if(areaName.contains("成都")){
+            }else if(areaName.contains("成都组")){
                 spellingData.get(speNum-1).put("chengDuSpellingData",total + Integer.parseInt(spellingData.get(speNum-1).get("chengDuSpellingData").toString()));
                 spellingData.get(speNum-1).put("AllSpellingData",total+(int) spellingData.get(speNum-1).get("AllSpellingData"));
-            }else if(areaName.contains("工程")){
+            }else if(areaName.contains("工程组")){
                 spellingData.get(speNum-1).put("gongChengSpellingData",total + Integer.parseInt(spellingData.get(speNum-1).get("gongChengSpellingData").toString()));
                 spellingData.get(speNum-1).put("AllSpellingData",total+(int) spellingData.get(speNum-1).get("AllSpellingData"));
-            }else if(areaName.contains("达州组") || areaName.contains("南充") || areaName.contains("广安组") || areaName.contains("万州组") || areaName.contains("西安")){
+            }else if(areaName.contains("达州组") || areaName.contains("南充组") || areaName.contains("广安组") || areaName.contains("万州组") || areaName.contains("西安组")){
                 spellingData.get(speNum-1).put("chaungDongSpellingData",total + Integer.parseInt(spellingData.get(speNum-1).get("chaungDongSpellingData").toString()));
                 spellingData.get(speNum-1).put("AllSpellingData",total+(int) spellingData.get(speNum-1).get("AllSpellingData"));
             }else if(areaName.contains("自提")) {

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

@@ -2022,10 +2022,11 @@
                         end)      "isContinue",
                     aso.BUSINESS_DATE           "insertUploadTime",
                     (CASE WHEN
-                        ASM.IS_POUND_SALE = 0
-                        THEN NULL
-                        else ASM.MATERIAL_WEIGHT
-                        END) "materialThoWeight",
+                    ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+                    THEN TWR.RESULT_NET_WEIGHT
+                    WHEN ASM.IS_POUND_SALE = 1 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+                    THEN ASM.MATERIAL_WEIGHT
+                    END) "materialThoWeight",
                     R_CARRIER.CARRIER_ID        "carrierId",
                     (CASE WHEN
                         RCA.CAPACITY_NUMBER = '空白'
@@ -2398,16 +2399,16 @@
         and asm.SALE_ORDER_ID != -1
         <if test="startTime != null">
             and (to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
-            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{startDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
             AND NVL(ASOM.WARRANTY_NUMBER,0) = 0
             or
             to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
-            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{startDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
             AND NVL(ASOM.WARRANTY_NUMBER,0) = 1
             AND ASOM.PREVIOUS_ORDER_NUMBER IS NOT NULL
             OR
             to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
-            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{startDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
             AND NVL(ASOM.WARRANTY_NUMBER,0) = 1
             AND ASOM.PREVIOUS_ORDER_NUMBER IS  NULL)
         </if>
@@ -4190,6 +4191,7 @@
         NVL("truckNetWeight",0) "totalNet",
         NVL("truckThoWeight",0) "materialThoWeight",
         NVL("trainWeight",0)   "trainWeight",
+        Nvl("trainThoWeight",0) "trainThoWeight",
         decode("target",'钢材达州组',1,'钢材万州组',2,'钢材南充组',3,'钢材巴中组',4,'钢材广安组',5,'钢材武汉组',6,'钢材西安组',7,'钢材重庆组',8,'钢材成都组',9,'钢材工程组',10,11) "no"
         FROM
         (
@@ -4205,7 +4207,8 @@
         T2 ."num" "numGong" ,T3 ."num" "numCang",
         T5."truckNetWeight",
         T5."truckThoWeight",
-        T4."trainWeight"
+        T4."trainWeight",
+        T6."trainThoWeight"
         FROM
         (
         SELECT
@@ -4435,12 +4438,55 @@
         ) T4 ON T1 ."target" = T4."target" AND T1."carrierName" = 	T4."carrierName"
         LEFT JOIN
         (
+        --查询车皮理重
+        SELECT
+        '钢材工程组' "target",--方向
+        '达运' "carrierName",--承运商
+        SUM( CASE WHEN
+        TWR.RESULT_NET_WEIGHT IS NOT NULL
+        THEN ASM.MATERIAL_WEIGHT
+        ELSE 0
+        END) "trainThoWeight"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
+        WHERE
+        aso.DELETED = 0
+        AND aso.SALE_ORDER_STATUS = 4
+        AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
+        AND ASO.SALE_TYPE = 4
+        AND NVL(OO.ORDER_TYPE,0) IN(0,4)
+        AND ASM.SALE_MATERIAL_ID IS NOT NULL
+        AND ASM.SALE_ORDER_ID != -1
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASO.insert_time,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASO.insert_time,'yyyy-mm-dd'),'yyyy-mm-dd')
+            AND (NVL(ASOM.WARRANTY_NUMBER,0) = 0
+            or (NVL(ASOM.WARRANTY_NUMBER,0) = 1 and asom.PREVIOUS_ORDER_NUMBER is null))
+        </if>
+        GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
+        ) T6 ON T1 ."target" = T6."target" AND T1."carrierName" = 	T6."carrierName"
+        LEFT JOIN
+        (
         --查询净重、理重
         SELECT
         ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
         RC.CARRIER_ABBREVIATION "carrierName",--承运商
         SUM( TWR.RESULT_NET_WEIGHT) "truckNetWeight",
-        SUM(ASM.MATERIAL_WEIGHT) "truckThoWeight"
+        SUM(CASE WHEN
+        ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+        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"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4457,7 +4503,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        nvl(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
@@ -4485,7 +4531,8 @@
         T3 ."num" "numCang",
         T5."truckNetWeight",
         T5."truckThoWeight",
-        0 "trainWeight"
+        0 "trainWeight",
+        0 "trainThoWeight"
         FROM
         (
         --查询自提
@@ -4685,7 +4732,12 @@
         ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
         '本地自提' "carrierName",--承运商
         SUM( TWR.RESULT_NET_WEIGHT) "truckNetWeight",
-        SUM(ASM.MATERIAL_WEIGHT) "truckThoWeight"
+        SUM(CASE WHEN
+        ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+        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"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4702,7 +4754,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        nvl(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
@@ -4743,7 +4795,8 @@
         nvl(T2 ."num",0) "numGong" ,nvl(T3 ."num",0) "numCang",
         nvl(T5."truckNetWeight",0) "totalNet",
         nvl(T5."truckThoWeight",0) "materialThoWeight",
-        nvl(T4."trainWeight",0) "trainWeight"
+        nvl(T4."trainWeight",0) "trainWeight",
+        nvl(T6."trainThoWeight",0) "trainThoWeight"
         FROM
         (
         SELECT
@@ -4952,7 +5005,12 @@
         '月合计' "target",--方向
         '月合计' "carrierName",--承运商
         SUM( TWR.RESULT_NET_WEIGHT) "truckNetWeight",
-        SUM(ASM.MATERIAL_WEIGHT) "truckThoWeight"
+        SUM(CASE WHEN
+        ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+        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"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4981,5 +5039,40 @@
             and to_date(#{endMonthTime}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
         ) T5 ON T1 ."target" = T5."target" AND T1."carrierName" = 	T5."carrierName"
+        LEFT JOIN
+        (
+        --查询车皮理重
+        SELECT
+        '月合计' "target",--方向
+        '月合计' "carrierName",--承运商
+        SUM( CASE WHEN
+        TWR.RESULT_NET_WEIGHT IS NOT NULL
+        THEN ASM.MATERIAL_WEIGHT
+        ELSE 0
+        END) "trainThoWeight"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
+        WHERE
+        aso.DELETED = 0
+        AND aso.SALE_ORDER_STATUS = 4
+        AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
+        AND ASO.SALE_TYPE = 4
+        AND NVL(OO.ORDER_TYPE,0) IN(0,4)
+        AND ASM.SALE_MATERIAL_ID IS NOT NULL
+        AND ASM.SALE_ORDER_ID != -1
+        <if test="startMonthTime != null">
+            and to_date(#{startMonthTime}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASO.insert_time,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{endMonthTime}, 'yyyy-mm-dd') >=  to_date(to_char(ASO.insert_time,'yyyy-mm-dd'),'yyyy-mm-dd')
+        </if>
+        ) T6 ON T1 ."target" = T6."target" AND T1."carrierName" = 	T6."carrierName"
     </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout