HUJIANGUO 3 éve
szülő
commit
3f55c9d452

+ 1 - 0
src/main/java/com/steerinfo/dil/controller/TmstrainLoadingResultController.java

@@ -272,6 +272,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
             wagonLoadForConverted = tmstrainLoadingResultService.selectLoadedForConverted(null);
             wagonLoadForConverted = tmstrainLoadingResultService.selectLoadedForConverted(null);
             Map<String, Object> map = new HashMap<>();
             Map<String, Object> map = new HashMap<>();
             //添加索引
             //添加索引
+
             map.put("index", "get_wagon_load_converted");
             map.put("index", "get_wagon_load_converted");
             //添加id
             //添加id
             map.put("indexId", "result2");
             map.put("indexId", "result2");

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ openfeign:
   ESFeign:
   ESFeign:
     url: ${ESFEIGN_URL:localhost:8089}
     url: ${ESFEIGN_URL:localhost:8089}
   ColumnDataFeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:192.168.1.102:8083}
   WmsBoundFeign:
   WmsBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
     url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
 
 

+ 0 - 1
src/main/resources/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.xml

@@ -890,7 +890,6 @@
   ON RM.MATERIAL_ID=TLR.MATERIAL_ID
   ON RM.MATERIAL_ID=TLR.MATERIAL_ID
   LEFT JOIN  RMS_CONSIGNEE RC2
   LEFT JOIN  RMS_CONSIGNEE RC2
   ON RC2.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
   ON RC2.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
-
   WHERE TLR.DELETED=0
   WHERE TLR.DELETED=0
   </select>
   </select>