Merge remote-tracking branch 'origin/master'

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

@@ -594,8 +594,8 @@ public class AMScontroller{
         return amsFeign.updateAmsSaleOrder(mapVal);
     }
     @PostMapping("deleteAmsSaleOrderBySaleOrderId")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
-        return amsFeign.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestBody(required = false) List<Map<String,Object>> mapValue) {
+        return amsFeign.deleteAmsSaleOrderBySaleOrderId(mapValue);
     }
     @PostMapping("getSaleOrderUpdateLog")
     @ApiOperation(value = "查询汽运单价信息")
@@ -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/feign/AmsFeign.java

@@ -589,7 +589,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/deleteAmsSaleOrderBySaleOrderId")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId);
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestBody(required = false) List<Map<String,Object>> mapValue);
     @ApiOperation(value="根据销售订单号查询销售订单修改日志")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
@@ -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/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,14 @@
     <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>
 
     <select id="getReceiverAllPlaceUsed" parameterType="java.lang.Integer" resultType="java.util.Map" >

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