Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -379,7 +379,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,
+                                          String con,
+                                          String carrierSSOId) {
         int count = 0;
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
@@ -397,6 +399,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("fuelOrder", fuelOrder);
             count++;
         }
+        if(carrierSSOId != null){
+            if("".equals(carrierSSOId)) {
+                mapValue.put("carrierSSOId", carrierSSOId);
+                count++;
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -1186,13 +1194,17 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer apiId,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  String con) {
+                                                  String con,
+                                                  String carrierId) {
         if (con != null) {
             if(!"undefined".equals(con)){
                 String index="get_capacity_driver";//设置要查询的索引名称
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
             }
         }
+        if (carrierId != null && !"undefined".equals(carrierId)){
+            mapValue.put("carrierIds",carrierId);
+        }
         List<Map<String, Object>> dispatchSaleOrderList = null;
         if (mapValue.size() == 0) {
             //将查询结果存入索引中
@@ -1239,11 +1251,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer orderStatus,
-                                                  Integer carrierId,
+                                                  String carrierId,
                                                   String con) {
         if (con != null) {
             if(!"undefined".equals(con)){
-                String index="get_inward_order_list";//设置要查询的索引名称
+                String index="get_inward_order_list3";//设置要查询的索引名称
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
             }
         }
@@ -1251,8 +1263,8 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (carrierId != null && !"undefined".equals(carrierId.toString())) {
-            mapValue.put("carrierId",new BigDecimal(carrierId));
+        if (carrierId != null && !"undefined".equals(carrierId)) {
+            mapValue.put("carrierId",carrierId);
             count++;
         }
         mapValue.put("orderStatus",(orderStatus));
@@ -1263,7 +1275,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
             dispatchSaleOrderList = omstruckOrderService.getInwardOrderList(mapValue);
             Map<String, Object> map1 = new HashMap<>();
             //添加索引
-            map1.put("index","get_inward_order_list");
+            map1.put("index","get_inward_order_list3");
             //添加id
             map1.put("indexId","planId");
             dispatchSaleOrderList.add(map1);

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

@@ -673,6 +673,10 @@
         </if>
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = RC.CARRIER_ID
+        </if>
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
@@ -701,6 +705,9 @@
             <if test="fuelOrder != null">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
         </where>
         )
         <where>
@@ -2315,6 +2322,9 @@
         FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_STATUS = 0
         AND RC.CAPACITY_TYPE_ID = 1
+        <if test="carrierIds != null">
+            and RC.CARRIER_ID = (select rcr.carrier_id from rms_carrier rcr where rcr.carrier_sso_id = #{carrierIds})
+        </if>
         )
         <where>
             <if test="capacityNumber != null">
@@ -2337,29 +2347,30 @@
     <!-- 查询分解运输计划 -->
     <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        AIP.PLAN_NUMBER AS "planNumber",
-        RCA.CARRIER_NAME AS "carrierName",
-        AIP.CARRIER_ID AS "carrierId",
-        RC.CAPACITY_NUMBER AS "capacityNumber",
-        OOM.ORDER_MATERIAL_NUMBER AS "orderMaterialNumber",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIP.PLAN_ISSUE_TIME AS "planIssueTime",
-        AIP.PLAN_ISSUE_NAME AS "planIssueName",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        ARM.MATERIAL_WEIGHT AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+        RM.MATERIAL_NAME                   AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+        AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.CARRIER_ID                     AS "carrierId",
+        RC.CAPACITY_NUMBER                 AS "capacityNumber",
+        OOM.ORDER_MATERIAL_NUMBER          AS "orderMaterialNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
+        ARM.MATERIAL_COUNT                 AS "materialNumber",
+        ARM.MATERIAL_WEIGHT                AS "materialWeight",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        OO.ORDER_ID AS "orderId",
-        AIP.INSERT_TIME AS "insertTime"
+        RW1.WAREHOUSE_NAME                 "unloadWarehouseName",
+        OO.ORDER_ID                        AS "orderId",
+        AIP.INSERT_TIME                    AS "insertTime"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
@@ -2378,17 +2389,20 @@
         LEFT JOIN DIL_BATCH DB
         ON APO.BATCH_ID = DB.BATCH_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT
         ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4,9,10,11)
+        AND OO.ORDER_TYPE IN (4, 9, 10, 11)
         <if test="carrierId != null">
-            AND AIP.CARRIER_ID = #{carrierId}
+            AND AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+            where rc.carrier_sso_id =  #{carrierId})
         </if>
         <if test="orderStatus != null">
             AND OO.ORDER_STATUS = #{orderStatus}
@@ -2766,28 +2780,31 @@
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" 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",
-              rwl.warehouse_name     "loadName",
-              RW.WAREHOUSE_NAME      "unloadName",
-              OO.ORDER_TYPE          "orderType"
-         FROM OMSTRUCK_ORDER OO
-         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
-         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-         left join rms_warehouse rwl
-           on rwl.warehouse_id = air.requirement_platform_id
-         LEFT JOIN AMS_PURCHASE_ORDER APO
-           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-         LEFT JOIN RMS_SUPPLIER RS
-           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-         LEFT JOIN RMS_WAREHOUSE RW
-           ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
-         LEFT JOIN RMS_CAPACITY RC
-           ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId}
+       OO.ORDER_NUMBER        "orderNumber",
+       OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+       RC.CAPACITY_NUMBER     "capacityNumber",
+       rwl.warehouse_name     "loadName",
+       RW.WAREHOUSE_NAME      "unloadName",
+       OO.ORDER_TYPE          "orderType"
+  FROM OMSTRUCK_ORDER OO
+  LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+    ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+  LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+    ON ARP.PLAN_ID = AIP.PLAN_ID
+  LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+    ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+  LEFT JOIN AMS_PURCHASE_ORDER APO
+    ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+  left join rms_warehouse rwl
+    on rwl.warehouse_id = AIR.REQUIREMNT_UNIT_ID
+  LEFT JOIN RMS_SUPPLIER RS
+    ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+  LEFT JOIN RMS_WAREHOUSE RW
+    ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+  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  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2809,7 +2826,7 @@
                            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2837,7 +2854,7 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>