Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -694,18 +694,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