Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2121,6 +2121,12 @@ public class AMScontroller{
         return amsFeign.addSteelSaleOrderList(mapList);
     }
 
+    @ApiOperation("excel导入批量新增销售订单")
+    @PostMapping("addUnloadSteelSaleOrderList")
+    public Map<String,Object> addUnloadSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.addUnloadSteelSaleOrderList(mapList);
+    }
+
     @PostMapping("/updateTransPrice")
     @ApiOperation(value = "修改内转汽运单价")
     public Map<String, Object> updateTransPrice(@RequestBody(required = false) Map<String, Object> mapValue) {

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

@@ -21,6 +21,7 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 /**
  * @author luobang
@@ -1406,12 +1407,15 @@ public class TMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
     @PostMapping("/enFactoryResultByPDA")
-    public Map<String, Object> enFactoryResultByPDA(@RequestBody(required = false) Map<String, Object> mapValue) {
+    public Callable<Map<String, Object>> enFactoryResultByPDA(@RequestBody(required = false) Map<String, Object> mapValue) {
         //PDA扫码会多个反斜杠所以需要截取
-        String orderNumber = (String) mapValue.get("orderNumber");
-        orderNumber = orderNumber.substring(0, orderNumber.length()-1);
-        mapValue.put("orderNumber", orderNumber);
-        return tmsTruckFeign.enFactoryResultByPDA(mapValue);
+        return ()->{
+                String orderNumber = (String) mapValue.get("orderNumber");
+                orderNumber = orderNumber.substring(0, orderNumber.length()-1);
+                mapValue.put("orderNumber", orderNumber);
+                return tmsTruckFeign.enFactoryResultByPDA(mapValue);
+        };
+
     }
 
     //***************************************TmstruckWeightResultController***************************

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

@@ -962,6 +962,14 @@ public class UniversalController extends BaseRESTfulController {
     @PostMapping("/updateDriverTel")
     @ApiOperation(value = "修改司机电话号码")
     public RESTfulResult updateDriverTel(@RequestBody Map<String,Object> map){
+        try {
+            int orderId = (int) map.get("orderId");
+            String driverTel = (String) map.get("driverTel");
+            //根据运输id去查找出运力ID更新司机电话
+            universalMapper.updateCapacityDriverTel(orderId,driverTel);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return success(universalMapper.updateDriverTel(map));
     }
 

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1809,6 +1809,9 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
     Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amssaleorders/addUnloadSteelSaleOrderList")
+    Map<String, Object> addUnloadSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
+
     @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
     Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
 

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

@@ -208,6 +208,8 @@ public interface UniversalMapper {
     int updateSaleOrderStatusById(BigDecimal saleOrderId);
     // 修改司机电话
     int updateDriverTel(Map<String, Object> map);
+    //同步修改到运力
+    int updateCapacityDriverTel(int orderId,String driverTel);
 
     int getQueueCount();
     // 下拉下单客户的历史使用过的地址

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

@@ -240,7 +240,7 @@ public class UniversalServiceImpl implements UniversalService {
      * 关闭过期运输订单
      * @return
      */
-    @Scheduled(cron = "0 0,5 8 * * ?")
+    //@Scheduled(cron = "0 0,5 8 * * ?")
     public void closePassedOrder() {
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
@@ -260,7 +260,12 @@ public class UniversalServiceImpl implements UniversalService {
                     }else {
                         result+=universalMapper.updateStatusSeven(orderId);
                     }
-                    //查询多拼的数据
+                    BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
+                    /*if (capacityIdS !=null){
+                        //删除单拼
+                        universalMapper.delectQueueS(capacityIdS);
+                    }*/
+                    /*//查询多拼的数据
                     BigDecimal capacityIdM =universalMapper.queueMore(orderId);
                     if (capacityIdM !=null){
                         //删除多拼
@@ -271,7 +276,7 @@ public class UniversalServiceImpl implements UniversalService {
                     if (capacityIdS !=null){
                         //删除单拼
                         universalMapper.delectQueueS(capacityIdS);
-                    }
+                    }*/
                 }
             }
 

src/main/resources/application-prod.yml

@@ -6,6 +6,9 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
+  mvc:
+    async:
+      request-timeout: 8000
 
 openfeign:
   ColumnDataFeign:

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

@@ -1049,7 +1049,25 @@
     <update id="updateDriverTel" parameterType="java.util.Map">
         UPDATE OMSTRUCK_ORDER OO
         SET OO.DRIVER_TEL = #{driverTel}
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE oo.order_type = 1
+        <if test="orderId != null">
+            and oo.order_id = #{orderId}
+        </if>
+        <if test="saleOrderMaterialId != null">
+            and oo.order_plan_id = #{saleOrderMaterialId}
+        </if>
+
+    </update>
+
+    <update id="updateCapacityDriverTel">
+        update RMS_CAPACITY RC
+        SET RC.CAPACITY_TEL=#{driverTel}
+        where RC.CAPACITY_ID IN(
+        SELECT RC.CAPACITY_ID
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        WHERE OO.ORDER_ID=#{orderId})
     </update>
 
     <select id="getReceiverAllPlaceUsed" parameterType="java.lang.Integer" resultType="java.util.Map" >
@@ -1404,7 +1422,7 @@
     </select>
 
     <select id="sumNetWeight" resultType="java.math.BigDecimal">
-       select sum(TWR.RESULT_NET_WEIGHT) "sum"  from TMSTRUCK_TOTAL_RESULT TTR
+       select COALESCE(sum(TWR.RESULT_NET_WEIGHT),0) "sum"  from TMSTRUCK_TOTAL_RESULT TTR
        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
        WHERE TTR.ORDER_ID=#{orderId}

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout