出库

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -122,6 +122,12 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         PageHelper.startPage(pageNO, pageSize, isTotalNum);
         //查询订单列表信息
         List<SalesOrder> orderList = salesOrderMapper.listSalesOrder(salesOrder);
+        for(SalesOrder so : orderList){
+            SalesOrderItem salesOrderItem = new SalesOrderItem();
+            salesOrderItem.setItemOrderId(so.getSalesId());
+            List<SalesOrderItem> salesOrderItemList = salesOrderMapper.listSalesOrderItem(salesOrderItem);
+            so.setSalesOrderItemList(salesOrderItemList);
+        }
         return PageUtil.getPage(orderList);
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -114,7 +114,7 @@
                 <th width="50">支付金额</th>
                 <th width="50">是否付款</th>-->
                 <th width="50">用户备注</th>
-                <th width="50">后台备注</th>
+                <th width="50">产品</th>
                 <th width="65">创建时间</th>
                 <th width="50">操作</th>
             </tr>
@@ -201,7 +201,13 @@
                         </#if>
                     </td>-->
                     <td>${order.salesUserRemark!''}</td>
-                    <td>${order.salesAdminRemark!''}</td>
+                    <td>
+                        <#if order.salesOrderItemList ??>
+                            <#list order.salesOrderItemList as d>
+                                <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
+                            </#list>
+                        </#if>
+                    </td>
 
                     <td>
                         ${(order.salesCreateTime?string("yyyy-MM-dd"))!''}</br>