tijiao

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

@@ -11,6 +11,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.web.bind.annotation.*;
@@ -112,11 +113,10 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             BigDecimal carrierId = bmstruckDetailsOrderService.getCarrierIdBySSO(carrierSsoId);
             mapValue.put("carrierId",carrierId);
         }
-        List<Map<String, Object>> truckDetailList = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapValue, orderType);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapValue, orderType);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckDetailList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -343,4 +343,30 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiOperation(value = "获取钢材运费详单")
+    @PostMapping("getSteelTruckDetailsOrder")
+    public RESTfulResult getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   Integer orderType,
+                                                   String carrierSsoId,
+                                                   String startTime,
+                                                   String endTime,
+                                                   String con){
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        if (carrierSsoId != null && !"null".equals(carrierSsoId)) {
+            BigDecimal carrierId = bmstruckDetailsOrderService.getCarrierIdBySSO(carrierSsoId);
+            mapValue.put("carrierId",carrierId);
+        }
+        if (con != null && !"null".equals(con)){
+            mapValue.put("con","%" + "%");
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getSteelTruckDetailsOrder(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
+
+
 }

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

@@ -151,4 +151,7 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
     Map<String, Object> getPurInwardPrice(Map<String, Object> priceInfoPur);
 
     List<Map<String, Object>> getAllInwardWeight(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getSteelTruckDetailsOrder(Map<String, Object> mapValue);
+
 }

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

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

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

@@ -701,4 +701,9 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
     public List<Map<String, Object>> getNoInwardDetails(Map<String, Object> mapValue) {
         return bmstruckDetailsOrderMapper.getNoInwardDetails(mapValue);
     }
+
+    @Override
+    public List<Map<String, Object>> getSteelTruckDetailsOrder(Map<String, Object> mapValue) {
+        return bmstruckDetailsOrderMapper.getSteelTruckDetailsOrder(mapValue);
+    }
 }

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 
 server:
   port: 8076

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

@@ -647,11 +647,14 @@
         ON RRP.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
-        WHERE oo.ORDER_TYPE in (1,2)
+        WHERE oo.ORDER_TYPE between 1 and 2
         AND bdo.WETHER_TO_STATEMENT = 0
         <if test="carrierId != null" >
             AND RC2.CARRIER_ID = #{carrierId}
         </if>
+        <if test="orderType != null" >
+            AND oo.ORDER_TYPE = #{orderType}
+        </if>
         )
         <where>
             <if test="detailsNo!= null">
@@ -1928,5 +1931,65 @@
         </where>
         <include refid="orderBy"></include>
     </select>
+    <select id="getSteelTruckDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (SELECT DISTINCT
+                           bdo.INSERT_TIME AS "insertTime",
+                           bdo.DETAILS_ID AS "detailsId",
+                           oo.ORDER_ID AS "orderId",
+                           bdo.DETAILS_NO AS "detailsNo",
+                           oo.ORDER_NUMBER AS "orderNumber",
+                           bdo.DETAILS_TIME AS "detailsTime",
+                           rc.CAPACITY_NUMBER AS "capacityNumber",
+                           RC2.CARRIER_ABBREVIATION AS "carrierName",
+                           rs.SHIPPER_NAME AS "shipperName",
+                           rco.CONSIGNEE_COMPANY_NAME AS "companyName",
+                           actp.PRICE_VALUE AS "priceValue",
+                           bdo.DETAILS_AMOUNT AS "detailsAmount",
+                           RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "realAddress",
+                           twr.RESULT_NET_WEIGHT AS "resultNetWeight",
+                           twr.RESULT_GROSS_WEIGHT_TIME "preparationDate",
+                           RM.MATERIAL_NAME "materialName",
+                           RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "materialSpa",
+                           ASM.MATERIAL_NUMBER "materialNum",
+                           ASO.SALE_REMARK "saleRemark",
+                           ASM.MATERIAL_WEIGHT "theoryWeight",
+                           rsa.area_name "areaName",
+                           aso.sale_order_receive_customer "receiveMoneyCus",
+                           ASM.EAS_PRIMARY_ID	"easPrimaryId"
+                       FROM
+                           BMSTRUCK_DETAILS_ORDER bdo
+                               LEFT JOIN TMSTRUCK_WEIGHT_RESULT twr ON twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
+                               LEFT JOIN TMSTRUCK_TOTAL_RESULT ttl ON ttl.RESULT_TOTAL_ID = twr.RESULT_TOTAL_ID
+                               LEFT JOIN TMSTRUCK_LOAD_RESULT tlr ON tlr.RESULT_TOTAL_ID = ttl.RESULT_TOTAL_ID
+                               LEFT JOIN OMSTRUCK_ORDER oo ON oo.ORDER_ID = ttl.ORDER_ID
+                               LEFT JOIN AMS_SALE_ORDER_MATERIAL asom ON oo.ORDER_PLAN_ID = asom.SALE_ORDER_MATERIAL_ID
+                               LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO ON ADSO.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
+                               LEFT JOIN RMS_CARRIER RC2 ON RC2.CARRIER_ID = ADSO.CARRIER_ID
+                               LEFT JOIN AMS_SALE_ORDER aso ON aso.SALE_ORDER_ID = asom.SALE_ORDER_ID
+                               LEFT JOIN RMS_SHIPPER rs ON rs.SHIPPER_ID = aso.SHIPPER_ID
+                               LEFT JOIN RMS_CONSIGNEE rco ON rco.CONSIGNEE_ID = aso.RECEIVE_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_RECEIVE_PLACE RRP ON RRP.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
+                               LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                               LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = TWR.MATERIAL_ID
+                               LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                               AND ASM.MATERIAL_ID = RM.MATERIAL_ID
+                               LEFT JOIN RMS_SALE_AREA RSA ON RSA.AREA_ID = RCO.AREA_ID
+                       WHERE
+                           oo.ORDER_TYPE = 1
+                         AND bdo.WETHER_TO_STATEMENT = 0
+                         <if test="carrierId != null">
+                             and RC2.CARRIER_ID = #{carrierId}
+                         </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>
+            )
+    </select>
 
 </mapper>