Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -2,20 +2,16 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -823,44 +819,22 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               String con,
                                               String carrierSsoId
     ) {
-        int count = 0;
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
-            count++;
         }
 
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
-            count++;
         }
-        mapValue.put("carrierSsoId",carrierSsoId);
-        count++;
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_driverinfo_for_sale";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
+        if (con != null && (con.equals("") || con.equals("undefined"))) {
+            con = null;
         }
-        //不分页筛选数据
-        List<Map<String, Object>> DiverInfoForSale = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_driverinfo_for_sale");
-            //添加id
-            map.put("indexId", "driverInfoId");
-            DiverInfoForSale.add(map);
-            //新建索引
-            esFeign.insertIndex(DiverInfoForSale);
-            //删除
-            DiverInfoForSale.remove(DiverInfoForSale.size() - 1);
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
         }
-        if (DiverInfoForSale == null)
-            DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
+        mapValue.put("carrierSsoId",carrierSsoId);
+        //不分页筛选数据
+        List<Map<String, Object>> DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> diverInfoForSaleorder = omstruckOrderService.selectTransportOrderForSale(mapValue);

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

@@ -277,4 +277,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(result);
     }
 
+    @ApiOperation(value = "根据运单id查询出所有销售数据")
+    @PostMapping("/getSaleAllMessages")
+    public Map<String,Object> getSaleAllMessages(@RequestParam Integer orderId){
+        Map<String, Object> mapValue = omstruckOrderSeparateService.getSaleAllMessages(new BigDecimal(orderId));
+        return mapValue;
+    }
+
 }

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

@@ -90,6 +90,15 @@ public interface OmstruckOrderSeparateMapper {
     //查询订单发货日期（订单类型为2）
     Integer getDeliveryDate(Object orderId);
 
+    // 查询销售焦炭所需的map
+    Map<String, Object> getSaleAllMessages(BigDecimal orderId);
+
+    // 查询销售焦炭所需的mapList
+    List<Map<String, Object>> getMapList(BigDecimal orderId);
+
+    // 查询销售焦炭的最大车序号
+    List<Map<String, Object>> getMaxTruckNo(BigDecimal saleOrderId);
+
 
 //    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
 

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

@@ -29,4 +29,7 @@ public interface IOmstruckOrderSeparateService {
 
     //更改趟次
     int updateTimes(BigDecimal orderPlanId, int i);
+
+    // 根据运单id查询出所有销售数据
+    Map<String, Object> getSaleAllMessages(BigDecimal orderId);
 }

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

@@ -428,4 +428,24 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
 //    public int updateTimes(BigDecimal orderPlanId, int times) {
 //         return omstruckOrderSeparateMapper.updateTimes(orderPlanId,times);
 //       }
+
+    /**
+     * 根据运单id查询出所有销售数据
+     * @param orderId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getSaleAllMessages(BigDecimal orderId) {
+        // 销售订单id
+        Map<String,Object> mapValue = omstruckOrderSeparateMapper.getSaleAllMessages(orderId);
+        BigDecimal saleOrderId = (BigDecimal) mapValue.get("saleOrderId");
+        // 车序号
+        List<Map<String, Object>> truckList = omstruckOrderSeparateMapper.getMaxTruckNo(saleOrderId);
+        Map<String, Object> map = truckList.get(0);
+        mapValue.putAll(map);
+        // mapList中的数据
+        List<Map<String,Object>> mapList = omstruckOrderSeparateMapper.getMapList(orderId);
+        mapValue.put("mapList",mapList);
+        return mapValue;
+    }
 }

src/main/resources/application-dev.yml

@@ -11,13 +11,13 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 server:
   port: 8016

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

@@ -1662,8 +1662,8 @@
     </select>
     <!--销售，查看运输订单(钢材销售订单)并根据司机接受或者拒绝时间进行排序  -->
     <select id="selectTransportOrderForSale" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT *
-        from(
+        SELECT * FROM (
+        SELECT *from(
         select
         OO.ORDER_NUMBER "orderNumber",
         ASO.SALE_NUMBER "saleNumber",
@@ -1698,6 +1698,10 @@
                 and OO.ORDER_TYPE in (1, 2)
             </if>
         </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con}
+        </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -521,7 +521,7 @@
         join AMS_SALE_ORDER_MATERIAL ASOM
             on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         where OO.ORDER_ID = #{orderId}
-          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
+          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD') >= TO_CHAR(SYSDATE, 'YYYY-MM-DD')
     </select>
 
  <!--    修改运输订单趟次-->
@@ -530,4 +530,47 @@
 <!--          where sporadic_order_id= #{orderPlanId}-->
 <!--      </update>-->
 
+    <select id="getSaleAllMessages" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_ORDER_ID AS "saleOrderId",
+               ASO.CLOSE_STATUS   AS "closeStatus"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getMaxTruckNo" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "truckNo"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+        ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO DESC
+    </select>
+
+    <select id="getMapList" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_SHIPPING_ADDRESS_ID AS "saleShippingAddressId",
+               ASOM.SALE_ORDER_CONSIGNEE     AS "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
+               ASM.SALE_MATERIAL_ID          AS "saleMaterialId",
+               ADSO.CARRIER_ID               AS "carrierId",
+               OO.LINE_ID                    AS "lineId",
+               OOM.MATERIAL_ID               AS "materialId",
+               OOM.ORDER_MATERIAL_WEIGHT     AS "orderPlanWeight",
+               RC.CAPACITY_NUMBER            AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>