liyg 2 سال پیش
والد
کامیت
4d8efe62d5
2فایلهای تغییر یافته به همراه5 افزوده شده و 8 حذف شده
  1. 2 2
      src/main/resources/application-prod.yml
  2. 3 6
      src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

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

@@ -25,9 +25,9 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+    url: ${WMSHFEIGN_URL:localhost:8070}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:

+ 3 - 6
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -693,18 +693,15 @@
     <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
         select *
         from (
-                 select 		DBI.BATCH_INFACOTRY_ID        "batchId",
+                 select 		DB.BATCH_ID       "batchId",
                                DB.RESULT_FOREIGN_SHIP_NAME      "foreignShipName",
-                               DBI.INFACTORY_SHIP_NAME				"infactoryShipName",
-                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"' || DBI.INFACTORY_SHIP_NAME) "value"
+                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME) "value"
                  from DIL_BATCH DB
-                          left join DIL_BATCH_INFACOTRY DBI
-                                    on DB.BATCH_ID=DBI.BATCH_ID
                           left join RMS_MATERIAL RM
                                     on RM.MATERIAL_ID = DB.MATERIAL_ID
                           join AMS_PURCHASE_ORDER APO
                                on APO.BATCH_ID = DB.BATCH_ID
-                 where DB.RESULT_FOREIGN_SHIP_NAME is not null and DBI.INFACTORY_SHIP_NAME is not null
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
              )
         where instr("value", #{index}) > 0