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

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

@@ -266,17 +266,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 
                 }
                 break;
-            case 11:
-                i += utilsService.closeOrderNormally(map);
-                break;
             case 12:
             case 13:
             case 15:
             case 16:
-                //生成新的零星订单
-                omsFeign.pushMessageToDriver(map);
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
+                //生成新的零星订单
+                omsFeign.pushMessageToDriver(map);
                 break;
 
 
@@ -292,6 +289,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         //添加门岗
         tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("gatepostId")));
+        //添加路段顺序号
+        tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("Sqe")));
         //添加出厂时间
         tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
         tmstruckLeaveFactoryResult.setInsertTime(new Date());

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

@@ -155,6 +155,7 @@
     </select>
 
 <!--  查询销售统计报表  -->
+    <!--  查询销售统计报表  -->
     <select id="getAllSaleReport" parameterType="java.util.Map" resultType="java.util.Map">
         select
                *
@@ -180,10 +181,15 @@
                         TLR.INSERT_UPDATE_REMARK             "materialRemark",
                         ASO.SALE_NUMBER                      "saleNumber",
                         TLR.CASE_NUMBER                      "caseNumber",
+                        RC2.CARRIER_NAME                     "carrierName",
                         CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
                  from OMSTRUCK_ORDER OO
                           left join AMS_SALE_ORDER_MATERIAL ASOM
                                on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                          left join AMS_DISPATCH_SALE_ORDER ADSO
+                               on ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                          left join RMS_CARRIER RC2
+                               on RC2.CARRIER_ID = ADSO.CARRIER_ID
                           left join AMS_SALE_ORDER ASO
                                on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
                           left join RMS_CONSIGNEE RCON
@@ -216,13 +222,9 @@
                                on OOM.ORDER_ID = OO.ORDER_ID
                           join RMS_MATERIAL RM
                                on RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          <if test="carrierSsoId != null">
-                              join RMS_CARRIER RCA
-                                on RCA.CARRIER_ID = RC.CARRIER_ID
-                          </if>
                  where OO.ORDER_TYPE in (1, 2)
                           <if test="carrierSsoId != null">
-                              and RCA.CARRIER_SSO_ID = #{carrierSsoId}
+                              and RC2.CARRIER_SSO_ID = #{carrierSsoId}
                           </if>
                           <if test="oneDate != null">
                               and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
@@ -238,6 +240,11 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="enGatepostName != null">
                 <foreach collection="enGatepostName" item="item" open="(" separator="or" close=")">
                     "enGatepostName" like '%${item}%'

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

@@ -1020,7 +1020,6 @@
         OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
         RW1.WAREHOUSE_NAME "loadingName",
         RW2.WAREHOUSE_NAME "unloadingName"
-
         from TMSTRUCK_ENFACTORY_RESULT TER
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID

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

@@ -492,7 +492,7 @@
             on RC.CAPACITY_ID = OO.CAPACITY_ID
         <if test="carrierSsoId != null">
             left join RMS_CARRIER RCA
-                on RCA.CARRIER_ID = RC.CARRIER_ID
+                on RCA.CARRIER_ID = OO.CARRIER_ID
         </if>
         left join RMS_GATEPOST RG
             on RG.GATEPOST_ID = TLFR.GATEPOST_ID