Merge remote-tracking branch 'origin/master'

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

@@ -105,6 +105,11 @@ public class StatisticalReportController extends BaseRESTfulController {
         }
         mapValue.put("orderTypee",orderType);
         mapValue.put("shipperId",shipperId);
+        if(orderType==1 && mapValue.get("orderField")==null){
+            //如果没有使用排序且查询的表格类型为销售钢材内部专用表格，默认规格排序
+            mapValue.put("orderField","materialCode");
+            mapValue.put("orderType","desc");
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getAllSaleReport(mapValue);

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

@@ -290,6 +290,16 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         //获取子表数据
         List<Map<String,Object>> mapList = statisticalReportMapper.getSteelReportDetailsListBySmId(saleOrderMaterialId);
         if (map != null){
+            if(DataChange.dataToBigDecimal(map.get("orderStatu")).intValue() == 5 && map.get("queueStartTime") != null && DataChange.dataToBigDecimal(map.get("lineSqe")).intValue() == 0){
+                map.put("orderStatus","排队中");
+                map.put("orderStatusTime",map.get("queueStartTime"));
+            }else if(DataChange.dataToBigDecimal(map.get("orderStatu")).intValue() == 5 && DataChange.dataToBigDecimal(map.get("lineSqe")).intValue() != 0 && map.get("outGateTime") == null){
+                map.put("orderStatus","已进厂");
+                map.put("orderStatusTime",map.get("entryGateTime"));
+            }else if(DataChange.dataToBigDecimal(map.get("orderStatu")).intValue() == 5 && map.get("outGateTime") != null){
+                map.put("orderStatus","已出厂");
+                map.put("orderStatusTime",map.get("outGateTime"));
+            }
             map.put("mapList",mapList);
         }
         return map;

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -2314,6 +2314,7 @@
         OO.DRIVER_TEL "capacityTel",
         TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
         TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+        QQR.RESULT_START_TIME       "queueStartTime",
         TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
         TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
         ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
@@ -2324,8 +2325,9 @@
         2,'销售已提交',
         4,'财务已审批',
         0,'销售订单未上报') "saleOrderStatus",
-        DECODE(OO.ORDER_STATUS ,2,'已完成',4,'已派发',5,'已接收',0,'未派发',7,'已关闭',8,'已关闭')
-        "orderStatus"
+        DECODE(nvl(OO.ORDER_STATUS,0) ,2,'已完成',4,'已派发',5,'已接收',0,'未派发',7,'已关闭',8,'已关闭')
+        "orderStatus",
+        oo.ORDER_STATUS "orderStatu"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
@@ -2350,6 +2352,8 @@
         ON RCA.CAPACITY_ID = OO.CAPACITY_ID
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN QMS_QUEUE_RESULT QQR
+        ON QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR