修改

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.*;
 
@@ -809,44 +805,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

@@ -253,4 +253,18 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(capacityAllOrderList);
     }
 
+    @ApiOperation(value = "根据运单id关闭运输订单")
+    @PostMapping("/closeOrder")
+    public RESTfulResult closeOrder(@RequestParam Integer orderId){
+        int result = omstruckOrderSeparateService.closeOrder(orderId);
+        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

@@ -85,6 +85,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

@@ -24,7 +24,12 @@ public interface IOmstruckOrderSeparateService {
 
     // 承运商销售分派运输订单给司机
     Integer addSaleTruckOrder(Map<String, Object> mapValue);
+    // 关闭订单
+    int closeOrder(Integer orderId);
 
     //更改趟次
     int updateTimes(BigDecimal orderPlanId, int i);
+
+    // 根据运单id查询出所有销售数据
+    Map<String, Object> getSaleAllMessages(BigDecimal orderId);
 }

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

@@ -399,6 +399,20 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public int updateTimes(BigDecimal orderPlanId, int times) {
         return omstruckOrderSeparateMapper.updateTimes(orderPlanId, times);
     }
+    /**
+     * 根据运单id关闭运输订单
+     * @param orderId
+     * @return
+     */
+    @Override
+    public int closeOrder(Integer orderId) {
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        omstruckOrder.setOrderId(new BigDecimal(orderId));
+        omstruckOrder.setOrderStatus(new BigDecimal(8));
+        int result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        return result;
+    }
+
     /**
      * @Author TXF
      * @Date 2021/12/30 16:15
@@ -414,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/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -112,6 +112,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 5:
             case 6:
             case 7:
+            case 17:
+            case 18:
                 i = addCGPurOrders(map);
                 break;
             case 8:
@@ -228,6 +230,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 if (map.get("purchaseOrderId") != null)
                     omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
                 if (map.get("unloadPointId") != null) // 添加卸货点
@@ -318,6 +322,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 //生成子表主键
                 omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
                 omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
@@ -392,6 +398,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 //修改运输订单子表物资重量
                 OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
                 //添加子表主键 通过订单ID查询出子表主键
@@ -579,7 +587,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
             //添加各个实绩
             omstruckOrderSeparateService.addAllSonResult(orderMessage);
-
             //判断订单是否是一车多单
             BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
             if (orderType.intValue()==15 || orderType.intValue()==16) {
@@ -826,7 +833,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String carrierSsoId = (String) map.get("carrierSsoId");
         BigDecimal carrierId = omstruckOrderMapper.getCarrierIdBySSO(carrierSsoId);
         map.put("carrierId",carrierId);
-        return omstruckOrderMapper.selectTransportOrderForSale(map);
+        List<Map<String, Object>> mapList = omstruckOrderMapper.selectTransportOrderForSale(map);
+        int count = 1;
+        for (Map<String, Object> stringObjectMap : mapList) {
+            stringObjectMap.put("ROW_ID",count);
+            count ++;
+        }
+        return mapList;
     }
 
     @Override
@@ -1671,6 +1684,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 mesMap = omstruckOrderMapper.getCGOrderMessageToApp(map);
                 break;
             case 9:
@@ -1681,8 +1696,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 12:
             case 13:
             case 15:
+            case 16:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
-                break;
+                
 
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));

src/main/resources/application-dev.yml

@@ -19,6 +19,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}
 
+
 server:
   port: 8016
 

src/main/resources/bootstrap.yml

@@ -44,12 +44,6 @@ redis:
   database: 0
 
 
-
-
-
-
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml

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

@@ -702,9 +702,12 @@
             <if test="orderTypee != null">
                 and OO.ORDER_TYPE = #{orderTypee}
             </if>
-            <if test="fuelOrder != null">
+            <if test="fuelOrder == 1">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
@@ -1302,15 +1305,23 @@
                 on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
         <where>
-            <if test="orderStatus != null">
-                OO.ORDER_STATUS = #{orderStatus}
-            </if>
+            <choose>
+                <when test="orderStatus != 111">
+                    and OO.ORDER_STATUS = #{orderStatus}
+                </when>
+                <when test="orderStatus == 111">
+                    and OO.ORDER_STATUS in (0, 1, 2, 5)
+                </when>
+            </choose>
             <if test="orderTypee != null">
                 and OO.ORDER_TYPE = #{orderTypee}
             </if>
-            <if test="fuelOrder != null">
+            <if test="fuelOrder == 1">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
@@ -1651,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",
@@ -1687,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

@@ -385,15 +385,16 @@
         *
         from
         (
-        select
-        OO.ORDER_ID "orderId",
-        TTR.RESULT_TOTAL_ID "resultTotalId",
-        ASO.SPORADIC_ORDER_NO "sporadicOrderNo",
-        OO.ORDER_NUMBER "orderNumber",
-        RS.SUPPLIER_NAME "sendCompany",
+        select OO.ORDER_ID         "orderId",
+        TTR.RESULT_TOTAL_ID        "resultTotalId",
+        ASO.SPORADIC_ORDER_NO      "sporadicOrderNo",
+        OO.ORDER_NUMBER            "orderNumber",
+        RS.SUPPLIER_NAME           "sendCompany",
         RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
-        ASO.INSERT_TIME "insertTime",
-        RC.CAPACITY_NUMBER "capacityNumber"
+        ASO.INSERT_TIME            "insertTime",
+        RC.CAPACITY_NUMBER         "capacityNumber",
+        RM.MATERIAL_NAME           "materialName",
+        rce.carrier_name           "carrierName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
@@ -405,6 +406,12 @@
         on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
         left join RMS_CONSIGNEE RC2
         on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_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_carrier rce
+        on rce.carrier_id = aso.carrier_id
         <where>
             OO.ORDER_STATUS = #{status}
             <if test="type == 1">
@@ -498,7 +505,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>
 
  <!--    修改运输订单趟次-->
@@ -507,4 +514,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>