'销售订单问题'

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/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/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">