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

@@ -1290,10 +1290,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/controller/OmstruckOrderSeparateController.java

@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ author    :TXF
@@ -288,8 +285,22 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
     @ApiOperation(value = "查看所有实绩点")
     @PostMapping("/getAllResultLineMes")
-    public RESTfulResult getAllResultLineMes(Integer orderId){
-        return success(omstruckOrderSeparateService.getAllOrderResult(new BigDecimal(orderId)));
+    public RESTfulResult getAllResultLineMes(Integer orderId, String orderNumber){
+        Map<String, Object> map = new HashMap<>();
+        if(orderId != null){
+            map.put("orderId", orderId);
+        }
+        if(orderNumber != null){
+            map.put("orderNumber", orderNumber);
+        }
+        List<Map<String, Object>> allOrderResult = null;
+        try {
+            allOrderResult = omstruckOrderSeparateService.getAllOrderResult(map);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return failed("查询失败");
+        }
+        return success(allOrderResult);
     }
 
     @ApiOperation(value = "正常关闭运输订单")

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/mapper/OmstruckOrderSeparateMapper.java

@@ -46,6 +46,8 @@ public interface OmstruckOrderSeparateMapper {
     //通过订单ID查询总实绩ID
     Integer getTotalIdByOrderId(BigDecimal orderId);
 
+    Integer getTotalIdByOrderIdOrOrderNum(Map<String, Object> map);
+
     //通过总实绩ID和路段顺序号查询进厂实绩数据
     Map<String, Object> getEnFactoryMes(Map<String, Object> map);
 

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
@@ -275,12 +277,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      * 查询运输进程，通过实绩ID
      * @Author TXF
      * @Date 2022/2/18 16:46
-     * @param orderId
+     * @param map
      * @return
      **/
-    public List<Map<String, Object>> getAllOrderResult(BigDecimal orderId){
+    public List<Map<String, Object>> getAllOrderResult(Map<String, Object> map){
         //通过订单Id查询总实绩Id
-        Integer resultTotalId = omstruckOrderSeparateMapper.getTotalIdByOrderId(orderId);
+        Integer resultTotalId = omstruckOrderSeparateMapper.getTotalIdByOrderIdOrOrderNum(map);
         //通过总实绩ID查询所有的实绩：包括进厂、出厂、计重、装卸货
         List<Map<String, Object>> allMesList = new ArrayList<>(20);
         allMesList.addAll(omstruckOrderSeparateMapper.getAllEnFactoryResultMesByTotalId(resultTotalId));
@@ -293,9 +295,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         allMesList.sort(new Comparator<Map<String, Object>>() {
             @Override
             public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                BigDecimal segmenSqe1 = DataChange.dataToBigDecimal(o1.get("segmenSqe"));
-                BigDecimal segmenSqe2 = DataChange.dataToBigDecimal(o2.get("segmenSqe"));
-                return segmenSqe1.compareTo(segmenSqe2);
+                BigDecimal b1 = DataChange.dataToBigDecimal(o1.get("segmenSqe"));
+                BigDecimal b2 = DataChange.dataToBigDecimal(o2.get("segmenSqe"));
+                return b1.compareTo(b2);
             }
         });
         return allMesList;
@@ -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,18 +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;
 
+      return i;
     }
 }

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

@@ -162,8 +162,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         int count = 0;
         for (Map<String, Object> capacityMap : driverCapacityIdList) {
-            BigDecimal carrierId =DataChange.dataToBigDecimal(capacityMap.get("carrierId"));
-            map.put("carrierId",carrierId);
+            map.put("carrierId",capacityMap.get("carrierId"));
+            map.put("priceId",capacityMap.get("priceId"));
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
             omstruckOrder.setOrderPlanId(purchaseOrderId);
@@ -303,6 +303,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
                 break;
             case 2:
+            case 3:
                 //获取发运计划id
                 //生成子表主键
                 omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
@@ -319,23 +320,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialWeight));
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
                 break;
-            case 3:
-                //获取发运计划id
-                //生成子表主键
-                omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
-                Integer dayPlanId1 = (Integer) map.get("dayPlanId");
-                //设置订单id
-                omstruckOrderMaterial.setOrderId(orderId);
-                //根据发运计划id查找物资id和物资重量
-                map = omstruckOrderMapper.selectMaterialIdAndWeightByDayPlanId(dayPlanId1);
-                BigDecimal materialId1 = (BigDecimal) map.get("materialId");
-                BigDecimal materialWeight1 = (BigDecimal) map.get("materialWeight");
-                //设置物资id
-                omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(materialId1));
-                //设置物资重量
-                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialWeight1));
-                omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
-                break;
             case 4:
                 break;
             case 5:
@@ -1948,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","二厂");
@@ -1988,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

@@ -728,7 +728,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>
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
@@ -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>
@@ -1738,12 +1738,17 @@
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RS.SHIPPER_NAME "shipperName",
-        OO.ORDER_ID "orderId"
+        OO.ORDER_ID "orderId",
+        RC3.CARRIER_NAME "carrierName"
         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
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
         LEFT JOIN RMS_CONSIGNEE RC2
         ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
         LEFT JOIN RMS_CAPACITY RC
@@ -1759,7 +1764,7 @@
                 AND OO.ORDER_STATUS = #{orderStatus}
             </if>
             <if test="carrierId!=null">
-                and RC.CARRIER_ID = #{carrierId}
+                and RC3.CARRIER_ID = #{carrierId}
             </if>
             <if test="orderTypee!=null">
                 and OO.ORDER_TYPE in (1, 2)
@@ -1776,6 +1781,11 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="saleNumber != null">
                 and
                 <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
@@ -2423,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",
@@ -3210,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 != ''">

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

@@ -734,5 +734,19 @@
         where "pointDate" is not null
     </select>
 
+    <select id="getTotalIdByOrderIdOrOrderNum" parameterType="map" resultType="java.lang.Integer">
+        select TTR.RESULT_TOTAL_ID
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR on TTR.ORDER_ID = OO.ORDER_ID
+        <where>
+            <if test="orderId != null">
+                and OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
+
 
 </mapper>