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

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

@@ -670,7 +670,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> diverInfoForSaleorder = omstruckOrderService.selectTransportOrderForSale(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, diverInfoForSaleorder);
+        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null, diverInfoForSaleorder);
         return success(pageList);
     }
 

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -35,4 +35,11 @@ public class ColumnDataUtil {
         pageList.setColumnData(columnDataList);
         return pageList;
     }
+
+    public PageListAdd tableColumnData5(Integer apiId, List<Map<String, Object>> list,List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
 }

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

@@ -3617,7 +3617,20 @@
         )
 
         <where>
+            <if test="shipName != null">
+                and
+                <foreach collection="shipName" item="item" open="(" separator="or" close=")">
+                    "shipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
             <if test="orderNo != null">
+                and
                 <foreach collection="orderNo" item="item" open="(" separator="or" close=")">
                     "orderNo" like '%${item}%'
                 </foreach>
@@ -3649,7 +3662,7 @@
             <if test="warehouseName != null">
                 and
                 <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
-                    "warehouseName" like '%${item}%'
+                    "wareHouseName" like '%${item}%'
                 </foreach>
             </if>
             <if test="supplierName != null">

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

@@ -343,6 +343,9 @@
         ASO.INSERT_TIME            "insertTime",
         RC.CAPACITY_NUMBER         "capacityNumber",
         rce.carrier_name           "carrierName",
+        ASO.SEND_UNIT_ID "sendUnitId",
+        ASO.RECEIVE_UNIT_ID "receiveUnitId",
+        aso.carrier_id "carrierId",
         RC.CAPACITY_NUMBER || RC2.CONSIGNEE_COMPANY_NAME || RS.SUPPLIER_NAME "liekCon"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR