Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -732,6 +732,17 @@ public class StatisticalReportController extends BaseRESTfulController {
                 }
                 stringObjectMap.put("capacityNo",capacityNumber);
             }
+            /*try{
+                BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
+                if (orderId !=null){
+                    String status = statisticalReportService.getStatus(orderId);
+                    if (!(" ".equals(status))){
+                        stringObjectMap.put("orderStatus",status);
+                    }
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }*/
         }
         return success(report);
     }

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

@@ -93,4 +93,7 @@ public interface StatisticalReportMapper {
 
     List<Map<String, Object>> loadingSaleSteelReport(Map<String, Object> map);
 
+    //获得进出厂状态
+    String getStatus(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/IStatisticalReportService.java

@@ -86,5 +86,8 @@ public interface IStatisticalReportService {
 
 
     List<Map<String, Object>> loadingSaleSteelReport(Map<String, Object> map);
+
+    //获得是否进出厂的状态
+    String getStatus(BigDecimal orderId);
 }
 

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

@@ -324,4 +324,9 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         List<Map<String, Object>> saleSteelReport = statisticalReportMapper.loadingSaleSteelReport(map);
         return saleSteelReport;
     }
+
+    @Override
+    public String getStatus(BigDecimal orderId) {
+        return statisticalReportMapper.getStatus(orderId);
+    }
 }

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

@@ -1958,7 +1958,17 @@
                                                  2,'销售已提交',
                                                  4,'财务已审批',
                                                  0,'销售订单未上报') "saleOrderStatus",
-                    DECODE(OO.ORDER_STATUS ,2,'作业已完成',4,'物流公司已派单',5,'司机已接单',0,'未派发',7,'已关闭',8,'已关闭')
+                    (CASE
+                    WHEN TRR.INSERT_TIME IS NOT NULL
+                    THEN '已完成'
+                    WHEN TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+                    THEN '已出厂'
+                    WHEN TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
+                    THEN '已进厂'
+                    WHEN TER.INSERT_TIME IS NULL
+                    THEN ' '
+                    WHEN TLFR.INSERT_TIME IS NULL THEN ' '
+                    END)
                                                                   "orderStatus"
                     FROM AMS_SALE_ORDER ASO
                     LEFT JOIN RMS_CONSIGNEE RC
@@ -2710,4 +2720,26 @@
         )
     </select>
 
+    <select id="getStatus" resultType="java.lang.String">
+        select
+        CASE
+        WHEN TLFR.INSERT_TIME IS NOT NULL
+        THEN '已出厂'
+        WHEN TER.INSERT_TIME IS NOT NULL
+        THEN '已进厂'
+        WHEN TER.INSERT_TIME IS NULL
+        THEN ' '
+        WHEN TLFR.INSERT_TIME IS NULL THEN ' ' end
+        END
+        "status"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_ID=#{orderId}
+    </select>
+
 </mapper>