tijiao

src/main/resources/application-dev.yml

@@ -1,8 +1,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

src/main/resources/application-prod.yml

@@ -1,8 +1,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

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

@@ -608,7 +608,7 @@
         LEFT JOIN DIL_BATCH DB
         ON APO.BATCH_ID = DB.BATCH_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        ON RM.MATERIAL_ID = ARM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA