修改零星

pom.xml

@@ -109,7 +109,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>-->
+                        <param>OMSTRUCK_ORDER_MATERIAL</param>
 <!--                    <param>TMSTRAIN_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>

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

@@ -214,6 +214,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询内转运输订单给APP 9 10 11
     Map<String, Object> getNZOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
+    //查询采购零星物资订单给app 12
+    Map<String,Object> getSporadicOrder(@Param("orderId") BigDecimal orderId);
+
     //查询发运计划运输订单给APP  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 

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

@@ -454,7 +454,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result = 0;
         for (Map<String, Object> map : mapList) {
             Integer orderId = (Integer) map.get("orderId");
-            OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(new BigDecimal(orderId));
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            omstruckOrder.setOrderId(new BigDecimal(orderId));
             //生成订单下发时间 修改订单表
             omstruckOrder.setOrderIssueTime(new Date());
             //设置状态为已下发：4
@@ -1609,6 +1610,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 10:
             case 11:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
+                break;
+            case 12:
+                mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-DEV

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-PROD

src/main/resources/bootstrap.yml

@@ -45,7 +45,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.104:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:

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

@@ -1512,6 +1512,7 @@
                  left join RMS_MATERIAL RM
                            on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OO.ORDER_ID = #{orderId}
+                and rownum = 1
     </select>
 
 
@@ -2751,6 +2752,20 @@
           AND OO.ORDER_STATUS in (4, 5)
     </select>
 
+<!--查询采购零星物资信息给app 12    -->
+    <select id="getSporadicOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        SELECT  OO.ORDER_ID        "orderId",
+                OO.ORDER_NUMBER    "orderNumber",
+                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+                RC.CAPACITY_NUMBER "capacityNumber",
+                OO.ORDER_TYPE      "orderType"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND OO.ORDER_STATUS in (4, 5)
+    </select>
+
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT OO.ORDER_ID        "orderId",

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

@@ -391,7 +391,7 @@
         ASO.SPORADIC_ORDER_NO "sporadicOrderNo",
         OO.ORDER_NUMBER "orderNumber",
         RS.SUPPLIER_NAME "sendCompany",
-        RS2.SUPPLIER_NAME "receiveCompany",
+        RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
         ASO.INSERT_TIME "insertTime",
         RC.CAPACITY_NUMBER "capacityNumber"
         from OMSTRUCK_ORDER OO
@@ -403,8 +403,8 @@
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
-        left join RMS_SUPPLIER RS2
-        on RS2.SUPPLIER_ID = ASO.RECEIVE_UNIT_ID
+        left join RMS_CONSIGNEE RC2
+        on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
         <where>
             OO.ORDER_STATUS = #{status}
             <if test="type == 1">