fs

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -156,7 +156,6 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId", carrierId);
         }
-
         if (userId!=null){
             mapValue.put("userId",userId);
         }

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

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

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

@@ -1947,8 +1947,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
             case 13:
-            case 15:
-            case 16:
+            case 14:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
                 break;
             case 19:

src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.107:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -394,12 +394,12 @@
         select OO.ORDER_ID         "orderId",
         TTR.RESULT_TOTAL_ID        "resultTotalId",
         ASO.SPORADIC_ORDER_NO      "sporadicOrderNo",
+        ASO.SPORADIC_ORDER_ID       "sporadicOrderId",
         OO.ORDER_NUMBER            "orderNumber",
         RS.SUPPLIER_NAME           "sendCompany",
         RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
         ASO.INSERT_TIME            "insertTime",
         RC.CAPACITY_NUMBER         "capacityNumber",
-        RM.MATERIAL_NAME           "materialName",
         rce.carrier_name           "carrierName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
@@ -412,28 +412,15 @@
         on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
         left join RMS_CONSIGNEE RC2
         on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on oom.order_id = oo.order_id
-        left join rms_material rm
-        on rm.material_id = oom.material_id
         left join rms_carrier rce
         on rce.carrier_id = aso.carrier_id
         <where>
             <if test="status != null">
              and  OO.ORDER_STATUS = #{status}
            </if>
-
             <if test="type == 1">
-                and OO.ORDER_TYPE in (12, 13 , 20)
-            </if>
-            <if test="type == 2">
-                and OO.ORDER_TYPE = 14
-            </if>
-            <if test="type == 3">
-                and OO.ORDER_TYPE in (15,16)
-            </if>
-            <if test="type1!=null">
-                 and OO.ORDER_STATUS IN (2,5)
+                and OO.ORDER_TYPE in (12, 13 ,14)
+                and OO.CAPACITY_ID IS NOT NULL
             </if>
             <if test="carrierId != null">
                 and ASO.CARRIER_ID = (select rc.carrier_id from rms_carrier rc