审批系统

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -126,7 +126,7 @@
 
   <select id="listApprovalOrderItem" parameterType="Integer" resultType="ApprovalOrderItem">
     SELECT
-    <include refid="Base_Column_List" />
+    <include refid="order_item_column_List" />
     FROM tb_rst_approval_order_item
     WHERE approval_id = #{approvalId}
   </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -754,11 +754,15 @@
   <select id="listSalesOrderAndItem" parameterType="SalesOrder" resultType="SalesOrder">
     SELECT
         t.*,
-        soi.*
+        soi.*,
+        trsi.store_name  storeName,
+        trsc.company_name companyName
     FROM
         tb_rst_sales_order_info t
     LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
     LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
+    LEFT JOIN tb_rst_store_info trsi ON t.sales_store_id = trsi.store_id
+    LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
     WHERE t.sales_batch_id = #{salesBatchId}
   </select>
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -757,6 +757,8 @@ public class AdminOrderController {
         titles.add("商品名称");
         titles.add("商品颜色");
         titles.add("商品数量");
+        titles.add("销售公司名称");
+        titles.add("店铺名称");
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
@@ -784,6 +786,8 @@ public class AdminOrderController {
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName());
                 row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
+                row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
+                row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 countexts.add(row);
             }
         }
@@ -897,6 +901,12 @@ public class AdminOrderController {
             case "longbanwuliu":
                 name= "龙邦快递";
                 break;
+            case "YZPY":
+                name= "省外EMS";
+                break;
+            case "EYB":
+                name= "省外EMS";
+                break;
             default:
                 break;
         }