修改司机接单

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

@@ -400,7 +400,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
             count++;
         }
         if(carrierSSOId != null){
-            if("".equals(carrierSSOId)) {
+            if(!"null".equals(carrierSSOId)) {
                 mapValue.put("carrierSSOId", carrierSSOId);
                 count++;
             }
@@ -907,6 +907,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               Integer orderType,
                                               Integer orderStatus,
                                               Integer fuelOrder,
+                                              String carrierSSOId,
                                               String con
     ) {
         int count = 0;
@@ -922,6 +923,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("fuelOrder", fuelOrder);
             count++;
         }
+        if(carrierSSOId != null){
+            if(!"null".equals(carrierSSOId)){
+                mapValue.put("carrierSSOId", carrierSSOId);
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {

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

@@ -63,6 +63,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         Map<String,Object> totalIdMap = new HashMap<>();
         totalIdMap.put("materialId", materialId);
         totalIdMap.put("resultTotalId",resultTotalId);
+        totalIdMap.put("lineId", lineId);
         // 遍历路段顺序号子表
         int count = 0;
         BigDecimal lineType = (BigDecimal) segmentList.get(0).get("lineType");

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

@@ -903,15 +903,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     public List<Map<String, Object>> getTransportDispatch(Map<String, Object> map) {
-        List<Map<String, Object>> transportDispatch = omstruckOrderMapper.getTransportDispatch(map);
-        for (Map<String, Object> dispatch : transportDispatch) {
-            BigDecimal orderMaterialWeight = (BigDecimal) dispatch.get("orderMaterialWeight");
-            if(orderMaterialWeight==null){
-                BigDecimal orderMaterialNumber = (BigDecimal) dispatch.get("orderMaterialNumber");
-                dispatch.replace("orderMaterialWeight",orderMaterialNumber);
-            }
-        }
-        return transportDispatch;
+        return  omstruckOrderMapper.getTransportDispatch(map);
     }
 
     /**

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

@@ -1271,11 +1271,17 @@
         RCON.CONSIGNEE_CONTACT_TEL "consigneeContactTel",
         to_char(APO.PUCHASE_ORDER_DELIVERY_DATE, 'yyyy-mm-dd') "puchaseOrderDeliveryDate",
         RM.MATERIAL_NAME "materialName",
-        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        (
+            case when OOM.ORDER_MATERIAL_WEIGHT is not null
+              then OOM.ORDER_MATERIAL_WEIGHT
+              when OOM.ORDER_MATERIAL_WEIGHT is null
+              then OOM.ORDER_MATERIAL_NUMBER
+            end
+        )    "orderMaterialWeight",
         OO.ORDER_ISSUE_TIME "orderIssueTime",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RC.CAPACITY_NUMBER "capacityNumber"
+
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
         on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
@@ -1291,6 +1297,10 @@
         on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+                on RCA.CARRIER_ID = RC.CARRIER_ID
+        </if>
         <where>
             <if test="orderStatus != null">
                 OO.ORDER_STATUS = #{orderStatus}
@@ -1301,6 +1311,9 @@
             <if test="fuelOrder != null">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
         </where>
         )
         <where>