修改

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

@@ -3312,7 +3312,8 @@
                            OO.ORDER_NUMBER  "orderNo",
                            oo.ORDER_STATUS "orderStatus",
                            OO.OPTIONER_CODE "optionCode",
-                           TWR.RESULT_NET_WEIGHT    "netWeight"
+                           TWR.RESULT_NET_WEIGHT    "netWeight",
+                           aso.BUSINESS_TYPE    "inwardSteelType"
                        FROM
                            AMS_SALE_ORDER ASO
                                LEFT JOIN AMS_SALE_MATERIAL ASM ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
@@ -3370,6 +3371,9 @@
         <if test="materialName != null">
             and RM.MATERIAL_NAME like '%${materialName}%'
         </if>
+        <if test="inwardSteelType != null">
+            and aso.BUSINESS_TYPE like '%${inwardSteelType}%'
+        </if>
         ORDER BY
         ASO.SALE_ORDER_ID DESC,
         oo.ORDER_ID DESC)
@@ -3428,6 +3432,7 @@
         NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
         OO.ORDER_STATUS              "carStatus",
         ACTP.PRICE_VALUE            "priceValue",
+        ASOM.TRUCK_REMARK           "truckRemark",
         DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
         2,'销售已提交',
         4,'财务已审批',
@@ -4176,8 +4181,7 @@
         NVL("numCang",0) "numCang",
         NVL("totalNet",0) "totalNet",
         NVL("materialThoWeight",0) "materialThoWeight",
-        decode("target",'钢材达州组',1,'钢材万州组',2,'钢材南充组',3,'钢材西安组',4,'钢材重庆组',5,'钢材成都组',6,'钢材工程组',7,
-        '钢材广安组',8,'钢材巴中组',9,10) "no"
+        decode("target",'钢材达州组',1,'钢材万州组',2,'钢材南充组',3,'钢材巴中组',4,'钢材广安组',5,'钢材武汉组',6,'钢材西安组',7,'钢材重庆组',8,'钢材成都组',9,'钢材工程组',10,11) "no"
         FROM
         (
         --查询非自提
@@ -4185,9 +4189,9 @@
         T1."planNum",T1."orderNum",T1."quxiaoNum",
         T1."planNum"-"orderNum" "notSendNum",
         T1."notEnNum",T1."EnNum",
-        T1."receivedNum",
         T1."enFactoryNum",
         T1."queueNum",
+        T1."receivedNum",
         T1."unReceiveNum",
         T2 ."num" "numGong" ,T3 ."num" "numCang",
         T1."totalNet",
@@ -4440,7 +4444,6 @@
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .ORDER_ID = OO .ORDER_ID
         WHERE TTR.ORDER_STATUS = '已派单'
-
         AND OO.CAPACITY_ID!=35128
         AND OO . ORDER_TYPE= 1
         ) OO_UN_RECEIVE ON OO_UN_RECEIVE.ORDER_ID = OO.ORDER_ID
@@ -4451,7 +4454,6 @@
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .ORDER_ID = OO .ORDER_ID
         WHERE TTR.ORDER_STATUS = '已接单'
-
         AND OO.CAPACITY_ID!=35128
         AND OO . ORDER_TYPE= 1
         ) OO_RECEIVED ON OO_RECEIVED.ORDER_ID = OO.ORDER_ID
@@ -4462,7 +4464,6 @@
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .ORDER_ID = OO .ORDER_ID
         WHERE TTR.ORDER_STATUS = '排队中'
-
         AND OO.CAPACITY_ID!=35128
         AND OO . ORDER_TYPE= 1
         ) OO_QUEUE ON OO_QUEUE.ORDER_ID = OO.ORDER_ID
@@ -4473,7 +4474,6 @@
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .ORDER_ID = OO .ORDER_ID
         WHERE TTR.ORDER_STATUS = '已进厂'
-
         AND OO.CAPACITY_ID!=35128
         AND OO . ORDER_TYPE= 1
         ) OO_ENFACTORY ON OO_ENFACTORY.ORDER_ID = OO.ORDER_ID