完善火运装车卸车

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

@@ -11,8 +11,11 @@ import java.util.Map;
 
 @Mapper
 public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoadingResult, BigDecimal> {
-    //查询所有装车作业信息
+    //查询万州港-达州站（走了船运的订单）装车作业信息
     List<Map<String, Object>> getTmsWagonLoadInfo(Map<String,Object> map);
+
+    //查询海港-达州站 与国产矿
+
     //查询主键最大值
     @Select("select seq_tmstrian_loading.nextval from dual")
     BigDecimal selectMaxId();

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

@@ -68,8 +68,10 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         //通过批次ID获得采购订单号
         BigDecimal batchId = tmstrainLoadingResult.getBatchId();
         //查询并插入采购订单号
-        BigDecimal purchaseOrderId = tmstrainLoadingResultMapper.getPurchaseOrderId(batchId);
-        tmstrainLoadingResult.setPurchaseOrderRailPlanId(purchaseOrderId);
+        if(batchId != null){
+            BigDecimal purchaseOrderId = tmstrainLoadingResultMapper.getPurchaseOrderId(batchId);
+            tmstrainLoadingResult.setPurchaseOrderRailPlanId(purchaseOrderId);
+        }
         //添加常规字段
         addRegularField(tmstrainLoadingResult);
         int count = 0;
@@ -103,7 +105,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         //通过发站查询发站的所属港口
         BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
         map.put("portId", portId);
-//            wmshBoundFeign.addResult(map);
+//        wmshBoundFeign.addResult(map);
     }
 
     /**

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

@@ -134,10 +134,10 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      * @return
      */
     public int updateLoadingResult(Map<String, Object> map){
-        //添加一条卸货实绩 修改装车状态为已卸车 3
+        //添加一条卸货实绩 修改装车状态为已卸车 2
         TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
         tmstrainLoadingResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
-        tmstrainLoadingResult.setDeleted(new BigDecimal(3));
+        tmstrainLoadingResult.setDeleted(new BigDecimal(2));
         return tmstrainLoadingResultService.updateTmstrainLoadingResult(tmstrainLoadingResult);
     }
 

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
       
 #feign设置
 openfeign:

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

@@ -687,7 +687,6 @@
     )
     <where>
       <if test="purchaseOrderNo != null">
-        and
         <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
           "purchaseOrderNo" like '%${item}%'
         </foreach>

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

@@ -533,7 +533,7 @@
     on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
     left join TMSTRAIN_UNLOAD_POINT t_unload_point
     on t_unload_point.UNLOAD_POINT_ID=t_unload.UNLOADING_POINT_ID
-    where  t_unload.DELETED = 0 and t_load.DELETED = 3 and t_unload.RESULT_TYPE = #{resultType}
+    where  t_unload.DELETED = 0 and t_load.DELETED = 2 and t_unload.RESULT_TYPE = #{resultType}
     )
     <where>
       <if test="purchaseOrderNo != null">