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

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -29,4 +29,6 @@ public interface OmsFeign {
     //远程调用推送websocket
     @PostMapping("api/v1/oms/omstruckorderseparates/pushMesToWebsocket")
     RESTfulResult pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/oms/omstruckorders/pushMessageToDriver")
+    public RESTfulResult pushMessageToDriver(@RequestBody Map<String,Object> mapValue);
 }

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

@@ -77,9 +77,14 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //零星物资根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getFactorySkinSporadicJIPi(Map<String, Object> map);
 
+    List<Map<String,Object>> getFactorySporadicJiMiaoResult(Map<String,Object> map);
+
     //根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getSporadicSuppliesJiPiResult(Map<String, Object> map);
 
+    //根据运输订单id获取计量实绩
+    List<Map<String,Object>> getFactorySkinSporadicWeight(Map<String,Object> map);
+
      //根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getSporadicSuppliesJiMiaoResult(Map<String, Object> map);
 

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

@@ -119,6 +119,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 12:
             case 13:
             case 15:
+            case 16:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;
@@ -258,8 +259,10 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
+            case 16:
 
         }
+
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");
         }
@@ -268,6 +271,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         i += utilsService.updateOrderLineSequence(map);
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;
+
     }
 
 

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

@@ -139,7 +139,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 12:
             case 13:
             case 15:
-                return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
+            case 16:
+                 return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
         return null;
     }
@@ -211,12 +212,12 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 i += utilsService.closeOrderNormally(map);
                 break;
             case 15:
-            case 16: {
+            case 16:
+                //生成新的零星订单
+                omsFeign.pushMessageToDriver(map);
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
-                //根据零星订单id 查询趟次多少，如果大于零发消息给司机
-            }
-            break;
+                break;
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
         return i;

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

@@ -95,7 +95,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 12:
             case 13:
             case 15:
-                return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
+            case 16:
+                 return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
         }
         return null;
     }

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

@@ -311,7 +311,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("orderSource", "0");
                 measureCommission.put("ended", "0");
                 break;
-            case 14:
+//            case 14:
+            //零星一车多趟
+            case 15:
+                measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
+                if(measureCommission == null)
+                    return 0;
+                measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
+                measureCommission.put("deliveryType", "计重");
+                measureCommission.put("billType", "2");
+                measureCommission.put("planQuantity", "0");
+                measureCommission.put("crname", "admin");
+                measureCommission.put("orderSource", "0");
+                measureCommission.put("ended", "0");
+            case 16:
         }
         /*访问接口发送数据*/
 //        return sendMesToDXMeasure(measureCommission);

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

@@ -118,6 +118,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 12:
             case 13:
             case 15:
+            case 16:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }
         return null;

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

@@ -88,6 +88,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map);//apiId:405
             case 13:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicJiMiao(map);//apiId:422
+            case 15:
+            case 16:
+                 return tmstruckWeightResultMapper.getFactorySporadicJiMiaoResult(map);//apiId:422
         }
         return null;
     }
@@ -124,6 +127,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiPiResult(map);//apiId:392
             case 13:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
+            case 15:
+                return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
+            case 16:
         }
         return null;
     }

src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@ spring:
 
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-tms-truck-prod
+    name: dil-tms-truck-dev
   #Redis相关配置
   redis:
     host: 172.16.33.161

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

@@ -1039,10 +1039,10 @@
     <select id="getLxRealSendUnitIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         select RS.SUPPLIER_FAR_ID
         from OMSTRUCK_ORDER OO
-            left join AMSTRUCK_SPORADIC_ORDER ASO
-                    on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-            left join RMS_SUPPLIER RS
-                    on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
         where OO.ORDER_ID = #{orderId}
     </select>
 
@@ -1051,7 +1051,7 @@
         select ASO.RECEIVE_UNIT_ID
         from OMSTRUCK_ORDER OO
         left join AMSTRUCK_SPORADIC_ORDER ASO
-            on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         where OO.ORDER_ID = #{orderId}
     </select>
 

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

@@ -941,7 +941,7 @@
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
-        AND OO.ORDER_TYPE = 12
+        AND OO.ORDER_TYPE in (12,15,16,13)
         )
         <where>
             <if test="orderNumber != null">

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

@@ -2371,6 +2371,118 @@
             order by "resultTareWeightTime" desc
         </if>
     </select>
+<!--  一车多趟获取计重实绩（零星物资）  -->
+    <select id="getFactorySkinSporadicWeight" resultType="java.util.Map">
+        select *
+        from (
+        select
+        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        APO.SPORADIC_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TWR.RESULT_POUND_NO "resultPoundNo"
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        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_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
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE in (15,16)
+        )
+        <where>
+            <if test="purchaseOrderNo != null">
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" 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="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="truckCalculateNumber != null">
+                and
+                <foreach collection="truckCalculateNumber" item="item" open="(" separator="or" close=")">
+                    "truckCalculateNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeight != null">
+                and
+                <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeightTime != null">
+                and
+                <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTareWeight != null">
+                and
+                <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
+                    "resultTareWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultPoundNo != null">
+                and
+                <foreach collection="resultPoundNo" item="item" open="(" separator="or" close=")">
+                    "resultPoundNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTareWeightTime != null">
+                and
+                <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultTareWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultNetWeight != null">
+                and
+                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                    "resultNetWeight" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "resultTareWeightTime" desc
+        </if>
+    </select>
 
     <!--    根据运输订单Id获取计毛实绩-->
     <select id="getFactorySkinSporadicJiMiao" resultType="java.util.Map">
@@ -2471,6 +2583,109 @@
             order by "resultGrossWeightTime" desc
         </if>
     </select>
+<!-- 根据运输订单id获取计量实绩-->
+    <select id="getFactorySporadicJiMiaoResult" resultType="java.util.Map">
+        select *
+        from (
+        select
+        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        RM.MATERIAL_NAME "materialName"
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID=OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=OOM.MATERIAL_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_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
+        OO.ORDER_TYPE in (15,16)
+        )
+        <where>
+            <if test="purchaseOrderNo != null">
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" 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="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="truckCalculateNumber != null">
+                and
+                <foreach collection="truckCalculateNumber" item="item" open="(" separator="or" close=")">
+                    "truckCalculateNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeight != null">
+                and
+                <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeightTime != null">
+                and
+                <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTareWeight != null">
+                and
+                <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
+                    "resultTareWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTareWeightTime != null">
+                and
+                <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultTareWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultNetWeight != null">
+                and
+                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                    "resultNetWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeightTime != null">
+                and
+                <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "resultGrossWeightTime" desc
+        </if>
+    </select>
+
+
+
+
 <!--  零星计皮 -->
     <select id="getFactorySkinSporadicJIPi"  parameterType="java.util.Map"  resultType="java.util.Map">
         select *