fdsdf

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

@@ -146,14 +146,41 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         mapValue.put("detailStatus",detailStatus);
-        List<Map<String, Object>> truckDetailList = bmstruckDetailsOrderService.getInwardWeightDetailsOrder(mapValue,orderType);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getInwardWeightDetailsOrder(mapValue,orderType);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckDetailList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
+    @PostMapping("/getNoInwardDetails")
+    public RESTfulResult getNoInwardDetails(@RequestBody(required = false) Map<String,Object>mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String carrierSsoId,
+                                            String userId,
+                                            String startTime,
+                                            String endTime){
+        if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
+            carrierSsoId = null;
+        }
+        if (carrierSsoId != null) {
+            BigDecimal carrierId = bmstruckDetailsOrderService.getCarrierIdBySSO(carrierSsoId);
+            mapValue.put("carrierId",carrierId);
+        }
+        if(userId != null){
+            mapValue.put("userId","%"+ userId +"%");
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getNoInwardDetails(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
+
+
     /**
      * 展示汽运实绩信息
      *

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

@@ -144,4 +144,6 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     List<Map<String, Object>> selectDetailsNoAmount();
 
+    List<Map<String, Object>> getNoInwardDetails(Map<String, Object> mapValue);
+
 }

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

@@ -109,4 +109,5 @@ public interface IBmstruckDetailsOrderService {
 
     List<Map<String, Object>> getInwardWeightTimeDetailsOrder(Map<String, Object> mapValue,Integer orderType);
 
+    List<Map<String, Object>> getNoInwardDetails(Map<String, Object> mapValue);
 }

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

@@ -44,6 +44,9 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
 
+
+    final private List<Integer>  inwardTypeList = Arrays.asList(10,11,15,16,23,24);
+
     /**
      * 展示汽运详单列表
      * @param mapVal
@@ -545,18 +548,22 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         //根据运输订单去查找订单类型
         BigDecimal orderType = bmstruckDetailsOrderMapper.getOrderType(orderId);
         List<Map<String,Object>> priceAmountList = new ArrayList<>();
-        if(orderType.intValue() == 11 || orderType.intValue() == 10 || orderType.intValue() == 20){
+        if(inwardTypeList.contains(orderType.intValue())){
+            //获取该订单的计量实绩ID以及净重
                 priceAmountList = bmstruckDetailsOrderMapper.getWeightTaskResultId(orderId);
         }
         if(orderType.intValue() == 10){
+            //精煤化工园区铁专线-焦化二厂线路固定
             Map<String,Object>map = bmstruckDetailsOrderMapper.getPriceByPur(3);
             mapVal.putAll(map);
         }
         if(orderType.intValue() == 20){
+            //化工园区铁专线-月亮湾线路固定
             Map<String,Object>map = bmstruckDetailsOrderMapper.getPriceByPur(2);
             mapVal.putAll(map);
         }
         if(orderType.intValue() == 21){
+            //计时
             priceAmountList.add(mapVal);
         }
         //获取单价ID
@@ -566,7 +573,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         int result = 0;
         for (Map<String, Object> map : priceAmountList) {
             BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
-            if(orderType.intValue() == 11 || orderType.intValue() == 20 || orderType.intValue() == 10){
+            if(inwardTypeList.contains(orderType.intValue())){
                 BigDecimal weightTaskResultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
                 BigDecimal netWeight = null;
                 if(mapVal.get("netWeight") != null) {
@@ -599,6 +606,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             bmstruckDetailsOrder.setPriceId(priceId);
             // 得到最大id
             BigDecimal detailsId = selectMaxId();
+            bmstruckDetailsOrder.setOrderId(orderId);
             String detailsNo = noUtil.setResultNo("QYXD", detailsId);
             bmstruckDetailsOrder.setDetailsId(detailsId);
             bmstruckDetailsOrder.setDetailsNo(detailsNo);
@@ -666,4 +674,9 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                //返回计重+计时计费详单查询结果
         return mapListWeight;
     }
+
+    @Override
+    public List<Map<String, Object>> getNoInwardDetails(Map<String, Object> mapValue) {
+        return bmstruckDetailsOrderMapper.getNoInwardDetails(mapValue);
+    }
 }

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    url: jdbc:oracle:thin:@172.16.33.165:1521:ilsdbstd
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-bmstruck-api-dev
@@ -13,4 +13,4 @@ openfeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 
 server:
-  port: 8009
+  port: 8076

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/bmstruck
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8
@@ -30,7 +30,7 @@ cache:
 redis:
   host: 10.10.50.28
   port: 6379
-  pwd: 123456
+  pwd: adhykdj
   project:
     prefix: sysmanage
   pool:

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

@@ -1559,5 +1559,69 @@
         WHERE BDO.DETAILS_AMOUNT = 0
           and oo.order_type = 11
     </select>
+    <select id="getNoInwardDetails" resultType="java.util.Map" parameterType="java.util.Map">
+        select * from (SELECT oo.ORDER_ID as "orderId",
+                              oo.ORDER_NUMBER as "orderNumber",
+                              rc.CAPACITY_NUMBER as "capacityNumber",
+                              RCE.CARRIER_NAME as "carrierName",
+                              actp.PRICE_VALUE as "priceValue",
+                              twr.RESULT_NET_WEIGHT as "resultNetWeight",
+                              RW.WAREHOUSE_NAME as "unloadName",
+                              RW1.WAREHOUSE_NAME as "loadName",
+                              RS.SHIPPER_NAME as "shipperName",
+                              RM.MATERIAL_NAME as "materialName",
+                              GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME) as "netTime",
+                              RMT.MATERIAL_TYPE_NAME as "materialTypeName",
+                              RTR.TRANS_RANGE_VALUE as "rangeValue"
+                       FROM OMSTRUCK_ORDER OO
+                                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                          ON TTR.ORDER_ID = OO.ORDER_ID
+                                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                                          ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                                LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+                                          ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
+                                LEFT JOIN RMS_MATERIAL RM
+                                          ON RM.MATERIAL_ID = TWR.MATERIAL_ID
+                                LEFT JOIN RMS_MATERIAL_TYPE RMT
+                                          ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+                                LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                                          ON AIP.PLAN_ID = OO.ORDER_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
+                                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
+                                LEFT JOIN RMS_WAREHOUSE RW1
+                                          ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+                                LEFT JOIN RMS_SHIPPER RS
+                                          ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                                LEFT JOIN RMS_CARRIER RCE
+                                          ON RCE.CARRIER_ID = AIP.CARRIER_ID
+                                LEFT JOIN RMS_CAPACITY rc
+                                          ON oo.CAPACITY_ID = rc.CAPACITY_ID
+                                LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
+                                          ON actp.PRICE_ID = bdo.PRICE_ID
+                                LEFT JOIN RMS_TRANS_RANGE RTR
+                                          ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+                       WHERE RMT.MATERIAL_ISINWARD = 1
+                         AND BDO.DETAILS_ID IS NULL
+                         AND OO.ORDER_TYPE in (11, 15, 16, 23, 24)
+                         AND OO.ORDER_STATUS = 2
+                       order by twr.result_tare_weight_time desc
+                        <if test="userId != null" >
+                            AND  AIR.INSERT_USERNAME LIKE #{userId}
+                        </if>
+                        <if test="oneDate != null">
+                            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_RECEIVE_REFUSE_TIME
+                        </if>
+                        <if test="startDate != null">
+                            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_RECEIVE_REFUSE_TIME
+                            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.ORDER_RECEIVE_REFUSE_TIME
+                        </if>
+            )
+    </select>
 
 </mapper>