Merge remote-tracking branch 'origin/master'

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

@@ -2231,4 +2231,10 @@ public class AMScontroller{
     public Map<String,Object> checkBillet(@RequestBody Map<String,Object> map) {
         return amsFeign.checkBillet(map);
     }
+
+    @ApiOperation("获取制单日期并更新")
+    @PostMapping("/getMakeOrderDate")
+    public Map<String,Object> getMakeOrderDate(@RequestBody Map<String,Object> map) {
+        return amsFeign.getMakeOrderDate(map);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.config.ImageFileUtils;
 import com.steerinfo.dil.feign.BmsshipFeign;
 import com.steerinfo.dil.feign.BmstrainFeign;
 import com.steerinfo.dil.feign.BmstruckFeign;
@@ -14,8 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +38,8 @@ public class BMSController extends BaseRESTfulController {
     BmstrainFeign bmstrainFeign;
     @Autowired
     BmstruckFeign bmstruckFeign;
-
+    @Autowired
+    private ImageFileUtils imageFileUtils;
     /**
      * 水运结算
      *
@@ -420,11 +425,15 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String userId,
+                                               String startTime,
+                                               String endTime,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId,userId,startTime,endTime,con);
     }
 
     @PostMapping("getInvoiceList")
@@ -494,9 +503,35 @@ public class BMSController extends BaseRESTfulController {
     }
 
     @PostMapping("addTruckStatement")
-    @ApiOperation(value = "新增汽运详单")
-    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
-        return bmstruckFeign.addTruckStatement(mapList);
+    @ApiOperation(value = "新增汽运账单")
+    RESTfulResult addTruckStatement(@RequestParam("excludeTax") BigDecimal excludeTax,@RequestParam("userId") String userId, @RequestParam("orderList")BigDecimal[] orderList, MultipartRequest request) {
+        String url="";
+        List<MultipartFile> files = new ArrayList<>();
+        //获取图片
+        for(int i=0;i<=1;i++){
+            MultipartFile temp = request.getFile("file"+i);
+            if(temp!=null){
+                files.add(temp);
+            }
+        }
+        if(files.size() < 1){
+            return failed("没有上传图片！");
+        }
+        //上传图片
+        try{
+            for(int i=0;i<files.size();i++){
+                url+=imageFileUtils.updateFile(files.get(i),i)+';';
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("上传图片失败！");
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("excludeTax",excludeTax);
+        map.put("orderList",orderList);
+        map.put("url",url);
+        map.put("userId",userId);
+        return bmstruckFeign.addTruckStatement(map);
     }
 
     @PostMapping("addTruckDetailsOrder/{orderId}")
@@ -820,4 +855,30 @@ public class BMSController extends BaseRESTfulController {
     public Map<String,Object> updateBatchDetailsOrder(@RequestBody Map<String,Object> map) {
         return bmstruckFeign.updateBatchDetailsOrder(map);
     }
+
+    @PostMapping("findDetailsForStatement")
+    public Map<String,Object> findDetailsForStatement(@RequestBody Map<String,Object> map) {
+        return bmstruckFeign.findDetailsForStatement(map);
+    }
+
+    @ApiOperation("查询发票图片")
+    @PostMapping("/getStatementPhoto")
+    public List<String> getStatementPhoto(@RequestParam BigDecimal statementId) throws Exception{
+        try{
+            String statementPhoto=bmstruckFeign.getStatementPhoto(statementId);
+            return getPhotoByUrl(statementPhoto);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    //切割字符串，下载图片并返回
+    private List<String> getPhotoByUrl(String urls) throws Exception {
+        List<String> results=new ArrayList<>();
+        String files[]=urls.split(";");
+        for(int i=0;i<files.length && files[i].length()>5;i++){
+            results.add((String)imageFileUtils.downloadFile(files[i]));
+        }
+        return results;
+    }
 }

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

@@ -27,4 +27,9 @@ public class JoinController {
     public Map<String, Object> receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return joinFeign.receiveTmsTruckWeightResult(mapList);
     }
+
+    @PostMapping("linkageDeleteTransportOrder")
+    public String linkageDeleteTransportOrder(@RequestBody(required = false) List<Map<String,Object>> mapList) {
+        return joinFeign.linkageDeleteTransportOrder(mapList);
+    }
 }

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

@@ -1878,4 +1878,8 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/checkBillet")
     Map<String, Object> checkBillet(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getMakeOrderDate")
+    Map<String, Object> getMakeOrderDate(@RequestBody Map<String, Object> map);
+
 }

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

@@ -117,16 +117,20 @@ public interface BmstruckFeign {
     RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId);
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("userId") String userId,
+                                        @RequestParam("startTime") String startTime,
+                                        @RequestParam("endTime") String endTime,
+                                        @RequestParam("con") String con);
 
     /**
      * 生成销售汽运计费账单
      *
-     * @param mapList
+     * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
-    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList);
+    RESTfulResult addTruckStatement(@RequestBody Map<String, Object> map);
 
     /**
      * 展示账单下的详单
@@ -302,6 +306,12 @@ public interface BmstruckFeign {
     @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/updateBatchDetailsOrder")
     Map<String, Object> updateBatchDetailsOrder(Map<String, Object> map);
 
+    @PostMapping("/api/v1/bmstruck/bmstruckstatement/findDetailsForStatement")
+    Map<String, Object> findDetailsForStatement(Map<String, Object> map);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckstatement/getStatementPhoto")
+    String getStatementPhoto(@RequestParam BigDecimal statementId);
+
 }
 
 

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

@@ -22,4 +22,7 @@ public interface JoinFeign {
     @PostMapping("api/v1/join/wmsoutboundresult/sendWarranty")
     String sendWarranty(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder")
+    String linkageDeleteTransportOrder(List<Map<String, Object>> mapList);
+
 }

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 + ">");

src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
     name: dil-api
   mvc:
     async:
-      request-timeout: 10000
+      request-timeout: 15000
 
 openfeign:
   ColumnDataFeign:

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

@@ -750,7 +750,9 @@
 
     <select id="getMaterialIdByOrderId" resultType="java.util.Map">
         select OOM.MATERIAL_ID "materialId",
-              CONCAT(CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION),RM.MATERIAL_MODEL) "materialName"
+              CONCAT(CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION),RM.MATERIAL_MODEL) "materialName",
+               RM.MATERIAL_NAME "good",
+               RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "goodspa"
         from OMSTRUCK_ORDER_MATERIAL  OOM
             left join RMS_MATERIAL RM
                 on RM.MATERIAL_ID = OOM.MATERIAL_ID