修改零星

pom.xml

@@ -106,7 +106,7 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dagang</user>
+                    <user>DAGANG</user>
                     <password>root123</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>

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

@@ -20,6 +20,7 @@ public interface AmstruckSporadicOrderMapper extends IBaseMapper<AmstruckSporadi
 
     // 查询零星物资订单一车多趟列表
     List<Map<String, Object>> getSporadicOrdersList1(Map<String, Object> mapValue);
+
     // 查询物资详情
     List<Map<String, Object>> seeAllMaterials(Map<String, Object> mapValue);
 

src/main/java/com/steerinfo/dil/service/IAmstruckSporadicOrderService.java

@@ -46,4 +46,7 @@ public interface IAmstruckSporadicOrderService {
 
     //一车多趟运输顶单排车
     int addSporadicOrderforTimes(Map<String,Object> map);
+
+    //一车多趟作废订单
+    int deletedSporadicOrder(Map<String,Object> map);
 }

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

@@ -390,7 +390,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map2.get("orderPlanId")));
                 omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId1.intValue()));
-                //omstruckOrder.setOrderLineSequence(DataChange.dataToBigDecimal(map2.get("lineSqe")));
+                //设置新增时间
                 omstruckOrder.setInsertTime(new Date());
                 omstruckOrder.setLineId(DataChange.dataToBigDecimal(map2.get("lineId")));
                 omstruckOrder.setOrderType(DataChange.dataToBigDecimal(map2.get("orderType")));
@@ -411,7 +411,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map2.get("materialPriority")));
                 omstruckOrderMaterial.setInsertTime(new Date());
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
-                   //设置运力id
+                //设置运力id
                 Integer capacityId = (Integer) map1.get("capacityId");
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityId));
@@ -423,4 +423,18 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
 
         return result;
     }
+   //作废零星订单
+    @Override
+    public int deletedSporadicOrder(Map<String, Object> map) {
+        BigDecimal orderId =(BigDecimal) map.get("orderId");
+        //根据运输订单id查找零星订单id
+        Map<String, Object> map1 = amstruckSporadicOrderMapper.selectOrderInfo(orderId.intValue());
+        BigDecimal orderPlanId =(BigDecimal) map1.get("orderPlanId");
+        //根据零星订单id设置趟次
+        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+        amstruckSporadicOrder.setSporadicOrderId(orderPlanId);
+        amstruckSporadicOrder.setSporadicOrderTimes(new BigDecimal(0));
+        amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+        return 1;
+    }
 }

src/main/resources/application-dev.yml

@@ -7,3 +7,17 @@ spring:
   application:
     name: dil-ams-api-dev
 
+
+openfeign:
+    ESFeign:
+       url: ${ESFEIGN_URL:172.16.33.162:8011}
+    ColumnDataFeign:
+      url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    TmsTruckFeign:
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    ImFeign:
+      url: ${IMFEIGN_URL:172.16.33.162:8018}
+
+  #测试环境端口
+server:
+    port: 8015

src/main/resources/application-prod.yml

@@ -1,8 +1,23 @@
 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
+    name: dil-ams-api-dev
+
+ openfeign:
+#   正式环境
+   ESFeign:
+     url: ${ESFEIGN_URL:172.16.33.166:8089}
+   ColumnDataFeign:
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+   TmsTruckFeign:
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+   ImFeign:
+      url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+ #正式环境端口
+server:
+  port: 8079

src/main/resources/bootstrap.yml

@@ -12,26 +12,10 @@ spring:
   mvc:
     static-path-pattern:
 
-openfeign:
-  #   正式环境
-  #  ESFeign:
-  #    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  #  ColumnDataFeign:
-  #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
 
   #   测试环境
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.162:8011}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
+
 
 
 #eureka设置
@@ -72,8 +56,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 
-server:
-  #  正式
-  #  port: 8079
-  #  测试
-  port: 8015
+
+
+