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

pom.xml

@@ -110,6 +110,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
+                        <param>OMSTRUCK_ORDER_MATERIAL</param>
                         <param>AMSTRUCK_REQUIREMENT_MATERIAL</param>
                     </tables>
                 </configuration>

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

@@ -274,6 +274,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.getAllLoadUnloadResult(map));
     }
 
+    @ApiOperation(value = "批量关闭运输订单")
+    @PostMapping("/batchCloseOrder")
+    public RESTfulResult batchCloseOrder(@RequestBody List<Map<String,Object>> mapList){
+        return success(omstruckOrderSeparateService.batchCloseOrder(mapList));
+    }
 
     @ApiOperation(value = "根据订单ID查询订单子表物资信息")
     @PostMapping("/getOrderMaterial/{orderId}")

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

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

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

@@ -36,6 +36,8 @@ public interface IOmstruckOrderSeparateService {
     //新增一个新的采购运输订单（一车多趟）
     int addNewTransportOrder(BigDecimal orderId);
 
+    // 批量关闭运输订单
+    int batchCloseOrder(List<Map<String, Object>> mapList);
     List<Map<String,Object>> getOrderMaterial(Integer orderId);
 
     int closeInwardOrder(Integer orderId);

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

@@ -513,6 +513,25 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return 1;
     }
 
+    /**
+     * 批量关闭运输订单
+     * @param mapList
+     * @return
+     */
+    @Override
+    public int batchCloseOrder(List<Map<String, Object>> mapList) {
+        int result = 0;
+        // 遍历主键
+        for (Map<String, Object> map : mapList) {
+            BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            omstruckOrder.setOrderId(orderId);
+            omstruckOrder.setOrderStatus(new BigDecimal(7));
+            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        }
+        return result;
+    }
+
     /**
      * 更新新订单信息 (一车多趟)
      * @Author TXF
@@ -604,6 +623,19 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Override
     public int closeInwardOrder(Integer orderId) {
       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));
+        }
       return i;
 
     }

src/main/resources/application-dev.yml

@@ -11,9 +11,9 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

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

@@ -3232,5 +3232,16 @@
             AND OO.ORDER_STATUS in (2, 4, 5, 6)
         </if>
     </select>
-
+<!-- 根据运输订单id查找需求日期 -->
+ <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+   select AIR.DUE_DATE  "dueTime"
+   from OMSTRUCK_ORDER OO
+   left join AMSTRUCK_INWARD_PLAN AIP
+   on AIP.PLAN_ID=OO.ORDER_PLAN_ID
+   left join AMSTRUCK_REQUIREMENT_PLAN ARP
+   on ARP.PLAN_ID=AIP.PLAN_ID
+   left join AMSTRUCK_INWARD_REQUIREMENT AIR
+   on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+   where OO.ORDER_ID=#{orderId}
+ </select>
 </mapper>