'APP进厂'

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

@@ -95,6 +95,8 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     }
 
 
+
+
     @ApiOperation(value="通过PDA添加进厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "门岗名称 运输订单号", required = false, dataType = "Map"),
@@ -136,4 +138,18 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(material);
     }
 
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("/getEnfactoryResultList")
+    public RESTfulResult getEnfactoryResultList() {
+        List<Map<String,Object>> mapList = tmstruckEnfactoryResultService.getEnfactoryResultList();
+        return success(mapList);
+    }
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("/getEnfactoryMessageByOrderId")
+    public RESTfulResult getEnfactoryMessageByOrderId(@RequestParam String orderNumber) {
+        List<Map<String,Object>> mapList = tmstruckEnfactoryResultService.getEnfactoryMessageByOrderId(orderNumber);
+        return success(mapList);
+    }
+
 }

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

@@ -129,4 +129,11 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
 
     }
 
+    @ApiOperation(value="APP查询汽车出厂实绩")
+    @PostMapping("/getLeaveFactoryList")
+    public RESTfulResult getLeaveFactoryList(@RequestParam String orderNumber) {
+        List<Map<String,Object>> mapList = tmstruckLeaveFactoryResultService.getLeaveFactoryList(orderNumber);
+        success(mapList);
+    }
+
 }

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

@@ -38,6 +38,10 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     //通过运输订单id查询物资信息
     List<Map<String,Object>> getMaterial(Integer orderId);
+    // APP查询进厂实绩
+    List<Map<String, Object>> getEnfactoryResultList();
 
 
+    // APP通过运输订单id查询进厂实绩
+    List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber);
 }

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

@@ -35,4 +35,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     Map<String, Object> getTruckFactoryResult(String nu);
 
+    //
+    List<Map<String, Object>> getLeaveFactoryList(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/ITmstruckEnfactoryResultService.java

@@ -35,4 +35,9 @@ public interface ITmstruckEnfactoryResultService{
 
     //
     int enFactoryResultByMJ(Map<String, Object> map);
+
+    // APP查询进厂实绩
+    List<Map<String, Object>> getEnfactoryResultList();
+    // APP通过运输订单id查询进厂实绩
+    List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/ITmstruckLeaveFactoryResultService.java

@@ -35,4 +35,7 @@ public interface ITmstruckLeaveFactoryResultService {
     int addLeaveFactory(Map<String,Object> mapValue);
 
     Map<String, Object> getTruckFactoryResult(String nu);
+
+    // APP查询出厂信息
+    List<Map<String, Object>> getLeaveFactoryList(String orderNumber);
 }

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

@@ -236,6 +236,25 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         return i;
     }
 
+    /**
+     * APP查询进厂实绩
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getEnfactoryResultList() {
+        return tmstruckEnfactoryResultMapper.getEnfactoryResultList();
+    }
+
+    /**
+     * APP通过运输订单id查询进厂实绩
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber) {
+        return tmstruckEnfactoryResultMapper.getEnfactoryMessageByOrderId(orderNumber);
+    }
+
     /**
      * 通过PDA添加进厂实绩方法
      * @param map

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

@@ -84,6 +84,16 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         return tmstruckLeaveFactoryResultMapper.getTruckFactoryResult(nu);
     }
 
+    /**
+     * APP查询出厂信息
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getLeaveFactoryList(String orderNumber) {
+        return tmstruckLeaveFactoryResultMapper.getLeaveFactoryList(orderNumber);
+    }
+
 
     /**
      * 查询所有的出厂实绩

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

@@ -674,116 +674,116 @@
     <!--查询销售进厂实绩 -->
     <select id="getXSEnFactoryResult" parameterType="java.util.Map" resultType="java.util.Map">
         select
-               *
+        *
         from (
-            SELECT
-                -- 进厂时间
-                TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
-                -- 	进厂方式
-                TER.RESULT_ENTRY_MODE "resultEntryMode",
-                -- 	门岗名称
-                RG.GATEPOST_NAME "gatepostName",
-                -- 运输订单号
-                OO.ORDER_NUMBER "orderNumber",
-                -- 车牌号
-                RC.CAPACITY_NUMBER "capacityNumber",
-                -- 运输订单id
-                OO.ORDER_ID "orderId",
-                -- 根据订单类型查询销售订单号/发运计划号
-                (CASE
-                    -- 	运输订单类型等于1的查询销售订单表
-                    WHEN OO.ORDER_TYPE = 1
-                        THEN (
-                            SELECT
-                                -- 销售订单号
-                                ASO.SALE_NUMBER
-                            FROM
-                                -- 销售订单
-                                AMS_SALE_ORDER ASO
-                            WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                            )
-                    -- 	运输订单类型等于2，3的查询发运计划表
-                    WHEN OO.ORDER_TYPE IN ( 2, 3 )
-                        THEN(
-                            SELECT
-                                -- 	发运计划号
-                                ARD.DAYPLAN_NO
-                                -- 发运计划
-                            FROM
-                                 AMSTRUCK_RAIL_DAYPLAN ARD
-                            WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-                            )
-                END) "saleNum",
-                --根据订单类型查询发货单位
-                (CASE
-                    WHEN OO.ORDER_TYPE = 1
-                        THEN(
-                            SELECT
-                                -- 发货单位
-                                RS.SHIPPER_NAME
-                            FROM
-                                -- 销售订单
-                                AMS_SALE_ORDER ASO
-                            -- 	托运人
-                            LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
-                            WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                            )
-                    -- 	运输订单类型等于2，3的查询发运计划表
-                    WHEN OO.ORDER_TYPE IN ( 2, 3 )
-                        THEN(
-                            SELECT
-                                -- 发货单位
-                                RS.SHIPPER_NAME
-                            -- 	发运计划
-                            FROM AMSTRUCK_RAIL_DAYPLAN ARD
-                            -- 托运人
-                            LEFT JOIN RMS_SHIPPER RS ON ARD.SHIPMENT_UNIT_ID = RS.SHIPPER_ID
-                            WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-                            )
-                END) "shipperName",
-                --根据订单类型查询收货单位
-                (CASE
-                    WHEN OO.ORDER_TYPE = 1
-                        THEN(
-                            SELECT
-                                -- 收货单位
-                                RS.SUPPLIER_NAME
-                            FROM
-                                -- 销售订单
-                                AMS_SALE_ORDER ASO
-                            -- 托运人
-                            LEFT JOIN RMS_SUPPLIER RS ON ASO.SHIPPER_ID = RS.SUPPLIER_ID
-                            WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                            )
-                    -- 运输订单类型等于2，3的查询发运计划表
-                    WHEN OO.ORDER_TYPE IN ( 2, 3 )
-                        THEN(
-                            SELECT
-                                --发货单位
-                                RS.SUPPLIER_NAME
-                            FROM
-                                -- 发运计划
-                                AMSTRUCK_RAIL_DAYPLAN ARD
-                            --托运人
-                            LEFT JOIN RMS_SUPPLIER RS ON ARD.SHIPMENT_UNIT_ID = RS.SUPPLIER_ID
-                            WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-                            )
-                END) "supplierName"
-            FROM
-                -- 进厂实绩
-                TMSTRUCK_ENFACTORY_RESULT TER
-                -- 	门岗
-                LEFT JOIN RMS_GATEPOST RG ON TER.GATEPOST_ID = RG.GATEPOST_ID
-                -- 	总实绩
-                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                -- 运输订单
-                LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
-                -- 运力信息
-                LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
-            -- 判断进厂实绩的进厂时间不为空
-            WHERE TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
-            -- 	并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
-            AND OO.ORDER_TYPE IN ( 1, 2, 3 )
+        SELECT
+        -- 进厂时间
+        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+        -- 进厂方式
+        TER.RESULT_ENTRY_MODE "resultEntryMode",
+        -- 门岗名称
+        RG.GATEPOST_NAME "gatepostName",
+        -- 运输订单号
+        OO.ORDER_NUMBER "orderNumber",
+        -- 车牌号
+        RC.CAPACITY_NUMBER "capacityNumber",
+        -- 运输订单id
+        OO.ORDER_ID "orderId",
+        -- 根据订单类型查询销售订单号/发运计划号
+        (CASE
+        -- 运输订单类型等于1的查询销售订单表
+        WHEN OO.ORDER_TYPE = 1
+        THEN (
+        SELECT
+        -- 销售订单号
+        ASO.SALE_NUMBER
+        FROM
+        -- 销售订单
+        AMS_SALE_ORDER ASO
+        WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        )
+        -- 运输订单类型等于2，3的查询发运计划表
+        WHEN OO.ORDER_TYPE IN ( 2, 3 )
+        THEN(
+        SELECT
+        -- 发运计划号
+        ARD.DAYPLAN_NO
+        -- 发运计划
+        FROM
+        AMSTRUCK_RAIL_DAYPLAN ARD
+        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+        )
+        END) "saleNum",
+        --根据订单类型查询发货单位
+        (CASE
+        WHEN OO.ORDER_TYPE = 1
+        THEN(
+        SELECT
+        -- 发货单位
+        RS.SHIPPER_NAME
+        FROM
+        -- 销售订单
+        AMS_SALE_ORDER ASO
+        -- 托运人
+        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+        WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        )
+        -- 运输订单类型等于2，3的查询发运计划表
+        WHEN OO.ORDER_TYPE IN ( 2, 3 )
+        THEN(
+        SELECT
+        -- 发货单位
+        RS.SHIPPER_NAME
+        -- 发运计划
+        FROM AMSTRUCK_RAIL_DAYPLAN ARD
+        -- 托运人
+        LEFT JOIN RMS_SHIPPER RS ON ARD.SHIPMENT_UNIT_ID = RS.SHIPPER_ID
+        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+        )
+        END) "shipperName",
+        --根据订单类型查询收货单位
+        (CASE
+        WHEN OO.ORDER_TYPE = 1
+        THEN(
+        SELECT
+        -- 收货单位
+        RS.SUPPLIER_NAME
+        FROM
+        -- 销售订单
+        AMS_SALE_ORDER ASO
+        -- 托运人
+        LEFT JOIN RMS_SUPPLIER RS ON ASO.SHIPPER_ID = RS.SUPPLIER_ID
+        WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        )
+        -- 运输订单类型等于2，3的查询发运计划表
+        WHEN OO.ORDER_TYPE IN ( 2, 3 )
+        THEN(
+        SELECT
+        --发货单位
+        RS.SUPPLIER_NAME
+        FROM
+        -- 发运计划
+        AMSTRUCK_RAIL_DAYPLAN ARD
+        --托运人
+        LEFT JOIN RMS_SUPPLIER RS ON ARD.SHIPMENT_UNIT_ID = RS.SUPPLIER_ID
+        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+        )
+        END) "supplierName"
+        FROM
+        -- 进厂实绩
+        TMSTRUCK_ENFACTORY_RESULT TER
+        -- 门岗
+        LEFT JOIN RMS_GATEPOST RG ON TER.GATEPOST_ID = RG.GATEPOST_ID
+        -- 总实绩
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        -- 运输订单
+        LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
+        -- 运力信息
+        LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        -- 判断进厂实绩的进厂时间不为空
+        WHERE TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
+        -- 并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
+        AND OO.ORDER_TYPE IN ( 1, 2, 3 )
         )
         <where>
             <if test="saleNum != null">
@@ -838,15 +838,46 @@
     </select>
 
     <select id="getMaterial" parameterType="int" resultType="java.util.Map">
-        SELECT
-            RM.MATERIAL_NAME "materialName",
-            CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION , '('), CONCAT(RM.MATERIAL_MODEL ,')')) "specificationModel",
-            OM.ORDER_MATERIAL_NUMBER "orderMaterialNumber"
+        SELECT RM.MATERIAL_NAME                                                               "materialName",
+               CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "specificationModel",
+               OM.ORDER_MATERIAL_NUMBER                                                       "orderMaterialNumber"
         FROM OMSTRUCK_ORDER OO
-            LEFT JOIN OMSTRUCK_ORDER_MATERIAL OM
-            ON OO.ORDER_ID = OM.ORDER_ID
-            LEFT JOIN RMS_MATERIAL RM
-            ON OM.MATERIAL_ID = RM.MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OM
+                           ON OO.ORDER_ID = OM.ORDER_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON OM.MATERIAL_ID = RM.MATERIAL_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+
+    <!-- APP查询进厂实绩 -->
+    <select id="getEnfactoryResultList" resultType="java.util.Map">
+        SELECT OO.ORDER_NUMBER            AS "orderNumber",
+               TER.RESULT_ENTRY_GATE_TIME AS "resultEntryGateTime",
+               RC.CAPACITY_NUMBER         AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 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.CAPACITY_ID
+-- WHERE TER
+    </select>
+
+    <!-- APP通过运输订单id查询进厂实绩 -->
+    <select id="getEnfactoryMessageByOrderId" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_NUMBER     AS "orderNumber",
+               RCA.CAPACITY_NUMBER AS "capacityNumber",
+               RCD.DRIVER_NAME     AS "driverName"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON RCA.CAPACITY_ID = RDC.CAPACITY_ID
+                 LEFT JOIN RMS_CAR_DRIVER RCD
+                           ON RCD.DRIVER_ID = RDC.DRIVER_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>