'master'

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

@@ -117,7 +117,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:
             case 13:
-                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:394
+                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
         }
         return null;
     }

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

@@ -91,7 +91,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
             case 13:
-                return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 400
+                return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
         }
         return null;
     }

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

@@ -98,7 +98,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 11:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
             case 12:
-                return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map);//apiId:398
+                return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map);//apiId:405
             case 13:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicJiMiao(map);//apiId:402
         }

src/main/resources/bootstrap.yml

@@ -36,7 +36,7 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 
-##    测试环境
+#    测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
 #  BmsShipFeign:

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

@@ -1236,7 +1236,7 @@
         select TER.RESULT_ID "resultId",
                OO.ORDER_ID      "orderId",
                 OO.ORDER_NUMBER "orderNumber",
-                RC.CARRIER_NAME "carrierName",
+                RC.CAPACITY_NUMBER "capacityNumber",
                 RG.GATEPOST_NAME "gatepostName",
                 TER.RESULT_ENTRY_MODE "resultEntryMode",
                 TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime"
@@ -1249,53 +1249,35 @@
             on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
                    left join RMS_GATEPOST RG
                    on RG.GATEPOST_ID = TER.GATEPOST_ID
-                          left join RMS_CARRIER RC
-                          on RC.CARRIER_ID = ASO.CARRIER_ID
-        and OO.ORDER_TYPE = #{orderTypee}
+                          left join RMS_CAPACITY RC
+                          on RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
-            <if test="sendCompany != null">
-                and
-                <foreach collection="sendCompany" item="item" open="(" separator="or" close=")">
-                    "sendCompany" like '%${item}%'
-                </foreach>
-            </if>
             <if test="orderNumber != null">
                 and
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="receiveCompany != null">
+            <if test="gatepostName != null">
                 and
-                <foreach collection="receiveCompany" item="item" open="(" separator="or" close=")">
-                    "receiveCompany" like '%${item}%'
+                <foreach collection="gatepostName" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultEntryMode != null">
+            <if test="gatepostName != null">
                 and
                 <foreach collection="resultEntryMode" item="item" open="(" separator="or" close=")">
                     "resultEntryMode" like '%${item}%'
                 </foreach>
             </if>
-            <if test="orderMaterialWeight != null">
-                and
-                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
-                    "orderMaterialWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="loadingName != null">
-                and
-                <foreach collection="loadingName" item="item" open="(" separator="or" close=")">
-                    "loadingName" like '%${item}%'
-                </foreach>
-            </if>
             <if test="resultEntryGateTime != null">
                 and
                 <foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">

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

@@ -1488,32 +1488,21 @@
         select
         TLR.RESULT_ID "resultId",
         OO.ORDER_NUMBER "orderNumber",
-        RC.CARRIER_NAME "carrierName",
+        RC.CAPACITY_NUMBER "capacityNumber",
         TLR.RESULT_MEASURED_TONNAGE "resultMeasuredTonnage",
         TLR.RESULT_ISCLEAR "resultIsclear",
         to_char(TLR.RESULT_LOAD_START_TIME, 'yyyy-mm-dd') "resultLoadStartTime",
         TLR.INSERT_UPDATE_REMARK "insertUpdateRemark",
-        TLR.INSERT_TIME "insertTime",
-        RCON.CONSIGNEE_COMPANY_NAME "receiveCompany",
-        RS.SUPPLIER_NAME "sendCompany"
-
+        TLR.INSERT_TIME "insertTime"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
-
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-
-        left join RMS_CARRIER RC
-        on RC.CARRIER_ID = ASO.CARRIER_ID
-
-        left join RMS_SUPPLIER RS
-        on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
-        left join RMS_CONSIGNEE RCON
-        on RCON.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
-
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         where TLR.STATUS = #{status} and OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
@@ -1523,10 +1512,10 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="resultIsclear != null">
@@ -1547,18 +1536,6 @@
                     "insertUpdateRemark" like '%${item}%'
                 </foreach>
             </if>
-            <if test="receiveCompany != null">
-                and
-                <foreach collection="receiveCompany" item="item" open="(" separator="or" close=")">
-                    "receiveCompany" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="sendCompany != null">
-                and
-                <foreach collection="sendCompany" item="item" open="(" separator="or" close=")">
-                    "sendCompany" like '%${item}%'
-                </foreach>
-            </if>
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">

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

@@ -894,7 +894,7 @@
         SELECT
         TUR.RESULT_ID             "resultId",
         OO.ORDER_NUMBER           "orderNumber",
-        RC.CARRIER_NAME        "carrierName",
+        RC.CAPACITY_NUMBER        "capacityNumber",
         TUR.RESULT_START_TIME     "resultStartTime",
         TUR.RESULT_END_TIME       "resultEndTime",
         TUR.RESULT_DURATION       "resultDuration",
@@ -907,8 +907,8 @@
         ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
         ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-        LEFT JOIN RMS_CARRIER RC
-        ON RC.CARRIER_ID = ASO.CARRIER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_START_TIME IS NOT NULL
@@ -920,10 +920,10 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="warehouseName != null">

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

@@ -2169,12 +2169,10 @@
         select
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         OO.ORDER_NUMBER "orderNumber",
-        RC.CARRIER_NAME "carrierName",
+        RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        RS1.SUPPLIER_NAME "sendCompany",
-        RS2.CONSIGNEE_COMPANY_NAME "receiveCompany",
         OO.ORDER_ID "orderId",
         OO.ORDER_STATUS "orderStatus"
 
@@ -2185,14 +2183,10 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
-        left join RMS_CARRIER RC
-        on RC.CARRIER_ID = ASO.CARRIER_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
-        left join RMS_SUPPLIER RS1
-        on RS1.SUPPLIER_ID = ASO.SEND_UNIT_ID
-        left join RMS_CONSIGNEE RS2
-        on RS2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
         where RESULT_GROSS_WEIGHT_TIME is not null and
         OO.ORDER_TYPE = 12
         )
@@ -2208,10 +2202,10 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="truckCalculateNumber != null">
@@ -2226,18 +2220,6 @@
                     "resultGrossWeight" like '%${item}%'
                 </foreach>
             </if>
-            <if test="sendCompany != null">
-                and
-                <foreach collection="sendCompany" item="item" open="(" separator="or" close=")">
-                    "sendCompany" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="receiveCompany != null">
-                and
-                <foreach collection="receiveCompany" item="item" open="(" separator="or" close=")">
-                    "receiveCompany" like '%${item}%'
-                </foreach>
-            </if>
             <if test="resultGrossWeightTime != null">
                 and
                 <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
@@ -2260,7 +2242,7 @@
         APO.SPORADIC_ORDER_NO "purchaseOrderNo",
         RM.MATERIAL_NAME "materialName",
         OO.ORDER_NUMBER "orderNumber",
-        RC.CARRIER_NAME "carrierName",
+        RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
@@ -2275,8 +2257,8 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMSTRUCK_SPORADIC_ORDER APO
         on APO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
-        left join RMS_CARRIER RC
-        on RC.CARRIER_ID = OO.CAPACITY_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -2303,10 +2285,10 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="truckCalculateNumber != null">
@@ -2371,7 +2353,7 @@
         select
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         OO.ORDER_NUMBER "orderNumber",
-        RC.CARRIER_NAME "carrierName",
+        RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
@@ -2385,8 +2367,8 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
-        left join RMS_CARRIER RC
-        on RC.CARRIER_ID = ASO.CARRIER_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         where RESULT_GROSS_WEIGHT_TIME is not null and
@@ -2404,10 +2386,10 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="truckCalculateNumber != null">
@@ -2466,7 +2448,7 @@
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         ASO.SPORADIC_ORDER_NO "purchaseOrderNo",
         OO.ORDER_NUMBER "orderNumber",
-        RC.CARRIER_NAME "carrierName",
+        RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
@@ -2478,8 +2460,8 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
-        left join RMS_CARRIER RC
-        on RC.CARRIER_ID = ASO.CARRIER_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         where RESULT_TARE_WEIGHT_TIME is not null
@@ -2497,10 +2479,10 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="capacityNumber != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="truckCalculateNumber != null">