Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

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

@@ -1219,13 +1219,13 @@
 
     <!--  通过运输订单ID查询运输订单相关信息 -->
     <select id="getOrderByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-               RC.CAPACITY_NUMBER    "capacityNumber",
-               RM.MATERIAL_ID        "materialId",
-               RM.MATERIAL_NAME      "materialName",
-               OO.ORDER_ENTRY_TIME   "orderEntryTime",
-               OO.ORDER_TYPE         "orderType",
-               OO.UNLOAD_POINT_ID    "unloadPointId",
+        SELECT APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
+               RC.CAPACITY_NUMBER        "capacityNumber",
+               RM.MATERIAL_ID            "materialId",
+               RM.MATERIAL_NAME          "materialName",
+               OO.ORDER_ENTRY_TIME       "orderEntryTime",
+               OO.ORDER_TYPE             "orderType",
+               OO.UNLOAD_POINT_ID        "unloadPointId",
                OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
         FROM OMSTRUCK_ORDER OO
@@ -1561,19 +1561,19 @@
 
               from AMS_PURCHASE_ORDER APO
                        join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
-              where db.MATERIAL_ID = #{materialId} and apo.SUPPLIER_UNIT_ID = #{supplierId}
+              where db.MATERIAL_ID = #{materialId}
+                and apo.SUPPLIER_UNIT_ID = #{supplierId}
               order by db.INSERT_TIME desc)
         where rownum = 1
     </select>
 
     <!--  查询所有的发货单位  -->
     <select id="getReceivingUnit" resultType="java.util.Map">
-        SELECT
-            *
+        SELECT *
         from (
-                 select  RC.CONSIGNEE_ID "id",
-                         RC.CONSIGNEE_ID "value",
-                         RC.CONSIGNEE_COMPANY_NAME "label"
+                 select RC.CONSIGNEE_ID           "id",
+                        RC.CONSIGNEE_ID           "value",
+                        RC.CONSIGNEE_COMPANY_NAME "label"
                  from RMS_CONSIGNEE RC
                  order by RC.CONSIGNEE_ID
              )
@@ -1582,12 +1582,11 @@
 
     <!--  查询所有的发货单位  -->
     <select id="getSupplier" resultType="java.util.Map">
-        SELECT
-            *
+        SELECT *
         from (
-                 select  RS.SUPPLIER_ID "id",
-                         RS.SUPPLIER_ID "value",
-                         RS.SUPPLIER_NAME "label"
+                 select RS.SUPPLIER_ID   "id",
+                        RS.SUPPLIER_ID   "value",
+                        RS.SUPPLIER_NAME "label"
                  from RMS_SUPPLIER RS
                  order by RS.SUPPLIER_ID
              )
@@ -2404,6 +2403,7 @@
         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",
@@ -2412,6 +2412,7 @@
         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",
@@ -2666,18 +2667,19 @@
     </select>
     <select id="selectCapacityNumber" resultType="java.lang.String">
         select rc.capacity_number
-  from omstruck_order oo
-  left join rms_driver_capacity rdc
-    on rdc.driver_capacity_id = oo.driver_capacity_id
-  left join rms_capacity rc
-    on rc.capacity_id = rdc.driver_capacity_id
- where oo.order_id = #{orderId}
+        from omstruck_order oo
+                 left join rms_driver_capacity rdc
+                           on rdc.driver_capacity_id = oo.driver_capacity_id
+                 left join rms_capacity rc
+                           on rc.capacity_id = rdc.driver_capacity_id
+        where oo.order_id = #{orderId}
     </select>
     <select id="selectOrderType" resultType="java.math.BigDecimal">
 
     </select>
     <select id="selectOrderId" resultType="java.math.BigDecimal">
-        select oo.order_id from omstruck_order oo
-        where oo.driver_capacity_id=#{dcId}
+        select oo.order_id
+        from omstruck_order oo
+        where oo.driver_capacity_id = #{dcId}
     </select>
 </mapper>