'总工程提交'

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

@@ -1061,4 +1061,9 @@ public class RMScontroller {
         return rmsFeign.getConsigneeFarId(state);
     }
 
+    @PostMapping("/isInHere")
+    public Integer isInHere(@RequestParam String personnelJobNumber) {
+        return rmsFeign.isInHere(personnelJobNumber);
+    }
+
 }

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

@@ -575,4 +575,8 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmsconsignee/getConsigneeFarId")
     Map<String, Object> getConsigneeFarId(@RequestParam("state") String state);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
+    Integer isInHere(@RequestParam String personnelJobNumber);
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -148,7 +148,8 @@
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName"
+                        RCA.CARRIER_NAME       "carrierName",
+                        RC.INSERT_UPDATE_REMARK "remark"
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID