Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml

@@ -5,6 +5,7 @@
     <select id="getDetailsPage" resultType="com.logpm.report.vo.BillLoadingDetailsVO">
         select pickup_batch,
                warehouse,
+               warehouse_id,
                consignee_unit,
                waybill_number,
                order_code,
@@ -24,6 +25,7 @@
             examine_user
         from (select dbl.pickup_batch,
             dsa.warehouse,
+            dsa.warehouse_id,
             dsa.consignee_unit,
             dsa.waybill_number,
             dsa.order_code,
@@ -97,6 +99,7 @@
     <select id="getTasksPage" resultType="com.logpm.report.vo.BillLoadingTasksVO">
         select pickup_batch,
                warehouse,
+               warehouse_id,
                waybill_number,
                order_code,
                consigneeUnit,
@@ -120,6 +123,7 @@
                createdTime
         from (select obj.pickup_batch,
                      lww.name       as            warehouse,
+                     lww.id       as            warehouse_id,
                      ldsa.waybill_number,
                      ldsa.order_code,
                      ldsa.mall_name               consigneeUnit,

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -202,6 +202,7 @@
         stock_article_id,
         task_time,
         warehouse_name,
+        warehouse_id,
         receiving_unit,
         mall_name,
         consignee,
@@ -231,6 +232,7 @@
         stockarticle.code                 stock_article_id,
         lddl.task_time                    task_time,
         lddl.warehouse_name               warehouse_name,
+        lddl.warehouse_id               warehouse_id,
         obj.receiving_unit                receiving_unit,
         obj.mall_name                     mall_name,
         obj.consignee,
@@ -307,6 +309,7 @@
         reservation_code,
         task_time,
         warehouse_name,
+        warehouse_id,
         type,
         kind,
         vehicle_name,
@@ -350,6 +353,7 @@
         obj.reservation_code reservation_code,
         obj.reservation_date task_time,
         dpl.warehouse warehouse_name,
+        dpl.warehouse_id warehouse_id,
         CASE
         WHEN obj.delivery_type = 1 THEN
         '商配'
@@ -473,6 +477,7 @@
         reservation_code,
         task_time,
         warehouse_name,
+        warehouse_id,
         type,
         kind,
         vehicle_name,
@@ -517,6 +522,7 @@
         obj.reservation_code reservation_code,
         obj.reservation_date task_time,
         dpl.warehouse warehouse_name,
+        dpl.warehouse warehouse_id,
         CASE
         WHEN obj.delivery_type = 1 THEN
         '商配'
@@ -645,6 +651,7 @@
                mall_name,
                description_goods,
                warehouse,
+               warehouse_id,
                warehouse_entry_time,
                warehouse_entry_time_end,
                store_time,
@@ -679,6 +686,7 @@
                      ldsa.mall_name,
                      ldsa.description_goods,
                      ldsa.warehouse,
+                     ldsa.warehouse_id,
                      ldsa.warehouse_entry_time,
                      ldsa.warehouse_entry_time_end,
                      ldsa.store_time,

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.logpm.report.mapper.ReportStockMapeer">
 
     <select id="getDetailPage" resultType="com.logpm.report.vo.StockDetailsVO">
-        select warehouse_name,
+        select
+        warehouse_name,
+        warehouse_id,
                market_name,
                service_type,
                cargo_number,
@@ -14,7 +16,9 @@
                quantity_occupied,
                usable_quantity,
                allocation_title
-        from (select t.warehouse_name,
+        from (select
+        t.warehouse_name,
+        t.warehouse_id,
                      t.market_name,
                      case
                          when t.service_type = '1' then '商配'
@@ -39,7 +43,9 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getInStocks" resultType="com.logpm.report.vo.ReportInStockVO">
-        select warehouse_name,
+        select
+        warehouse_name,
+        warehouse_id,
                market_name,
                service_type,
                cargo_number,
@@ -50,7 +56,9 @@
                package_code,
                quantity_stock,
                allocation_title
-        from (select t.warehouse_name,
+        from (select
+        t.warehouse_name,
+        t.warehouse_id,
                      t.market_name,
                      t.service_type         service_type,
                      t.cargo_number,
@@ -73,7 +81,9 @@
              ) t ${ew.customSqlSegment}
     </select>
     <select id="getOutStocks" resultType="com.logpm.report.vo.ReportOutStockVO">
-        select warehouse_name,
+        select
+        warehouse_name,
+        warehouse_id,
                market_name,
                cargo_number,
                material_name,
@@ -85,7 +95,9 @@
                train_number,
                reservation_code,
                client_name
-        from (select ldsl.warehouse_name,
+        from (select
+        ldsl.warehouse_name,
+        ldsl.warehouse_id,
                      ldsl.market_name,
                      ldsl.cargo_number,
                      ldsl.description_goods                                                material_name,