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

pom.xml

@@ -111,7 +111,6 @@
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
                         <param>OMSTRUCK_ORDER_MATERIAL</param>
-                        <param>AMSTRUCK_REQUIREMENT_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -319,7 +319,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return null;
     }
 
-    @ApiOperation(value = "司机接收、拒绝接单")
+    @ApiOperation(value = "司u机接收、拒绝接单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
@@ -1289,10 +1289,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("carrierId",carrierId);
         }
         mapValue.put("orderStatus",(orderStatus));
-        List<Map<String, Object>>    dispatchSaleOrderList = omstruckOrderService.getInwardOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getInwardOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 

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

@@ -311,6 +311,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
 
     //根据运输订单号查找需要用车时长
-    Map<String,Object> selectInwardTimeByOrderId(BigDecimal orderId);
+    Map<String,Object>  selectInwardTimeByOrderId(BigDecimal orderId);
 
 }

src/main/java/com/steerinfo/dil/model/OmstruckOrderMaterial.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 

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

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 运输订单第二个 impl
@@ -570,6 +572,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     private void updateTruckOrderMaterial(OmstruckOrderMaterial omstruckOrderMaterial){
         //更新主键 以及常规字段
         omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
+        omstruckOrderMaterial.setMaterialMeassion(null);
         omstruckOrderMaterial.setInsertTime(new Date());
         omstruckOrderMaterial.setInsertUsername("admin");
         omstruckOrderMaterial.setUpdateTime(null);
@@ -625,17 +628,21 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
       int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
         //判断是否需要重新推单
         //根据运输订单id查找需求日期是否超过一个月
-        Map<String, Object> map1 = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
-        Date dueTime =(Date) map1.get("dueTime");
-        //当前时间小于截至时间
-        long DueTime = dueTime.getTime();
-        //获取当前时间
-        Date date=new Date();
-        long nowTime = date.getTime();
-        if (nowTime < DueTime){
-            //推送
-           i+=addNewTransportOrder(new BigDecimal(orderId));
+        Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
+        Object dueTime = map.get("dueTime");
+        if(dueTime != null){
+            Date dueDate = (Date) dueTime;
+            //当前时间小于截至日期
+            long DueTime = dueDate.getTime();
+            //获取当前时间
+            Date date = new Date();
+            long nowTime = date.getTime();
+            if (nowTime < DueTime){
+                //推送
+                i += addNewTransportOrder(new BigDecimal(orderId));
+            }
         }
+
       return i;
     }
 }

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

@@ -531,13 +531,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         addMapSporadicOrder.put("mapList",mapList);
         switch (orderType) {
             case 13:
+            case 19:
             case 12:
-            case 20:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
                 break;
-            //内转零星
+            //普通零星
             case  15:
             case  16:
                 if (sporadicOrderTimes.intValue() > 0) {
@@ -593,6 +593,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 //            case 13:
 //            case 20:
             case 15:
+            case 19:
             case 16:
                     Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(orderId));
                     BigDecimal orderTimes =(BigDecimal)sporadicOrderTimes.get("orderTimes");
@@ -810,7 +811,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
             }
             //判断订单是否是一车多单
-            if (orderType.intValue()==15 || orderType.intValue()==16 ) {
+            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==19) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));
@@ -1899,6 +1900,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public Map<String, Object> getMessageToApp(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType;
+        String type="";
         //获取订单类型
         if(map.get("orderType") == null){
             orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
@@ -1930,7 +1932,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap.put("loadName","化工园区铁专线");
                 BigDecimal organizationId =(BigDecimal) mesMap.get("organizationId");
                 if (organizationId.intValue()==1){
-//                    mesMap.remove(organizationId);
                     mesMap.put("organizationCode","一厂");
                 }else if (organizationId.intValue()==2){
                     mesMap.put("organizationCode","二厂");
@@ -1946,6 +1947,15 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 15:
             case 16:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
+                break;
+            case 19:
+                 mesMap=omstruckOrderMapper.getSporadicOrder(map);
+                 if (orderType==19) {
+                     type += "零星退货";
+                     mesMap.put("type", type);
+                 }
+
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
 
@@ -1961,7 +1971,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(Map<String, Object> map){
         String capacityNumber = (String) map.get("capacityNumber");
         //通过车牌号查询所有未下发的订单ID
-        List<Map<String, Object>> orderMesList = omstruckOrderMapper.getOrderIdListByCapacityNumber(capacityNumber);
+         List<Map<String, Object>> orderMesList = omstruckOrderMapper.getOrderIdListByCapacityNumber(capacityNumber);
         List<Map<String, Object>> mesMapList = new ArrayList<>();
         for (Map<String, Object> orderMesMap: orderMesList) {
             //如果订单类型为2 则判断订单发货日期是否为当日 如果不是当日则不给显示

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

@@ -1361,7 +1361,7 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         <if test="carrierSSOId != null">
             left join RMS_CARRIER RCA
-                on RCA.CARRIER_ID = RC.CARRIER_ID
+                on RCA.CARRIER_ID = OO.CARRIER_ID
         </if>
         <where>
             <choose>
@@ -2433,7 +2433,9 @@
     <!-- 查询分解运输计划 -->
     <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
+        FROM (SELECT
+        OO.ORDER_NUMBER                       "orderNumber",
+        AIP.PLAN_NUMBER                    AS "planNumber",
         RCA.CARRIER_NAME                   AS "carrierName",
         AIP.CARRIER_ID                     AS "carrierId",
         RC.CAPACITY_NUMBER                 AS "capacityNumber",
@@ -3220,7 +3222,8 @@
                OO.ORDER_TYPE          "orderType",
                OO.ORDER_STATUS        "orderStatus",
                RS.SHIPPER_NAME        "shipperUnitName",
-               AIR.REQUIREMENT_ID     "requirementId"
+               AIR.REQUIREMENT_ID     "requirementId",
+               AIR.DUE_DATE             "saleDateOfReceipt"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
                            ON OO.ORDER_PLAN_ID = AIP.PLAN_ID

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

@@ -17,13 +17,13 @@
     <result column="MATERIAL_MEASSION" jdbcType="DECIMAL" property="materialMeassion" />
   </resultMap>
   <sql id="columns">
-    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
     MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION
   </sql>
   <sql id="columns_alias">
-    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT,
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
     t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION
   </sql>
   <sql id="select">
@@ -416,11 +416,6 @@
       #{id}
     </foreach>
   </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">