Merge remote-tracking branch 'origin/master'

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

@@ -663,7 +663,8 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           String capacityNo,
                                           String carrierName,
                                           String consigneeName,
-                                          String saler
+                                          String saler,
+                                          String easPrimaryId
     ){
         DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         if(carrierSsoId != null){
@@ -689,6 +690,9 @@ public class StatisticalReportController extends BaseRESTfulController {
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
             map.put("salers",saler);
         }
+        if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {
+            map.put("easPrimaryId",easPrimaryId);
+        }
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getSaleSteelReport(map);
         for (Map<String, Object> stringObjectMap : report) {

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

@@ -261,7 +261,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     parem.put("turnOf","0");
                     otmsFeign.createTotalResult(parem);*/
                     // 调用结算
-                    bmsTruckFeign.addDetailsOrder(orderId);
+                    try {
+                        bmsTruckFeign.addDetailsOrder(orderId);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }catch (Exception ex){
                     System.out.println(ex.getMessage());
                 }
@@ -280,7 +284,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 if (closeStatus != null && DataChange.dataToBigDecimal(closeStatus).intValue() == 0) {
                     amsFeign.dispatchTruckOrderByCarrier(mapValue);
                 }
-                bmsTruckFeign.addDetailsOrder(orderId);
+                try {
+                    bmsTruckFeign.addDetailsOrder(orderId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 break;
             case 4:
                 i += utilsService.closeOrderNormally(map);

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

@@ -86,7 +86,7 @@
                             on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                        left join RMS_CONSIGNEE RCON
                             on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-              where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
+              where OO.ORDER_STATUS in (5,2)
                 and OO.ORDER_TYPE = #{orderTypee}
                 <if test="oneDate != null">
                     and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
@@ -239,8 +239,7 @@
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         left join RMS_CONSIGNEE RCON
         on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-
-        where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
+        where OO.ORDER_STATUS in (5, 2)
         and OO.ORDER_TYPE = #{orderTypee}
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
@@ -550,6 +549,7 @@
                 on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
         where OO.ORDER_TYPE = 12
+        and OO.ORDER_STATUS IN (2,5)
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
@@ -644,6 +644,7 @@
             on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
         where OO.ORDER_TYPE = 13
+        and oo.ORDER_STATUS in (2,5)
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
@@ -718,11 +719,13 @@
            twr4.result_tare_weight       "tareWeightSecond",
            twr4.result_tare_weight_time  "tareWeightTimeSecond",
            twr4.result_net_weight        "netWeightSecond",
+           twr4.RESULT_POUND_NO          "poundNo",
            rtc4.truck_calculate_number   "tareTruckCalculateSecond",
            tlfr2.result_out_gate_time    "outGatepostTimeSecond",
            tlfr2.result_out_gate_time    "resultOutGateTime",
            tlfr2.result_out_mode         "outModeSecond",
-           rg4.gatepost_name             "gatepostNameSecond"
+           rg4.gatepost_name             "gatepostNameSecond",
+           apo.EAS_ENTRY_ID              "easPrimaryId"
       from omstruck_order oo
       left join omstruck_order_material oom
         on oom.order_id = oo.order_id
@@ -1943,6 +1946,7 @@
                     TAR.INSERT_TIME "arrivalTime",
                     TRR.INSERT_TIME "receiptTime",
                     DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
+                    decode(TSR.RESULT_ID,null,'未发送','已发送')  "smsResultId",
                     DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                                  2,'销售已提交',
                                                  4,'财务已审批',
@@ -1995,6 +1999,8 @@
                               ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                     LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
                               ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
+                    LEFT JOIN TMSTRUCK_SMS_RUSULT TSR
+                              ON TSR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
                     WHERE ASO.SALE_TYPE = 1
                           AND ASO.DELETED = 0
                           and ASM.SALE_MATERIAL_ID IS NOT NULL
@@ -2014,6 +2020,9 @@
                     <if test="salers != null">
                         and RSR.SALER_NAME = #{salers}
                     </if>
+                    <if test="easPrimaryId != null">
+                        and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
+                    </if>
                     <if test="capacityNum != null">
                         and  RCA.CAPACITY_NUMBER like #{capacityNum}
                     </if>