tijiao

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

@@ -379,7 +379,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,
+                                          String con,
+                                          String carrierSSOId) {
         int count = 0;
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
@@ -397,6 +399,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("fuelOrder", fuelOrder);
             count++;
         }
+        if(carrierSSOId != null){
+            if("".equals(carrierSSOId)) {
+                mapValue.put("carrierSSOId", carrierSSOId);
+                count++;
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -1188,13 +1196,17 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer apiId,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  String con) {
+                                                  String con,
+                                                  String carrierId) {
         if (con != null) {
             if(!"undefined".equals(con)){
                 String index="get_capacity_driver";//设置要查询的索引名称
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
             }
         }
+        if (carrierId != null && !"undefined".equals(carrierId)){
+            mapValue.put("carrierIds",carrierId);
+        }
         List<Map<String, Object>> dispatchSaleOrderList = null;
         if (mapValue.size() == 0) {
             //将查询结果存入索引中
@@ -1241,11 +1253,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer orderStatus,
-                                                  Integer carrierId,
+                                                  String carrierId,
                                                   String con) {
         if (con != null) {
             if(!"undefined".equals(con)){
-                String index="get_inward_order_list";//设置要查询的索引名称
+                String index="get_inward_order_list3";//设置要查询的索引名称
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
             }
         }
@@ -1253,8 +1265,8 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (carrierId != null && !"undefined".equals(carrierId.toString())) {
-            mapValue.put("carrierId",new BigDecimal(carrierId));
+        if (carrierId != null && !"undefined".equals(carrierId)) {
+            mapValue.put("carrierId",carrierId);
             count++;
         }
         mapValue.put("orderStatus",(orderStatus));
@@ -1265,7 +1277,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
             dispatchSaleOrderList = omstruckOrderService.getInwardOrderList(mapValue);
             Map<String, Object> map1 = new HashMap<>();
             //添加索引
-            map1.put("index","get_inward_order_list");
+            map1.put("index","get_inward_order_list3");
             //添加id
             map1.put("indexId","planId");
             dispatchSaleOrderList.add(map1);

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsSaleOrderMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMaterial, BigDecimal> {
+}

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

@@ -215,7 +215,10 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getNZOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
     //查询采购零星物资订单给app 12
-    Map<String,Object> getSporadicOrder(@Param("orderId") BigDecimal orderId);
+    Map<String,Object>  getSporadicOrder(@Param("orderId") BigDecimal orderId);
+
+    //查询采购零星物资出厂订单给app 13
+    Map<String,Object> getLxOutFactoryOrder(@Param("orderId") BigDecimal orderId);
 
     //查询发运计划运输订单给APP  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
@@ -223,6 +226,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询销售运输订单给APP 1
     Map<String, Object> getXSOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
+
     //通过运输订单号查询运输订单类型
     Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
 

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

@@ -70,4 +70,7 @@ public interface OmstruckOrderSeparateMapper {
 
     //查询零星物资出厂订单信息（还未分配车辆）状态：3  13
     List<Map<String, Object>> getOthersOrderMesToSend(Map<String, Object> map);
+
+    // 查询销售订单的物资件数或重量
+    List<Map<String, Object>> getWeightOrNumber(BigDecimal saleOrderMaterialId);
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
+import com.steerinfo.dil.mapper.AmsSaleOrderMaterialMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderSeparateMapper;
@@ -28,6 +29,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Autowired
     private OmstruckOrderSeparateMapper omstruckOrderSeparateMapper;
 
+    @Autowired
+    AmsSaleOrderMaterialMapper amsSaleOrderMaterialMapper;
+
     @Autowired
     private OmstruckOrderMapper omstruckOrderMapper;
 
@@ -332,6 +336,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         tmsTruckFeign.addTotalResult(orderIdMap);
         omstruckOrder.setOrderId(orderId);
         BigDecimal saleOrderMaterialId = omstruckOrderMapper.getSaleMaterialId(dispatchId);
+        // 查询销售订单中是物资重量还是件数
+        List<Map<String, Object>> materialMapList = omstruckOrderSeparateMapper.getWeightOrNumber(saleOrderMaterialId);
         omstruckOrder.setOrderPlanId(saleOrderMaterialId);
         String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
         omstruckOrder.setOrderNumber(orderNumber);
@@ -360,12 +366,20 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 omstruckOrderMaterial.setUpdateUsername("admin");
                 omstruckOrderMaterial.setInsertUpdateRemark("无");
                 if (map != null) {
-                    BigDecimal materialTheoreticalWeight = (BigDecimal) map.get("materialTheoreticalWeight");
                     BigDecimal saleOrderMaterialNumber = (BigDecimal) map.get("saleOrderMaterialNumber");
                     BigDecimal materialId = (BigDecimal) map.get("materialId");
-                    omstruckOrderMaterial.setOrderMaterialWeight(materialTheoreticalWeight);
                     omstruckOrderMaterial.setMaterialId(materialId);
-                    omstruckOrderMaterial.setOrderMaterialNumber(saleOrderMaterialNumber);
+                    // 判断是重量还是件数
+                    if (materialMapList != null) {
+                        BigDecimal saleMaterialNumber = (BigDecimal) materialMapList.get(0).get("materialNumber");
+                        if (saleMaterialNumber != null && saleMaterialNumber.toString().length() != 0) {
+                            omstruckOrderMaterial.setOrderMaterialNumber(saleOrderMaterialNumber);
+                        }
+                        else {
+                            omstruckOrderMaterial.setOrderMaterialWeight(saleOrderMaterialNumber);
+                        }
+                    }
+
                 }
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }

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

@@ -740,8 +740,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //新增运输订单
         omstruckOrderMapper.insertSelective(omstruckOrder);
         //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityById(map);
+//        map.put("capacityStatus", 2);
+//        omstruckOrderMapper.updateCapacityById(map);
         //新增运输订单子表
         addOrderMaterial(map, omstruckOrder.getOrderId());
         //新增实绩总表关联订单 feign调用
@@ -1194,7 +1194,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
             RmsCapacity rmsCapacity = rmsCapacities.get(0);
-            rmsCapacity.setCapacityStatus(new BigDecimal(2));
+//            rmsCapacity.setCapacityStatus(new BigDecimal(2));
             result +=rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
             BigDecimal capacityId = rmsCapacity.getCapacityId();
             capacityMap.clear();
@@ -1620,6 +1620,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
+            case 13:
+                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
 
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));

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

@@ -673,6 +673,10 @@
         </if>
         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>
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
@@ -701,6 +705,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>
@@ -2323,6 +2330,9 @@
         FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_STATUS = 0
         AND RC.CAPACITY_TYPE_ID = 1
+        <if test="carrierIds != null">
+            and RC.CARRIER_ID = (select rcr.carrier_id from rms_carrier rcr where rcr.carrier_sso_id = #{carrierIds})
+        </if>
         )
         <where>
             <if test="capacityNumber != null">
@@ -2345,29 +2355,30 @@
     <!-- 查询分解运输计划 -->
     <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        AIP.PLAN_NUMBER AS "planNumber",
-        RCA.CARRIER_NAME AS "carrierName",
-        AIP.CARRIER_ID AS "carrierId",
-        RC.CAPACITY_NUMBER AS "capacityNumber",
-        OOM.ORDER_MATERIAL_NUMBER AS "orderMaterialNumber",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIP.PLAN_ISSUE_TIME AS "planIssueTime",
-        AIP.PLAN_ISSUE_NAME AS "planIssueName",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        ARM.MATERIAL_WEIGHT AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+        RM.MATERIAL_NAME                   AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+        AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.CARRIER_ID                     AS "carrierId",
+        RC.CAPACITY_NUMBER                 AS "capacityNumber",
+        OOM.ORDER_MATERIAL_NUMBER          AS "orderMaterialNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
+        ARM.MATERIAL_COUNT                 AS "materialNumber",
+        ARM.MATERIAL_WEIGHT                AS "materialWeight",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        OO.ORDER_ID AS "orderId",
-        AIP.INSERT_TIME AS "insertTime"
+        RW1.WAREHOUSE_NAME                 "unloadWarehouseName",
+        OO.ORDER_ID                        AS "orderId",
+        AIP.INSERT_TIME                    AS "insertTime"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
@@ -2386,17 +2397,20 @@
         LEFT JOIN DIL_BATCH DB
         ON APO.BATCH_ID = DB.BATCH_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT
         ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4,9,10,11)
+        AND OO.ORDER_TYPE IN (4, 9, 10, 11)
         <if test="carrierId != null">
-            AND AIP.CARRIER_ID = #{carrierId}
+            AND AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+            where rc.carrier_sso_id =  #{carrierId})
         </if>
         <if test="orderStatus != null">
             AND OO.ORDER_STATUS = #{orderStatus}
@@ -2748,44 +2762,54 @@
           AND OO.ORDER_STATUS in (4, 5)
     </select>
 
-<!--查询采购零星物资信息给app 12    -->
+<!--查询采购零星物资信息给app 12 -->
     <select id="getSporadicOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT  OO.ORDER_ID        "orderId",
                 OO.ORDER_NUMBER    "orderNumber",
                 OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
                 RC.CAPACITY_NUMBER "capacityNumber",
-                OO.ORDER_TYPE      "orderType"
-        FROM OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId}
-        AND OO.ORDER_STATUS in (4, 5)
-    </select>
+                OO.ORDER_TYPE      "orderType",
+                RS.SUPPLIER_NAME  "shipperName",
+                RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
 
-    <!--  查询内转运输订单给APP 9 10 11-->
-    <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT OO.ORDER_ID        "orderId",
-               OO.ORDER_NUMBER    "orderNumber",
-               OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SUPPLIER_NAME   "loadName",
-               RW.WAREHOUSE_NAME  "unloadName",
-               OO.ORDER_TYPE      "orderType"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-                           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-                 LEFT JOIN AMS_PURCHASE_ORDER APO
-                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-                 LEFT JOIN RMS_SUPPLIER RS
-                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join AMSTRUCK_SPORADIC_ORDER ASO
+                           ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SUPPLIER RS
+                           ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RC2
+                           ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
+          AND OO.ORDER_STATUS in (4, 5)
+    </select>
 
+    <!--  查询内转运输订单给APP 9 10 11-->
+    <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+       SELECT OO.ORDER_ID            "orderId",
+              OO.ORDER_NUMBER        "orderNumber",
+              OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+              RC.CAPACITY_NUMBER     "capacityNumber",
+              rwl.warehouse_name     "loadName",
+              RW.WAREHOUSE_NAME      "unloadName",
+              OO.ORDER_TYPE          "orderType"
+         FROM OMSTRUCK_ORDER OO
+         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
+         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+         left join rms_warehouse rwl
+           on rwl.warehouse_id = air.requirement_platform_id
+         LEFT JOIN AMS_PURCHASE_ORDER APO
+           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+         LEFT JOIN RMS_SUPPLIER RS
+           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+         LEFT JOIN RMS_WAREHOUSE RW
+           ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+         LEFT JOIN RMS_CAPACITY RC
+           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2807,7 +2831,7 @@
                            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2835,9 +2859,10 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
 
+
     <!--  通过运输订单号查询订单类型  -->
     <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         SELECT OO.ORDER_TYPE
@@ -2882,4 +2907,26 @@
         from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId}
     </select>
+
+<!--  查询采购零星物资出厂订单给app 13  -->
+    <select id="getLxOutFactoryOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        SELECT  OO.ORDER_ID        "orderId",
+                OO.ORDER_NUMBER    "orderNumber",
+                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+                RC.CAPACITY_NUMBER "capacityNumber",
+                OO.ORDER_TYPE      "orderType",
+                RS.SHIPPER_NAME "loadName",
+                RC2.CONSIGNEE_COMPANY_NAME "unloadName"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join AMSTRUCK_SPORADIC_ORDER ASO
+                           ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SEND_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RC2
+                           ON RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+          AND OO.ORDER_STATUS in (4, 5)
+    </select>
 </mapper>

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

@@ -167,7 +167,8 @@
 <!--    通过总实绩ID和路段顺序号查询计毛实绩数据 -->
     <select id="getMaoWeightMes" parameterType="map" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
-               TWR.RESULT_GROSS_WEIGHT_TIME "pointDate"
+               TWR.RESULT_GROSS_WEIGHT_TIME "pointDate",
+               TWR.RESULT_GROSS_WEIGHT     "weight"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join RMS_TRUCK_CALCULATE RTC
             on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
@@ -187,19 +188,12 @@
 <!--    通过总实绩ID和路段顺序号查询装货实绩数据-->
     <select id="getLoadMes" parameterType="map" resultType="java.util.Map">
         select TLR.RESULT_LOAD_END_TIME "pointDate",
-               (case
-                   when OO.ORDER_TYPE in (1, 4)
-                   then (select RPP.PLATFORM_NAME
-                            from RMS_PWAREHOUSE_PLATFORM RPP
-                            where RPP.PLATFORM_ID = TLR.LOADING_ID )
-                   else (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW
-                         where RW.WAREHOUSE_ID = TLR.LOADING_ID)
-               end) "pointName"
+               RW.WAREHOUSE_NAME "pointName"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-        left join OMSTRUCK_ORDER OO
-            on OO.ORDER_ID = TTR.ORDER_ID
+        left join RMS_WAREHOUSE RW
+            on RW.WAREHOUSE_ID = TLR.LOADING_ID
         where TLR.RESULT_TOTAL_ID = #{resultTotalId} and TLR.SEGMENT_SQE = #{segmentSqe}
     </select>
 
@@ -223,7 +217,8 @@
 <!--  通过总实绩ID和路段顺序号查询计皮实绩数据  -->
     <select id="getPiWeightMes" parameterType="map" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
-               TWR.RESULT_TARE_WEIGHT_TIME "pointDate"
+               TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
+               TWR.RESULT_TARE_WEIGHT       "weight"
         from TMSTRUCK_WEIGHT_RESULT TWR
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
@@ -462,5 +457,16 @@
         </if>
     </select>
 
+    <!-- 查询销售订单的物资件数或重量 -->
+    <select id="getWeightOrNumber" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT ASM.MATERIAL_NUMBER AS "materialNumber",
+               ASM.MATERIAL_WEIGHT AS "materialWeight"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
 
 </mapper>