修改

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

@@ -418,8 +418,10 @@ public interface TmsFeign {
 
     @PostMapping("/api/v1/tms/omstransorders/modifyChange")
     RESTfulResult modifyChange(@RequestBody Map<String, Object> map);
-  @PostMapping("/api/v1/tms/tmstimingresults/resartStartTimming")
+
+    @PostMapping("/api/v1/tms/tmstimingresults/resartStartTimming")
     RESTfulResult resartStartTimming(@RequestBody Map<String, Object> map);
+
     @PostMapping("/api/v1/tms/omstransorders/correctTransOrder")
     Map<String, Object> correctTransOrder(Map<String, Object> map);
 

src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ openfeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8086}
 #    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:80}
+    url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
 #    url: ${RMSFEIGN_URL:172.16.90.202:8060}
       url: ${RMSFEIGN_URL:172.16.90.202:8060}

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

@@ -322,13 +322,17 @@
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
         OPERATION_POINT_CODE "code",
         REMARK "remark",
-        alternate_fields3 "f3"
+        alternate_fields3 "f3",
+        WAREHOUSE_TYPE "warehouseType"
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
             <if test="operationPointType!=null and operationPointType!=''">
                 AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
             </if>
+            <if test="warehouseType !=null and warehouseType!=''">
+                AND REGEXP_LIKE(warehouse_type, #{warehouseType})
+            </if>
             <if test="receivingPointId!=null and receivingPointId!=''">
                 AND OPERATION_POINT_ID = #{receivingPointId}
             </if>
@@ -360,7 +364,8 @@
             OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
             OPERATION_POINT_CODE "code",
             REMARK "remark",
-            alternate_fields3 "f3"
+            alternate_fields3 "f3",
+            WAREHOUSE_TYPE "warehouseType"
             from RMS_OPERATION_POINT
             where OPERATION_POINT_ID in
             <foreach collection="id" item="item" open="(" close=")" separator=",">
@@ -583,7 +588,7 @@
             GROUP BY CAPACITY_ID
             ) T ON T."capacityId" = RCA .CAPACITY_ID
         </if>
-        WHERE RCA .DELETED = 0
+        WHERE RCA .DELETED in( 0,3)
         <if test="capacityTypeId !=null">
             AND RCT.CAPACITY_TYPE_ID in (
             select rct.capacity_type_id from rms_capacity_type rct
@@ -2203,7 +2208,7 @@
         'capacityNumber' "prop"
         FROM
         RMS_CAPACITY RCA
-        WHERE RCA .DELETED = 0
+        WHERE RCA .DELETED in ( 0,3)
         <if test="index!=null and index!=''">
             AND REGEXP_LIKE(
             CASE WHEN RCA.REMARK1 is null