1

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

@@ -836,6 +836,14 @@ public class AMScontroller  extends BaseRESTfulController {
     Map<String,Object> approvePriceData(@RequestBody Map<String,Object> map) {return amsFeign.approvePriceData(map);}
 
     @ApiOperation("匹配运输单价")
-    @PostMapping("selectUnitPrice")
+    @PostMapping("/selectUnitPrice")
     Map<String,Object> selectUnitPrice(@RequestBody Map<String,Object> map) {return amsFeign.selectUnitPrice(map);}
+
+    @ApiOperation("多拼派车")
+    @PostMapping("/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return amsFeign.saleDispatchDuoPin(map);}
+
+    @ApiOperation("查询司磅地点")
+    @PostMapping("/getMaterialOperation")
+    RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map) {return amsFeign.getMaterialOperation(map);}
 }

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

@@ -309,4 +309,11 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectUnitPrice")
     Map<String, Object> selectUnitPrice(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getMaterialOperation")
+    RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map);
+
+
 }

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

@@ -1508,6 +1508,7 @@
         RP.PERSONNEL_NAME "personnelName",
         RP.PERSONNEL_POST "personnelPost",
         RP.PERSONNEL_PHONE "personnelPhone",
+        RP.IDENTITY_CARD "personnelCard",
         RP.INNNER_CODE "innerCode",
         to_char(RP.SSO_ID) "ssoId",
         CASE WHEN RC.COMPANY_TYPE = '业务单位'
@@ -1589,12 +1590,9 @@
             RP.PERSONNEL_NAME "personnelName",
             RP.PERSONNEL_POST "personnelPost",
             RP.PERSONNEL_PHONE "personnelPhone",
+            RP.IDENTITY_CARD "personnelCard",
             RP.INNNER_CODE "innerCode",
             to_char(RP.SSO_ID) "ssoId",
-            RP.PERSONNEL_ID "id",
-            RP.PERSONNEL_ID "value",
-            RP.PERSONNEL_NAME "label",
-            RP.PERSONNEL_NAME "text",
             CASE WHEN RC.COMPANY_TYPE = '业务单位'
             THEN RC.COMPANY_ID
             else -1
@@ -1611,6 +1609,10 @@
             THEN RC.COMPANY_ID
             else -1
             END "receivingCompanyId",
+            RP.PERSONNEL_ID "id",
+            RP.PERSONNEL_ID "value",
+            RP.PERSONNEL_NAME "label",
+            RP.PERSONNEL_NAME "text",
             'personnelName' "prop"
             <if test="capacityId!=null and capacityId!=''">
                 ,NVL(T ."countNumber",0) "countNumber"