zx 2 년 전
부모
커밋
49e938c451
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 3 3
      src/main/resources/application-prod.yml
  2. 2 2
      src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

+ 3 - 3
src/main/resources/application-prod.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-ams-api-dev
@@ -15,7 +15,7 @@ openfeign:
    ColumnDataFeign:
      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4476,8 +4476,8 @@
                         RAS.ARRIVAL_ID                                          "toTheStationId",
                         ASM.IS_POUND_SALE                                       "isPoundSale",
                         ASM.SALE_MATERIAL_ID                                    "saleMaterialId",
-                        TPAR.RESULT_ID                                          "approveId",
-                        ASM.IS_POUND_SALE                                       "isPoundSale"
+                        TPAR.RESULT_ID                                          "approveId"
+
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID