修改内转

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

@@ -247,12 +247,20 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
     public RESTfulResult getTimeTaskEnd(@RequestBody (required = false) Map<String, Object> map){
         return success(omstruckOrderSeparateService.getTimeTaskEnd(map));
     }
-
+    @ApiOperation(value = "查看计时完成详情")
     @PostMapping("/getTimeTaskEndDetail")
     public RESTfulResult getTimeTaskEndDetail(@RequestBody (required = false) Map<String, Object> map){
         return success(omstruckOrderSeparateService.getTimeTaskEndDetail(map));
     }
 
+    @ApiOperation(value = "查看暂停时长")
+    @PostMapping("/getPauseTimeTaskDetail")
+    public RESTfulResult getPauseTimeTaskDetail(@RequestParam  Integer orderId){
+        return success(omstruckOrderSeparateService.getPauseTimeTaskDetail(orderId));
+    }
+
+
+
 
 
     @ApiOperation(value = "批量关闭运输订单")

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

@@ -310,8 +310,14 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
 
+    //计时订单
+    Map<String, Object> getInwardTimeOrderMessageToApp(Map<String, Object> map);
     //根据运输订单号查找需要用车时长
     Map<String,Object>  selectInwardTimeByOrderId(BigDecimal orderId);
 
     List<Map<String, Object>> getTimeTaskEndDetail(Map<String, Object> map);
+
+    List<Map<String, Object>> getPauseTimeTaskDetail(Integer orderId);
+
+    Map<String, Object> getInwardOrderMessage(Map<String, Object> map);
 }

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

@@ -49,4 +49,5 @@ public interface IOmstruckOrderSeparateService {
 
     List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
 
+    List<Map<String,Object>> getPauseTimeTaskDetail(Integer orderId);
 }

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

@@ -673,5 +673,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map) {
         return omstruckOrderMaterialMapper.getUnloadOrderWarehouseName(map);
     }
+    //展示暂停总时长
+    @Override
+    public List<Map<String, Object>> getPauseTimeTaskDetail(Integer orderId) {
+        return omstruckOrderMapper.getPauseTimeTaskDetail(orderId);
+    }
 
 }

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

@@ -768,30 +768,30 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Override
     @Transactional
     public synchronized int driverReceiveOrRefuse(Map<String, Object> map) throws RuntimeException {
-            BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-            OmstruckOrder omstruckOrder = new OmstruckOrder();
-            if((Integer) map.get("orderReceiveStatus") == 1) {
-                List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
-                if (orderIdList.size() > 0) {
-                    throw  new RuntimeException("已有接收的订单！");
-                }
-                omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
-                //通过订单ID查询信息
-                Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
-                int orderStatus = DataChange.dataToBigDecimal(orderMessage.get("orderStatus")).intValue();
-                if(orderStatus == 5 || orderStatus == 6) {
-                    throw new RuntimeException("订单已被接收或已被拒绝!");
-                }
-                int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
-                if(orderType == 11||orderType==22){
-                    //发送计量委托
-                    orderMessage.put("asd", 1);
-                    orderMessage.put("orderId", orderId);
-                    tmsTruckFeign.sendMeasureCommission(orderMessage);
-                }else if(orderType!=21){
-                    //添加各个实绩
-                    omstruckOrderSeparateService.addAllSonResult(orderMessage);
-                }
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        if((Integer) map.get("orderReceiveStatus") == 1) {
+            List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
+            if (orderIdList.size() > 0) {
+                throw  new RuntimeException("已有接收的订单！");
+            }
+            omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
+            //通过订单ID查询信息
+            Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
+            int orderStatus = DataChange.dataToBigDecimal(orderMessage.get("orderStatus")).intValue();
+            if(orderStatus == 5 || orderStatus == 6) {
+                throw new RuntimeException("订单已被接收或已被拒绝!");
+            }
+            int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
+            if(orderType == 11||orderType==22){
+                //发送计量委托
+                orderMessage.put("asd", 1);
+                orderMessage.put("orderId", orderId);
+                tmsTruckFeign.sendMeasureCommission(orderMessage);
+            }else if(orderType!=21){
+                //添加各个实绩
+                omstruckOrderSeparateService.addAllSonResult(orderMessage);
+            }
             //判断订单是否是一车多单
             if (orderType ==15 || orderType ==16 || orderType ==19) {
                 //通过订单查询趟次
@@ -802,9 +802,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 //生成作业实绩之后、更改订单数量
                 if (orderMessage.containsKey("orderPlanId") && orderTimes.intValue() > 0) {
                     int state =0;
-                     state+=omstruckOrderSeparateService.updateTimes(new BigDecimal(orderMessage.get("orderPlanId").toString()), orderTimes.intValue() - 1);
-                     //接收订单以后已运输订单趟次+1
-                     state+=omstruckOrderSeparateMapper.updateTranTimes(DataChange.dataToBigDecimal(orderMessage.get("orderPlanId").toString()),transTimes.intValue()+1);
+                    state+=omstruckOrderSeparateService.updateTimes(new BigDecimal(orderMessage.get("orderPlanId").toString()), orderTimes.intValue() - 1);
+                    //接收订单以后已运输订单趟次+1
+                    state+=omstruckOrderSeparateMapper.updateTranTimes(DataChange.dataToBigDecimal(orderMessage.get("orderPlanId").toString()),transTimes.intValue()+1);
                     System.out.println(state);
                 }
             }
@@ -1426,17 +1426,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId")) ;
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId")) ;
         orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
-        String orgCode=(String) mapValue.get("orgCode");
+        String userId=(String) mapValue.get("userId");
         //根据计划查找需求，如果是计时，就添加新的订单类型
         String inwardType = amstruckInwardPlanMapper.getInwardByPlanId(planId);
-        if (inwardType.equals("计时")){
-          mapValue.remove(orderType);
-          orderType = BigDecimal.valueOf(21);
-          mapValue.put("orderType",orderType);
-        }else if (inwardType.equals("计次")){
+        if (inwardType.equals("计时")) {
             mapValue.remove(orderType);
-            orderType = BigDecimal.valueOf(22);
-            mapValue.put("orderType",orderType);
+            orderType = BigDecimal.valueOf(21);
+            mapValue.put("orderType", orderType);
         }
         Integer carrierId = (Integer) mapValue.get("carrierId");
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
@@ -1444,7 +1440,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
         for (Map<String,Object> orderMap : mapList) {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
-            omstruckOrder.setInsertUsername(orgCode);
+            omstruckOrder.setInsertUsername(userId);
             String capacityNumber = (String)orderMap.get("capacityNumber");
             List<Map<String,Object>>orderMaterialList = (List<Map<String,Object>>)orderMap.get("orderMaterialList");
             Map<String,Object> capacityMap = new HashMap<>();
@@ -1490,7 +1486,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterial.setMaterialId(materialId);
                 omstruckOrderMaterial.setOrderMaterialNumber(materialCount);
                 omstruckOrderMaterial.setInsertTime(new Date());
-                omstruckOrderMaterial.setInsertUsername(orgCode);
+                omstruckOrderMaterial.setInsertUsername(userId);
                 omstruckOrderMaterial.setUpdateTime(new Date());
                 omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
                 result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
@@ -1942,13 +1938,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
                 mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
-            case 22:
-                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                inwardType += "计次";
-                mesMap.put("inwardType", inwardType);
-                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
-                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
-                break;
             case 12:
             case 13:
             case 14:

src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -3230,14 +3230,14 @@
                AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
                RW1.WAREHOUSE_NAME       "loadName",
                RW.WAREHOUSE_NAME        "unloadName"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
-                           ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-                           ON ARP.PLAN_ID = AIP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-                 LEFT JOIN RMS_SHIPPER RS
+              FROM OMSTRUCK_ORDER OO
+              LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+              ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+              LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+              ON ARP.PLAN_ID = AIP.PLAN_ID
+              LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+              ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+              LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -3260,17 +3260,168 @@
     </select>
 <!-- 根据运输订单id查找需求日期 -->
  <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-   select AIR.DUE_DATE  "dueTime"
-   from OMSTRUCK_ORDER OO
-   left join AMSTRUCK_INWARD_PLAN AIP
-   on AIP.PLAN_ID=OO.ORDER_PLAN_ID
-   left join AMSTRUCK_REQUIREMENT_PLAN ARP
-   on ARP.PLAN_ID=AIP.PLAN_ID
-   left join AMSTRUCK_INWARD_REQUIREMENT AIR
-   on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
-   where OO.ORDER_ID=#{orderId}
- </select>
+    select AIR.DUE_DATE  "dueTime"
+    from OMSTRUCK_ORDER OO
+    left join AMSTRUCK_INWARD_PLAN AIP
+    on AIP.PLAN_ID=OO.ORDER_PLAN_ID
+    left join AMSTRUCK_REQUIREMENT_PLAN ARP
+    on ARP.PLAN_ID=AIP.PLAN_ID
+    left join AMSTRUCK_INWARD_REQUIREMENT AIR
+    on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+    where OO.ORDER_ID=#{orderId}
+   </select>
     <select id="getTimeTaskEndDetail" resultType="java.util.Map" parameterType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               OO.ORDER_NUMBER "orderNumber",
+               RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+               TTTR.INSERT_TIME "insertTime",
+               (
+                   SELECT TTTR2.RESULT_TIME
+                   FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                   WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                     AND TTTR2.RESULT_TIME_TYPE = 1
+               ) "startTime",
+               (
+                   SELECT TTTR2.RESULT_TIME
+                   FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                   WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                     AND TTTR2.RESULT_TIME_TYPE = 3
+               ) "endTime",
+               ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+               RM.MATERIAL_NAME "materialName",
+               RS.SHIPPER_NAME "shipperUnitName",
+               RW.WAREHOUSE_NAME "unloadName",
+               RW2.WAREHOUSE_NAME "loadName"
+        from OMSTRUCK_ORDER OO
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID=OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID=AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID=AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON ARM.REQUIREMENT_UNLOAD_UNIT_ID =RW.WAREHOUSE_ID
+                 LEFT JOIN RMS_WAREHOUSE RW2
+                           ON RW2.WAREHOUSE_ID=ARM.REQUIREMENT_PLATFORM_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID=ARM.MATERIAL_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID=OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+                           ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
+                 LEFT JOIN  RMS_CAPACITY RC
+                            ON RC.CAPACITY_ID=OO.CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY_TYPE RCT
+                           ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
+        where OO.ORDER_ID= #{orderId}  AND   TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3
+    </select>
+    <select id="getInwardTimeOrderMessageToApp" 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",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
+        CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME)  AS "resultTime",
+        TTTR.INSERT_TIME "insertTime",
+        (
+        SELECT TTTR2.RESULT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 1
+        ) "startTime",
+        (
+        SELECT TTTR2.RESULT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "endTime"
+
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
 
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+        ON RUOM.UNIT_OF_MEASURE_ID=TTTR.RESULT_UOM_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        where oo.order_id = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getPauseTimeTaskDetail" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select sum(TTTR.RESULT_VALUE) "TotalValue"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID=TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTR.RESULT_TOTAL_ID =TTTR.RESULT_TOTAL_ID
+        WHERE  OO.ORDER_ID = #{orderId}  AND TTTR.RESULT_TIME_TYPE =7
+    </select>
+
+    <select id="getInwardOrderMessage" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+            OO.ORDER_NUMBER "orderNumber",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            OO.ORDER_ID "orderId",
+            ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
+            ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
+            ( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
+            ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+            RM.MATERIAL_NAME "materialName"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
+        WHERE
+            OO.ORDER_ID = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 </mapper>

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

@@ -752,27 +752,35 @@
         </where>
     </select>
     <select id="getTimeTaskEndOrder" resultType="java.util.Map" parameterType="java.util.Map">
-        select OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               OO.ORDER_ID "orderId"
-        from OMSTRUCK_ORDER OO
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID=OO.ORDER_ID
-        left join RMS_CAPACITY RC
-        ON RC.CAPACITY_ID=OO.CAPACITY_ID
-        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
-        ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
-        WHERE OO.INSERT_USERNAME=#{orgCode}
+        SELECT
+            OO.ORDER_NUMBER "orderNumber",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            OO.ORDER_ID "orderId",
+            ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
+            ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
+            ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+
+            RM.MATERIAL_NAME "materialName"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
+        WHERE
+                TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
     </select>
 
     <select id="getInward" resultType="java.lang.Integer">
         select count(*) from  OMSTRUCK_ORDER OO
-                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
-                           ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-                           ON ARP.PLAN_ID = AIP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         where AIR.DUE_DATE	&gt;= sysdate and OO.ORDER_ID = #{orderId}
     </select>