'销售运输订单'

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

@@ -787,7 +787,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               Integer orderType,
                                               Integer orderStatus,
                                               String con,
-                                              Integer carrierId
+                                              String carrierSsoId
     ) {
         int count = 0;
         if (orderType != null) {
@@ -799,10 +799,8 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("orderStatus", orderStatus);
             count++;
         }
-        if (carrierId != null) {
-            mapValue.put("carrierId", carrierId);
-            count++;
-        }
+        mapValue.put("carrierSsoId",carrierSsoId);
+        count++;
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -1367,4 +1365,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
         String capacityNumber = (String) mapvalue.get("capacityNumber");
         return omstruckOrderMapper.getAllRefuseOrderNumberByCapacity(capacityNumber);
     }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/getOrderMaterialList")
+    public RESTfulResult getOrderMaterialList(@RequestParam Integer orderId) {
+        List<Map<String, Object>> orderMaterialList = omstruckOrderMapper.getOrderMaterialList(new BigDecimal(orderId));
+        return success(orderMaterialList);
+    }
 }

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

@@ -254,4 +254,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> getResultListByCapacity(String capacityNumber);
     // 通过卸货点名称查询卸货点id
     BigDecimal getUnloadPointId(String unloadPoint);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+
+    List<Map<String, Object>> getOrderMaterialList(BigDecimal orderId);
 }

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

@@ -796,6 +796,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
     @Override
     public List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map) {
+        String carrierSsoId = (String) map.get("carrierSsoId");
+        BigDecimal carrierId = omstruckOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        map.put("carrierId",carrierId);
         return omstruckOrderMapper.selectTransportOrderForSale(map);
     }
 

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

@@ -1637,19 +1637,13 @@
         OO.ORDER_NUMBER "orderNumber",
         ASO.SALE_NUMBER "saleNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
-        RM.MATERIAL_NAME "materialName",
-        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialweight",
-        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
-        RS.SHIPPER_NAME "shipperName"
-
+        RS.SHIPPER_NAME "shipperName",
+        OO.ORDER_ID "orderId"
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-        ON OO.ORDER_ID=OOM.ORDER_ID
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_ORDER ASO
@@ -1658,8 +1652,6 @@
         ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
         LEFT JOIN RMS_CAPACITY RC
         ON OO.CAPACITY_ID=RC.CAPACITY_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON OOM.MATERIAL_ID=RM.MATERIAL_ID
         LEFT JOIN RMS_SHIPPER RS
         ON RS.SHIPPER_ID=ASO.SHIPPER_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
@@ -2915,4 +2907,24 @@
         WHERE OO.ORDER_ID = #{orderId}
           AND OO.ORDER_STATUS in (4, 5)
     </select>
+
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+    <select id="getOrderMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT
+        OOM.MATERIAL_ID AS "materialId",
+               RM.MATERIAL_NAME AS "materialName",
+               OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+               OOM.ORDER_MATERIAL_NUMBER AS "materialNumber",
+               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
 </mapper>