adfghfaj

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

@@ -185,6 +185,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.getUnloadOrderMaterial(map));
     }
 
+    @PostMapping("getUnloadOrderWarehouseName")
+    public RESTfulResult getUnloadOrderWarehouseName(@RequestBody(required = false) Map<String,Object> map){
+        return success(omstruckOrderSeparateService.getUnloadOrderWarehouseName(map));
+    }
+
     /**
      * 承运商销售分派运输订单给司机
      * @param mapValue
@@ -237,6 +242,19 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.getAllLoadUnloadResult(map));
     }
 
+    @ApiOperation(value = "查看计时完成详情")
+    @PostMapping("/getTimeTaskEnd")
+    public RESTfulResult getTimeTaskEnd(@RequestBody (required = false) Map<String, Object> map){
+        return success(omstruckOrderSeparateService.getTimeTaskEnd(map));
+    }
+
+    @PostMapping("/getTimeTaskEndDetail")
+    public RESTfulResult getTimeTaskEndDetail(@RequestBody (required = false) Map<String, Object> map){
+        return success(omstruckOrderSeparateService.getTimeTaskEndDetail(map));
+    }
+
+
+
     @ApiOperation(value = "批量关闭运输订单")
     @PostMapping("/batchCloseOrder")
     public RESTfulResult batchCloseOrder(@RequestBody List<Map<String,Object>> mapList){

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -49,4 +49,8 @@ public interface TmsTruckFeign {
     //发送计量委托,运输订单id
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
     RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+    //新增计时作业实绩
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
+    RESTfulResult addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -11,4 +11,11 @@ import java.util.Map;
 
 @Mapper
 public interface AmstruckInwardPlanMapper extends IBaseMapper<AmstruckInwardPlan, BigDecimal> {
+
+    //通过订单id查找需求类型是否为计时作业
+    Map<String,Object> getTypeByOrderId(BigDecimal orderId);
+
+    //根据计划查找是否为计时作业需求
+    String getInwardByPlanId(BigDecimal planId);
+
 }

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

@@ -313,4 +313,5 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //根据运输订单号查找需要用车时长
     Map<String,Object>  selectInwardTimeByOrderId(BigDecimal orderId);
 
+    List<Map<String, Object>> getTimeTaskEndDetail(Map<String, Object> map);
 }

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

@@ -40,4 +40,5 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     //根据订单ID查询订单物资ID
     List<Map<String, Object>> getOrderMaterial(Integer orderId);
 
+    List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
 }

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

@@ -130,5 +130,8 @@ public interface OmstruckOrderSeparateMapper {
 
     int closeInwardOrder(@Param("orderId") Integer orderId, @Param("sqe") Integer sqe);
 
+    List<Map<String, Object>> getTimeTaskEndOrder(Map<String, Object> map);
+
     int  getInward(Object orderType);
+
 }

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

@@ -41,4 +41,12 @@ public interface IOmstruckOrderSeparateService {
     List<Map<String,Object>> getOrderMaterial(Integer orderId);
 
     int closeInwardOrder(Integer orderId, Integer sqe);
+
+
+    List<Map<String,Object>> getTimeTaskEnd(Map<String, Object> map);
+
+    List<Map<String,Object>> getTimeTaskEndDetail(Map<String, Object> map);
+
+    List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
+
 }

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

@@ -3,10 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.fasterxml.jackson.databind.ObjectReader;
 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;
+import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.dil.service.IOmstruckOrderSeparateService;
@@ -37,6 +34,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Autowired
     AmsSaleOrderMaterialMapper amsSaleOrderMaterialMapper;
 
+    @Autowired
+    AmstruckInwardPlanMapper amstruckInwardPlanMapper;
+
     @Autowired
     private OmstruckOrderMapper omstruckOrderMapper;
 
@@ -61,6 +61,14 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         Integer resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId")).intValue();
         Integer lineId = DataChange.dataToBigDecimal(map.get("lineId")).intValue();
         int result = 0;
+//        //通过订单id判断订单类型是否为计时，如果是计时就添加计时作业实绩
+//        BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
+//        Map<String, Object> mesMap = amstruckInwardPlanMapper.getTypeByOrderId(orderId);
+//        String requirementType = (String) mesMap.get("requirementType");
+//        if (requirementType.equals("计时")){
+//            //添加计时作业实绩
+//             tmsTruckFeign.addTimeTaskResult(map);
+//        }
         //通过总实绩Id 查询关联的线路子表顺序
         List<Map<String, Object>> segmentList = omstruckOrderSeparateMapper.getLineMesByOrderId(lineId);
         Map<String,Object> totalIdMap = new HashMap<>();
@@ -642,4 +650,28 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         }
         return i;
     }
+
+
+    //根据用户id和运输订单号查找已经计时完成的订单
+    @Override
+    public List<Map<String, Object>> getTimeTaskEnd(Map<String, Object> map) {
+        List<Map<String, Object>> getTimeTaskEndOrder = omstruckOrderSeparateMapper.getTimeTaskEndOrder(map);
+        return getTimeTaskEndOrder;
+
+    }
+
+    //根据运输订单号查找运输订单详情
+    @Override
+    public List<Map<String, Object>> getTimeTaskEndDetail(Map<String, Object> map) {
+        List<Map<String,Object>> mapList=omstruckOrderMapper.getTimeTaskEndDetail(map);
+        return mapList;
+    }
+
+
+
+    @Override
+    public List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map) {
+        return omstruckOrderMaterialMapper.getUnloadOrderWarehouseName(map);
+    }
+
 }

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

@@ -574,19 +574,26 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         for (Map<String,Object> allResultId:allResultIdList
              ) {
             BigDecimal weightResultId =(BigDecimal) allResultId.get("weightResultId");
-            result += omstruckOrderMapper.deleteWeightResult(weightResultId);
+            if (weightResultId!=null) {
+                result += omstruckOrderMapper.deleteWeightResult(weightResultId);
+            }
             BigDecimal loadResultId =(BigDecimal) allResultId.get("loadResultId");
             if (loadResultId!=null) {
                 result += omstruckOrderMapper.deleteLoadResult(loadResultId);
             }
+
             BigDecimal leaveResultId=(BigDecimal) allResultId.get("leaveResultId");
-            result += omstruckOrderMapper.deleteLeaveResult(leaveResultId);
+            if (leaveResultId!=null) {
+                result += omstruckOrderMapper.deleteLeaveResult(leaveResultId);
+            }
             BigDecimal unloadResultId =(BigDecimal) allResultId.get("unloadResultId");
             if (unloadResultId!=null) {
                 result += omstruckOrderMapper.deleteUnloadResult(unloadResultId);
             }
             BigDecimal enFactoryId =(BigDecimal) allResultId.get("enFactoryId");
-            result +=omstruckOrderMapper.deleteEnResult(enFactoryId);
+            if (enFactoryId!=null) {
+                result += omstruckOrderMapper.deleteEnResult(enFactoryId);
+            }
         }
         //删除所有实绩
         Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
@@ -793,30 +800,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){
-                //发送计量委托
-                orderMessage.put("asd", 1);
-                orderMessage.put("orderId", orderId);
-                tmsTruckFeign.sendMeasureCommission(orderMessage);
-            }else {
-                //添加各个实绩
-                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) {
                 //通过订单查询趟次
@@ -1446,16 +1453,30 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Override
     public int addInwardOrder(Map<String, Object> mapValue) {
         int result = 0;
+        BigDecimal orderType;
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
         BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId")) ;
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId")) ;
-        BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType")) ;
+        orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
+        String orgCode=(String) mapValue.get("orgCode");
+        //根据计划查找需求，如果是计时，就添加新的订单类型
+        String inwardType = amstruckInwardPlanMapper.getInwardByPlanId(planId);
+        if (inwardType.equals("计时")){
+          mapValue.remove(orderType);
+          orderType = BigDecimal.valueOf(21);
+          mapValue.put("orderType",orderType);
+        }else if (inwardType.equals("计次")){
+            mapValue.remove(orderType);
+            orderType = BigDecimal.valueOf(22);
+            mapValue.put("orderType",orderType);
+        }
         Integer carrierId = (Integer) mapValue.get("carrierId");
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
         for (Map<String,Object> orderMap : mapList) {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
+            omstruckOrder.setInsertUsername(orgCode);
             String capacityNumber = (String)orderMap.get("capacityNumber");
             List<Map<String,Object>>orderMaterialList = (List<Map<String,Object>>)orderMap.get("orderMaterialList");
             Map<String,Object> capacityMap = new HashMap<>();
@@ -1481,8 +1502,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setCapacityId(capacityId);
             omstruckOrder.setInsertTime(new Date());
             omstruckOrder.setUpdateTime(new Date());
-            omstruckOrder.setInsertUsername("admin");
-            omstruckOrder.setUpdateUsername("admin");
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setDeleted(new BigDecimal(0));
             omstruckOrder.setOrderType(orderType);
@@ -1503,10 +1522,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterial.setMaterialId(materialId);
                 omstruckOrderMaterial.setOrderMaterialNumber(materialCount);
                 omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setInsertUsername(orgCode);
                 omstruckOrderMaterial.setUpdateTime(new Date());
-                omstruckOrderMaterial.setInsertUsername("admin");
-                omstruckOrderMaterial.setUpdateUsername("admin");
-                omstruckOrderMaterial.setInsertUpdateRemark("无");
                 omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
                 result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
@@ -1906,7 +1923,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public Map<String, Object> getMessageToApp(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType;
-        String type="";
+        String inwardType="";
         //获取订单类型
         if(map.get("orderType") == null){
             orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
@@ -1945,6 +1962,24 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
+                inwardType += "计重";
+                mesMap.put("inwardType", inwardType);
+                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
+                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
+                break;
+            case 21:
+                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
+                inwardType += "计时";
+                mesMap.put("inwardType", inwardType);
+                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:
@@ -1953,8 +1988,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 19:
                  mesMap=omstruckOrderMapper.getSporadicOrder(map);
-                 type += "零星退货";
-                 mesMap.put("type", type);
+                 mesMap.put("type", "零星退货");
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
 
@@ -1987,6 +2021,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            //如果订单类型为11 当订单大于截止日期时，不显示订单
             if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue()==11){
                 int result = omstruckOrderSeparateMapper.getInward(orderMesMap.get("orderId"));
                 if(result == 0){

src/main/resources/application-dev.yml

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

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

@@ -336,6 +336,7 @@
         <include refid="select"/>
         <include refid="whereLike"/>
     </select>
+
     <insert id="batchInsert" parameterType="java.util.List">
         insert into AMSTRUCK_INWARD_PLAN
         (PLAN_ID,
@@ -426,5 +427,25 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
+    <select id="getTypeByOrderId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        select AIR.REQUIREMENT_TYPE "requirementType"
+        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 AIP.PLAN_ID=ARP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+        WHERE  OO.ORDER_ID=#{orderId}
+    </select>
+<!-- 根据计划id查找需求为计时-->
+    <select id="getInwardByPlanId" resultType="java.lang.String" parameterType="java.math.BigDecimal">
+        select AIR.REQUIREMENT_TYPE "requirementType"
+         from AMSTRUCK_INWARD_PLAN AIP
+         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+         ON AIP.PLAN_ID=ARP.PLAN_ID
+         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+         ON ARP.REQUIREMENT_ID=AIR.REQUIREMENT_ID
+         WHERE AIP.PLAN_ID=#{planId}
+    </select>
 </mapper>

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

@@ -3277,4 +3277,7 @@
    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>
 </mapper>

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

@@ -440,6 +440,27 @@
                      on RM.MATERIAL_ID = OOM.MATERIAL_ID
     where oo.ORDER_NUMBER = #{orderNumber}
   </select>
+
+  <select id="getUnloadOrderWarehouseName" resultType="java.util.Map" parameterType="java.util.Map">
+    select RW.WAREHOUSE_NAME "warehouseName",
+            RW.WAREHOUSE_ID "warehouseId"
+    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 AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+  </select>
   <!--  //通过订单号获取计量实绩主键
       BigDecimal selectWeightResultId(BigDecimal orderId);-->
 <!--  <select id="selectWeightResultId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">-->

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

@@ -751,6 +751,19 @@
             </if>
         </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>
 
     <select id="getInward" resultType="java.lang.Integer">
         select count(*) from  OMSTRUCK_ORDER OO