Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRAIN-API

src/main/java/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.java

@@ -55,7 +55,7 @@ public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoading
     List<Map<String, Object>> getMaterialAndCarByLoadingId(Map<String, Object> map);
 
     //根据采购订单号查找批次id
-    List<Map<String,Object>> getBatchInfocatoryByNo(String purchaseNo);
+    List<Map<String,Object>> getBatchInfocatoryByNo(Map<String,Object> map);
 
     //通过汽运总实绩ID查询装车中间表
     Integer getTrainTruckIdByTruckTotalId(BigDecimal resultTotalId);

src/main/java/com/steerinfo/dil/service/impl/TmstrainLoadingResultServiceImpl.java

@@ -407,7 +407,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         }
         else {
             Map<String, Object> stringObjectMap = wmshBoundFeign.addResult(map);
-            if (!stringObjectMap.equals("")||stringObjectMap!=null){
+            if (!stringObjectMap.get("code").equals("200")){
                return  -1;
             }
         }
@@ -674,7 +674,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             //根据采购订单号查找批次
             String purchaseNo =(String) map.get("purchaseNo");
             BigDecimal batchId=null;
-            List<Map<String, Object>> batchInfocatoryByNo = tmstrainLoadingResultMapper.getBatchInfocatoryByNo(purchaseNo);
+            List<Map<String, Object>> batchInfocatoryByNo = tmstrainLoadingResultMapper.getBatchInfocatoryByNo(map);
             if (batchInfocatoryByNo.size() >= 1){
                 Map<String, Object> map1 = batchInfocatoryByNo.get(0);
                  batchId =DataChange.dataToBigDecimal(map1.get("batchId"));

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

@@ -1213,14 +1213,18 @@
   </select>
 
 
-  <select id="getBatchInfocatoryByNo" parameterType="java.lang.String" resultType="java.util.Map">
+  <select id="getBatchInfocatoryByNo" parameterType="java.util.Map" resultType="java.util.Map">
      select  DBI.BATCH_INFACOTRY_ID "batchId"
      from AMS_PURCHASE_ORDER APO
      LEFT JOIN DIL_BATCH DB
      ON APO.BATCH_ID=DB.BATCH_ID
      LEFT JOIN DIL_BATCH_INFACOTRY DBI
      ON DB.BATCH_ID=DBI.BATCH_ID
-     WHERE  APO.PURCHASE_ORDER_NO = #{purchaseNo}
+     left join WMSH_GRID_MATERIAL WGM
+     ON WGM.BATCH_ID = DBI.BATCH_INFACOTRY_ID
+     LEFT JOIN RMS_PORT RP
+     ON RP.PORT_ID=WGM.PORT_ID
+     WHERE  APO.PURCHASE_ORDER_NO = #{purchaseNo} AND RP.PORT_NAME = #{portName}
   </select>
 
   <!-- 通过订单No查询订单Id -->