Merge remote-tracking branch 'origin/master'

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

@@ -213,7 +213,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             BigDecimal carrierId = bmstruckDetailsOrderService.getCarrierIdBySSO(carrierSsoId);
             mapValue.put("carrierId",carrierId);
         }
-        if(userId != null){
+        if(userId != null &&  !"null".equals(userId)){
             mapValue.put("userId","%"+ userId +"%");
         }
         if(capacityNo != null && !"null".equals(capacityNo)){
@@ -235,7 +235,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getNoInwardDetails(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData5(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -18,7 +18,6 @@ import java.util.Map;
 public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
-    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId,
-                                        @RequestParam(value = "status") Integer status);
+    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
 
 }

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

@@ -173,5 +173,8 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
     List<BigDecimal> getDetailsIdByOrderId(Integer orderId);
 
     BigDecimal selectNetWeight(BigDecimal orderId);
-
+    //内转计次结算
+    List<Map<String, Object>> getInwardCountDetailsOrder(Map<String, Object> mapValue);
+    //查询该订单是否是计重且计时
+    String selectWeightAndTimeByOrderId(BigDecimal orderId);
 }

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

@@ -558,6 +558,8 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 return bmstruckDetailsOrderMapper.getInwardTimeDetailsOrder(mapValue);
             case 11:
                 return bmstruckDetailsOrderMapper.getAllInwardWeight(mapValue);
+            case 26:
+                return bmstruckDetailsOrderMapper.getInwardCountDetailsOrder(mapValue);
             default:
                 break;
         }
@@ -618,8 +620,8 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 return -1;
             }
         }
-        if(orderType.intValue() == 21){
-            //计时
+        if(orderType.intValue() == 21 || orderType.intValue()==26){
+            //计时/计次
             priceAmountList.add(mapVal);
         }
         //获取单价ID
@@ -633,7 +635,13 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         int result = 0;
         for (Map<String, Object> map : priceAmountList) {
             BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
-            if(inwardTypeList.contains(orderType.intValue())){
+            //查询计重且计时
+            String s = bmstruckDetailsOrderMapper.selectWeightAndTimeByOrderId(orderId);
+            int num=0;
+            if (s!=null && s.contains("计时且过计量")){
+                num=21;
+            }
+            if(inwardTypeList.contains(orderType.intValue()) && num==0){
                 BigDecimal weightTaskResultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
                 BigDecimal netWeight = null;
                 if(mapVal.get("netWeight") != null) {
@@ -655,20 +663,26 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 }
             }
             //内转计时结算
-            if(orderType.intValue() == 21){
-                BigDecimal resultTime = DataChange.dataToBigDecimal(map.get("Time1"));
+            if(orderType.intValue() == 21 || num==21){
+                BigDecimal resultTime = DataChange.dataToBigDecimal(mapVal.get("Time1"));
                 //保留两位小数
                 DecimalFormat df = new DecimalFormat("0.00");
-                BigDecimal settleTime  = new BigDecimal(df.format((float)resultTime.doubleValue()/60.00));
-                if(settleTime.doubleValue()<1.00){
-                    BigDecimal detailsAmount = new BigDecimal(priceValue.doubleValue());
+                BigDecimal settleTime  = new BigDecimal(String.valueOf(resultTime.divide(new BigDecimal(60), 14, BigDecimal.ROUND_HALF_UP)));
+                if(settleTime.doubleValue()<2.00){
+                    BigDecimal detailsAmount = new BigDecimal(priceValue.doubleValue()*2);
                     bmstruckDetailsOrder.setDetailsAmount(new BigDecimal(df.format(detailsAmount)));
-
                 }else{
                     BigDecimal detailsAmount = new BigDecimal(priceValue.doubleValue()*settleTime.doubleValue());
                     bmstruckDetailsOrder.setDetailsAmount(new BigDecimal(df.format(detailsAmount)));
                 }
             }
+            //内转计次结算
+            if(orderType.intValue() == 26){
+                //保留两位小数
+                DecimalFormat df = new DecimalFormat("0.00");
+                BigDecimal detailsAmount = new BigDecimal(priceValue.doubleValue());
+                bmstruckDetailsOrder.setDetailsAmount(new BigDecimal(df.format(detailsAmount)));
+            }
             bmstruckDetailsOrder.setPriceId(priceId);
             bmstruckDetailsOrder.setInsertUpdateRemark("单价存在");
             // 得到最大id
@@ -756,11 +770,12 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             if(orderType.intValue() == 11){
                 List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
                 if(detailsIds.size() == 0){
-                    omsFeign.closeInwardOrder(orderId,1);
+                    omsFeign.closeInwardOrder(orderId);
                     count++;
                 }else{
-                    for(int i=0;i<detailsIds.size()-1;i++){
+                    for(int i=0;i<detailsIds.size();i++){
                         bmstruckDetailsOrderMapper.deleteByPrimaryKey(detailsIds.get(i));
+                        omsFeign.closeInwardOrder(orderId);
                         count++;
                     }
                 }
@@ -776,7 +791,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 }
                 inserInwardOrder(orderIdMap);
             }
-            if(orderType.intValue() == 23){
+            if(orderType.intValue() == 23 || orderType.intValue() == 24){
                 List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
                 for(BigDecimal detailsId:detailsIds){
                     //根据详单ID物理删除详单

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

@@ -1234,6 +1234,7 @@
           <select id="getInwardWeightDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
         FROM (SELECT DISTINCT bdo.INSERT_TIME AS "insertTime",
+              r_c_type.CAPACITY_TYPE_NAME AS "capacityTypeName",
               bdo.DETAILS_ID AS "detailsId",
               oo.ORDER_ID AS "orderId",
               bdo.DETAILS_NO AS "detailsNo",
@@ -1287,6 +1288,8 @@
               ON oo.CAPACITY_ID = rc.CAPACITY_ID
               LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
               ON actp.PRICE_ID = bdo.PRICE_ID
+              LEFT JOIN RMS_CAPACITY_TYPE r_c_type
+              ON actp.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
               WHERE bdo.WETHER_TO_STATEMENT = #{detailStatus}
               AND oo.ORDER_TYPE = 11
                 <if test="userId != null" >
@@ -1343,6 +1346,7 @@
     <select id="getPurInwarWeightDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
         select *
         from (select oo.order_id     "orderId",
+        r_c_type.CAPACITY_TYPE_NAME  "capacityTypeName",
         bdo.DETAILS_ID               "detailsId",
         rm.material_name             "materialName",
         apo.purchase_order_no        "purchaseNo",
@@ -1400,6 +1404,8 @@
         ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_CAPACITY_TYPE r_c_type
+        ON ACTP.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
         where oo.order_type in (10, 20, 23, 24)
         AND bdo.WETHER_TO_STATEMENT = #{detailStatus}
         <if test="userId != null" >
@@ -1447,14 +1453,16 @@
                      rw.warehouse_name  "unloadName",
                      rw2.warehouse_name "loadName",
                      rm.material_name   "materialName",
-                     tttr.RESULT_VALUE   "resultTime",
+                     TTTR.result_balance_time   "resultTime",
+                     TTTR.result_value "resultValue",
                      actp.price_value   "priceValue",
                      bdo.details_time   "detailsTime",
                      bdo.details_amount "detailsAmount",
                      oo.order_number    "orderNumber",
                      bdo.details_no     "detailsNo",
                      bdo.INSERT_TIME    "insertTime",
-                     bdo.DETAILS_ID     "detailsId"
+                     bdo.DETAILS_ID     "detailsId",
+                     RCT.CAPACITY_TYPE_NAME  "capacityTypeName"
               from bmstruck_details_order bdo
                        left join OMSTRUCK_ORDER OO
                                  ON OO.ORDER_ID = BDO.ORDER_ID
@@ -1483,10 +1491,10 @@
                        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
+                                 ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
                        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
                                  ON ACTP.PRICE_ID = BDO.PRICE_ID
-              WHERE OO.ORDER_TYPE = 21
+              WHERE OO.ORDER_TYPE in (21,11)
                 AND TTTR.RESULT_TIME_TYPE = 3
                 AND bdo.WETHER_TO_STATEMENT = #{detailStatus}
                 <if test="userId != null" >
@@ -1566,7 +1574,6 @@
         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",
@@ -1575,7 +1582,6 @@
         GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME) as "netTime",
         RMT.MATERIAL_TYPE_NAME as "materialTypeName",
         decode(RMT.MATERIAL_ISINWARD,1,'是','否')   as "materialIsWard",
-        RTR.TRANS_RANGE_VALUE as "transRangeValue",
         decode(oo.ORDER_TYPE,11,'纯内转',15,'拼装车皮进厂',16,'一焦化采购进厂',10,'新区专线-新区',20,'新区专线-老区',23,'厂外内转-老区',24,'厂外内转-新区') as "orderType"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
@@ -1606,24 +1612,22 @@
         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
         BDO.DETAILS_ID IS NULL
         AND OO.ORDER_TYPE in (11, 15, 16, 23, 24,10,20,25)
         AND OO.ORDER_STATUS = 2
+        AND AIR.INSERT_UPDATE_REMARK not like '%计时且过计量%'
         <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
+        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_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
+        and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
+        and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
         </if>
+
         order by twr.result_tare_weight_time desc
         )
         <where>
@@ -1666,10 +1670,12 @@
     </select>
     <select id="getPurInwardPrice" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM (
-        select distinct actp.price_id "priceId", actp.price_value "priceValue" ,actp.PRICE_DATE "priceDate"
+        select distinct actp.price_id "priceId", actp.price_value "priceValue" ,rop.PRICE_DATE "priceDate"
         from ams_contract_transport_price actp
         left join ams_contaact_price_material acpm
         on acpm.price_id = actp.price_id
+        left join RMS_OIL_PRICE ROP
+        on rop.PRICE_OIL_TYPE_ID = actp.OIL_TYPE_ID
         left join rms_trans_range rtr
         on rtr.trans_range_id = actp.line_id
         where actp.DELETED = 0
@@ -1686,12 +1692,14 @@
         <if test="materialTypeId == null">
             and acpm.MATERIAL_ID = 0
         </if>
+        ORDER BY rop.PRICE_DATE DESC
         )
         WHERE ROWNUM = 1
     </select>
     <select id="getAllInwardWeight" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM (
                           SELECT rc.CAPACITY_NUMBER AS "capacityNumber",
+                                 r_c_type.CAPACITY_TYPE_NAME         "capacityTypeName",
                                  RCE.CARRIER_NAME AS "carrierName",
                                  RS.SHIPPER_NAME AS "shipperName",
                                  DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
@@ -1716,14 +1724,16 @@
                           FROM BMSTRUCK_DETAILS_ORDER bdo
                                    LEFT JOIN TMSTRUCK_WEIGHT_RESULT twr
                                              ON twr.WEIGHT_TASK_RESULT_ID = bdo.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 TMSTRUCK_TOTAL_RESULT ttl
                                              ON ttl.RESULT_TOTAL_ID = twr.RESULT_TOTAL_ID
                                    LEFT JOIN OMSTRUCK_ORDER oo
                                              ON oo.ORDER_ID = ttl.ORDER_ID
+                                   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 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
@@ -1748,8 +1758,11 @@
                                              ON actp.PRICE_ID = bdo.PRICE_ID
                                    LEFT JOIN DIL_BATCH DB
                                              ON DB.BATCH_ID = 0
+                                   LEFT JOIN RMS_CAPACITY_TYPE r_c_type
+                                             ON actp.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
                           WHERE bdo.WETHER_TO_STATEMENT = #{detailStatus}
                             AND oo.ORDER_TYPE in (11,25)
+                            AND AIR.INSERT_UPDATE_REMARK not like '%计时且过计量%'
                             <if test="userId != null" >
                                 AND AIR.INSERT_USERNAME LIKE #{userId}
                             </if>
@@ -1762,6 +1775,7 @@
                             </if>
                           UNION ALL
                           select rc.capacity_number "capacityNumber",
+                                 r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
                                  RCA.CARRIER_NAME "carrierName",
                                  RSH.SHIPPER_NAME "shipperName",
                                  DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
@@ -1830,6 +1844,8 @@
                                              ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
                                    LEFT JOIN RMS_CARRIER RCA
                                              ON RCA.CARRIER_ID = AIP.CARRIER_ID
+                                   LEFT JOIN RMS_CAPACITY_TYPE r_c_type
+                                             ON ACTP.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
                           where oo.order_type in (10, 20, 23, 24)
                             AND bdo.WETHER_TO_STATEMENT = #{detailStatus}
                             <if test="userId != null" >
@@ -1844,6 +1860,7 @@
                             </if>
                           UNION ALL SELECT
                                         rc.capacity_number "capacityNumber",
+                                        r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
                                         RCA.CARRIER_NAME "carrierName",
                                         RSH.SHIPPER_NAME "shipperName",
                                         DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
@@ -1888,6 +1905,7 @@
                                   LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
                                   LEFT JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = AIP.CARRIER_ID
                                   LEFT JOIN RMS_SHIPPER RSH ON RSH.SHIPPER_ID = 0
+                                  LEFT JOIN RMS_CAPACITY_TYPE r_c_type ON ACTP.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
                           WHERE
                               oo.order_type BETWEEN 15
                                   AND 16
@@ -2178,4 +2196,98 @@
         left join RMS_RECEIVE_ADDRESS RRA
         on RRA.ADDRESS_ID=RRP.ADDRESS_ID
     </select>
+
+    <select id="getInwardCountDetailsOrder" resultType="java.util.Map">
+        select *
+        from (select RC.CAPACITY_NUMBER "capacityNum",
+        RCT.CAPACITY_TYPE_NAME         "capacityTypeName",
+        rs.shipper_name    "shipperName",
+        rw.warehouse_name  "unloadName",
+        rw2.warehouse_name "loadName",
+        rm.material_name   "materialName",
+        TTTR.result_balance_time   "resultTime",
+        actp.price_value   "priceValue",
+        bdo.details_time   "detailsTime",
+        bdo.details_amount "detailsAmount",
+        oo.order_number    "orderNumber",
+        bdo.details_no     "detailsNo",
+        bdo.INSERT_TIME    "insertTime",
+        bdo.DETAILS_ID     "detailsId"
+        from bmstruck_details_order bdo
+        left join OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = BDO.ORDER_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTTR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        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 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
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON ACTP.PRICE_ID = BDO.PRICE_ID
+        WHERE OO.ORDER_TYPE = 26
+        AND TTTR.RESULT_TIME_TYPE = 3
+        AND bdo.WETHER_TO_STATEMENT = #{detailStatus}
+        <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;= bdo.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
+        </if>)
+        <where>
+            <if test="capacityNo!= null">
+                and
+                <foreach collection="capacityNo" item="item" open="(" separator="," close=")">
+                    "capacityNo" in #{item}
+                </foreach>
+            </if>
+            <if test="materialName!= null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="shipperName!= null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="," close=")">
+                    "shipperName" in #{item}
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <select id="selectWeightAndTimeByOrderId" resultType="java.lang.String">
+            select AIR.insert_update_remark 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>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout