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

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

@@ -1864,4 +1864,16 @@ public class AMScontroller{
     public Map<String,Object> uploadSaleOrderList(@RequestBody List<Map<String,Object>> saleOrderIdList) {
         return amsFeign.uploadSaleOrderList(saleOrderIdList);
     }
-}
+
+    @ApiModelProperty(value = "自动匹配出最近的一个地址")
+    @PostMapping("/matchingAddressRecently")
+    public RESTfulResult matchingAddressRecently(@RequestParam Integer receiveId) {
+        return amsFeign.matchingAddressRecently(new BigDecimal(receiveId));
+    }
+
+    @ApiModelProperty(value = "自动匹配上一条运单的司机电话")
+    @PostMapping("/matchingDriverTelRecently")
+    public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
+        return amsFeign.matchingDriverTelRecently(capacityNumber);
+    }
+}

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
 import java.awt.*;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,18 +83,33 @@ public class OTMSController {
 
     @PostMapping(value = "/addTmstruckReceiptResult")
     public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+        //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
+        //第一张和第二张必填
         files.add(request.getFile("file0"));
         files.add(request.getFile("file1"));
+        //第三张选填
         if (request.getFile("file2")!=null){
             files.add(request.getFile("file2"));
         }
+        //追加的三张，num=6则取到file3,4,5
+        for(int i=3;i<num;i++){
+            if(request.getFile("file"+i)!=null){
+                files.add(request.getFile("file"+i));
+            }
+        }
+        //上传图片,追加的三张图片放在fourFiles里
+        List<String> fourFiles=new ArrayList<>();
         Map<String,Object> mapValue=new HashMap<>();
         for (int i=0;i<files.size();i++){
             MultipartFile file=files.get(i);
             String url = imageFileUtils.updateFile(file);
             mapValue.put("url"+i,url);
+            if(i>=3) {
+                fourFiles.add(url);
+            }
         }
+        mapValue.put("fourFiles",fourFiles);
         return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
 

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

@@ -2128,8 +2128,10 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer apiId,
                                                   Integer pageNum,
                                                   Integer pageSize,
+                                                  String startTime,
+                                                  String endTime,
                                                   String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
     }
 
     @ApiOperation("厂外抵达作业")

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

@@ -701,9 +701,6 @@ public class UniversalController extends BaseRESTfulController {
         if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
             mapValue.put("materialSpecificationText", materialSpecificationText);
         }
-        if (materialModelText != null && !materialModelText.equals("undefined") && !materialModelText.equals("null")) {
-            mapValue.put("materialModelText", materialModelText);
-        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getSteelMaterial(mapValue);

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

@@ -1644,4 +1644,12 @@ public interface AmsFeign {
     // 批量上传销售订单到金蝶
     @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrderList")
     Map<String, Object> uploadSaleOrderList(@RequestBody List<Map<String, Object>> saleOrderIdList);
+
+    // 自动匹配出最近的一个地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingAddressRecently")
+    RESTfulResult matchingAddressRecently(@RequestParam BigDecimal receiveId);
+
+    // 自动匹配上一条运单的司机电话
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingDriverTelRecently")
+    RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber);
 }

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

@@ -519,6 +519,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer apiId,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime,
                                           @RequestParam String con
                                          );
 

src/main/resources/application-dev.yml

@@ -40,7 +40,7 @@ openfeign:
 piction:
   #path: /usr/share/nginx/html/image
   #path: /test/data/nginx/html/image
-  #path: C:\Users\24390\Desktop\work\a
+  #path: D:\Code\work\jpg
   path: /shared
 
 server:

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

@@ -833,19 +833,17 @@
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
         AND RM.MATERIAL_ID != 2533
         <if test="materialNameText != null">
-            AND (instr(RM.MATERIAL_NAME, #{materialNameText}) > 0)
+            AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
         </if>
         <if test="materialSpecificationText != null">
             AND (instr(RM.MATERIAL_SPECIFICATION, #{materialSpecificationText}) > 0)
         </if>
-        <if test="materialModelText != null">
-            AND (instr(RM.MATERIAL_MODEL, #{materialModelText}) > 0)
-        </if>
         )
         <where>
             <if test="materialName != null">