待发货列表增加搜索项：产品、产品颜色；

watero-rst-core/src/main/java/com.iamberry.rst.core/order/PostInfo.java

@@ -0,0 +1,31 @@
+package com.iamberry.rst.core.order;
+
+/**
+ * @author 献
+ * @company 深圳爱贝源科技有限公司
+ * @date 2018/10/18 12:33
+ * @tel 18271840547
+ * @website www.iamberry.com
+ */
+public class PostInfo {
+
+    private String postFirm;
+
+    private Integer number;
+
+    public String getPostFirm() {
+        return postFirm;
+    }
+
+    public void setPostFirm(String postFirm) {
+        this.postFirm = postFirm;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -3,6 +3,7 @@ package com.iamberry.rst.faces.cm;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.order.DownsingleRuleInfo;
+import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import net.sf.json.JSONArray;
@@ -93,6 +94,12 @@ public interface SalesOrderService {
     PagedResult<SalesOrder> listSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum);
 
     /**
+     * 查询待发货的数量
+     * @return
+     */
+    List<PostInfo> listWaitPrintOrderNum();
+
+    /**
      * 仓库-代发货页面
      * @param pageNO
      * @param pageSize

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

@@ -7,6 +7,7 @@ import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.order.DownsingleRuleInfo;
 import com.iamberry.rst.core.order.DownsingleRuleItemInfo;
+import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.SysConfig;
@@ -144,6 +145,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
+    public List<PostInfo> listWaitPrintOrderNum() {
+        return salesOrderMapper.listWaitPrintOrderNum();
+    }
+
+    @Override
     public PagedResult<SalesOrder> listAwaitSendSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum) {
         PageHelper.startPage(pageNO, pageSize, isTotalNum);
         //查询订单列表信息

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

@@ -3,6 +3,7 @@ package com.iamberry.rst.service.cm.mapper;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.order.DownsingleRuleInfo;
+import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 
 import java.util.List;
@@ -58,6 +59,12 @@ public interface SalesOrderMapper {
     List<SalesOrder> listAwaitSendSalesOrderPage (SalesOrder salesOrder);
 
     /**
+     * 查询待发货的数量
+     * @return
+     */
+    List<PostInfo> listWaitPrintOrderNum();
+
+    /**
      * 获取订单数量
      * @param salesOrder
      * @return

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

@@ -305,7 +305,14 @@
                 AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
             </if>
             <if test="itemProductName !=null and itemProductName !=''">
-                AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+                AND
+                (
+                  oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+                  OR
+                  oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%')
+                  OR
+                  oi.item_color_bar LIKE CONCAT('%',#{itemProductName},'%')
+                )
             </if>
             <if test="startDate != null and startDate != ''">
                 AND sales_create_time <![CDATA[>=]]> #{startDate}
@@ -330,6 +337,18 @@
         ORDER BY sales_create_time DESC
     </select>
 
+    <select id="listWaitPrintOrderNum" resultType="PostInfo">
+        SELECT
+            sales_post_firm "postFirm",
+            count(sales_post_firm) "number"
+        FROM
+            tb_rst_sales_order_info
+        WHERE
+            sales_shipping_status = 11
+        AND sales_status = 1
+        GROUP BY
+            sales_post_firm
+    </select>
 
     <!-- 订单数量 -->
     <select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
@@ -384,7 +403,7 @@
                 AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
             </if>
             <if test="itemProductName !=null and itemProductName !=''">
-                AND oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%')
+                AND (oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%'))
             </if>
             <if test="startDate != null and startDate != ''">
                 AND sales_create_time <![CDATA[>=]]> #{startDate}

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

@@ -912,11 +912,11 @@ public class AdminSalesOrderController {
     public ResponseJson noticeDistribution(HttpServletRequest request,Integer[] salesOrderIds) throws Exception {
         ResponseJson rj = ResponseJson.getFAILURE();
         Integer flag = 0;
-        String errorId = "";
+        StringBuilder errorId = new StringBuilder();
         for (Integer salesIds:salesOrderIds) {
             SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesIds);
             if(salesOrder == null){
-                errorId  += salesIds + ",";
+                errorId.append(salesIds).append(",");
                 continue;
             }
             SalesOrder newOrder = new SalesOrder();
@@ -925,11 +925,11 @@ public class AdminSalesOrderController {
             newOrder.setSalesShippingStatus(11);
             flag = salesOrderService.noticeDistribution(newOrder);
             if(flag < 1){
-                errorId  += salesIds + ",";
+                errorId.append(salesIds).append(",");
             }
         }
         if(errorId.length() > 0){
-            rj.addResponseKeyValue("errorId",errorId);
+            rj.addResponseKeyValue("errorId", errorId.toString());
             logger.info("通知配货失败订单id:"+errorId);
             return rj;
         }

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

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreShip;
 import com.iamberry.rst.core.order.EOrderRequestData;
+import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.SalesOrderService;
@@ -82,40 +83,30 @@ public class AwaitSendController {
                 temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
             }
         }
-        List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
-        Integer status = salesOrder.getSalesShippingStatus();
-        salesOrder.setSalesShippingStatus(11);
-        PagedResult<SalesOrder> pagedResults = salesOrderService.listSalesOrderPage(1, 10000, salesOrder,totalNum == 0);
-        salesOrder.setSalesShippingStatus(status);
         int errorOrderNum = 0;
         // 聚合打单方式
-        Map<String, List<SalesOrder>> postMap = new HashMap<>();
-        if (pagedResults != null && pagedResults.getDataList() != null && !pagedResults.getDataList().isEmpty()) {
-            for (SalesOrder temp : pagedResults.getDataList()) {
+        Map<String, Integer> postMap = new HashMap<>();
+        List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum();
+        if (postInfos != null && !postInfos.isEmpty()) {
+            for (PostInfo temp : postInfos) {
                 LogisticsInfo info = new LogisticsInfo();
-                info.setLogisticsRstCode(temp.getSalesPostFirm());
+                info.setLogisticsRstCode(temp.getPostFirm());
                 List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
                 if (logisticsInfos == null || logisticsInfos.size() <= 0) {
                     errorOrderNum ++;
                     continue;
                 }
                 String key = logisticsInfos.get(0).getLogisticsName();
-                List<SalesOrder> list = postMap.get(key);
-                if (list == null) {
-                    list = new ArrayList<>();
-                    postMap.put(key, list);
-                }
-                list.add(temp);
+                postMap.put(key, temp.getNumber());
             }
         }
-
         salesOrder.setSalesOrderItemList(null);
         ModelAndView mv = new ModelAndView("order/salesOrder/list_wait_send_order");
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .setModelAndView(salesOrder, mv, "/admin/await_send/listAwaitSendOrder", pagedResult);
         mv.addObject("req",salesOrder);
-        mv.addObject("logisticsInfoList",logisticsInfoList);
+        mv.addObject("logisticsInfoList",logisticsInfoService.getLogisticsInfoList(new LogisticsInfo()));
         mv.addObject("postMap", postMap);
         mv.addObject("errorOrderNum", errorOrderNum);
         return mv;

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -32,6 +32,7 @@
 		<typeAlias type="com.iamberry.rst.core.order.OrderSource" alias="OrderSource"/>
 		<typeAlias type="com.iamberry.rst.core.order.OrderCheckLog" alias="OrderCheckLog"/>
 		<typeAlias type="com.iamberry.rst.core.order.OrderBatch" alias="OrderBatch"/>
+		<typeAlias type="com.iamberry.rst.core.order.PostInfo" alias="PostInfo"/>
 
 		<typeAlias type="com.iamberry.rst.core.sms.SmsMessage" alias="SmsMessage"/>
 		<typeAlias type="com.iamberry.rst.core.sms.OrderMessage" alias="OrderMessage"/>

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

@@ -16,8 +16,7 @@
 <body style="margin-bottom: 30px">
 
 <div class="page-container">
-    <pre style="font-size: 14px;margin-top: -1%;">待发货：<#list postMap?keys as key>${key}（${postMap[key]?size}）</#list></pre>
-
+    <pre style="font-size: 14px;margin-top: -1%;">待发货：<#list postMap?keys as key>${key}（${postMap[key]}）</#list></pre>
     <div class="text-c">
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
             <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">-->
@@ -27,7 +26,7 @@
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">已发货</option>
             </select>
 
-            <select class="select" name="salesDeliver" id="salesDeliver" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+            <select class="select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
                 <option value ="">出库状态</option>
                 <option <#if (req.salesDeliver)??><#if req.salesDeliver == 1>selected="selected"</#if></#if> value ="1" >未出库</option>
                 <option <#if (req.salesDeliver)??><#if req.salesDeliver == 2>selected="selected"</#if></#if> value ="2" >已出库</option>
@@ -45,6 +44,7 @@
             <#--<input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesDealCode)!}" placeholder="交易号" id="salesDealCode" name="salesDealCode">-->
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesAddressName)!}" placeholder="收件人姓名" id="salesAddressName" name="salesAddressName">
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesAddressTel)!}" placeholder="收件人手机" id="salesAddressTel" name="salesAddressTel">
+            <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.itemProductName)!}" placeholder="产品名称/颜色/69码" id="itemProductName" name="itemProductName">
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" onclick="orderSend()" id="" name="">打单发货</button>
             <button onClick="downloadOrderPage();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载订单">下载订单</button>
@@ -115,14 +115,14 @@
                 <td>${(o.salesAddressTel)!}</td>
                 <td>${(o.salesAddressInfo)!}</td>
                 <td style="text-align: left;">
-
-                </td>
-                <td>
-                    <#if o.salesShippingStatus == 11> <#if o.salesOrderItemList ??>
+                    <#if o.salesOrderItemList ??>
                         <#list o.salesOrderItemList as d>
                             <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
                         </#list>
                     </#if>
+                </td>
+                <td>
+                    <#if o.salesShippingStatus == 11>
                         <span style="color: red;">通知配货</span>
                     <#elseif o.salesShippingStatus == 1>
                         <p>已发货</p>
@@ -162,9 +162,7 @@
                         <a title="重新打单" href="javascript:re_print_order('${(o.salesOrderId)!}')" class="ml-5" style="text-decoration:none;display:inline">重新打单</a><br>
                     </#if>
                 <#if o.salesShippingStatus == 11>
-                    <a style="text-decoration:none;display:inline" href="javascript:void(0);" title="手动发货"onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${o.salesId}','570','450');">
-                        手动发货
-                    </a><br>
+                    <a class="ml-5" style="text-decoration:none;display:inline" href="javascript:void(0);" title="手动发货"onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${o.salesId}','570','450');">手动发货</a><br>
                 </#if>
                 </td>
             </tr>

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

@@ -13,10 +13,8 @@
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .table-bg thead th{background-color: #e2f6ff;}
-        .order-addresss{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 100px}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-order{left: 0px;cursor:pointer; position: absolute;border-bottom: 1px solid rgb(255, 255, 255);float: left;width: 110px;height: 36px;}
     </style>
@@ -182,15 +180,6 @@
                     <br>
                     ${order.salesPostNum!''}
                     </td>
-                    <#--<td>${order.salesAmount/100!''}</td>
-                    <td>${order.salesPayMoney/100!''}</td>
-                    <td>
-                        <#if order.salesPayStatus == 0>
-                            未付款
-                        <#elseif order.salesPayStatus == 2>
-                            已付款
-                        </#if>
-                    </td>-->
                     <td>${order.salesUserRemark!''}</td>
                     <td style="text-align: left;">
                         <#if order.salesOrderItemList ??>

watero-rst-web/src/main/webapp/WEB-INF/views/order/store/add.ftl

@@ -17,7 +17,7 @@
             <label class="form-label col-xs-4 col-sm-3" style="padding-left: 0;margin-left: 0px;width: 17%;"><span class="c-red">*</span>所属公司：</label>
             <div class="formControls col-xs-8 col-sm-9">
 
-                <select class="select" style="height: 30px" name="companyId" id="companyId">
+                <select class="select" style="height: 35px" name="companyId" id="companyId">
                     <#list list as d>
                         <option value="${d.companyId}">${d.companyName}</option>
                     </#list>

watero-rst-web/src/main/webapp/WEB-INF/views/order/store/list.ftl

@@ -9,14 +9,13 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
     <#include "/base/list_base.ftl">
-    <link href="${path}/common/lib/lightbox2/2.8.1/css/lightbox.css" rel="stylesheet" type="text/css" >
     <title>店铺列表</title>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 订单管理 <span class="c-gray en">&gt;</span> 店铺列表 <a class="btn btn-success radius" id="btn-refresh" style="float: right;line-height:1.6em;margin-top:3px" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 <div class="page-container">
     <div class="text-c">
-        <span class="l"><a href="javascript:;" onclick="layer_show('添加店铺信息', '${path}/admin/salesOrder/addStoreInfoUI','800','600')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加店铺信息</a></span>
+        <span class="l"><a href="javascript:;" onclick="layer_show('添加店铺', '${path}/admin/salesOrder/addStoreInfoUI','800','600')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加店铺</a></span>
     </div>
      <table class="table table-border table-bordered table-hover" style="margin-top: 50px">
         <thead>
@@ -42,15 +41,13 @@
                 <td>${(o.companyInfo.companyName)!}</td>
                 <td>${(o.storeEfast)!}</td>
                 <td>${(o.storeRemark)!}</td>
-                <td>
-                    <#if o.storeStatus == 1>启用<#else>禁用</#if>
-                </td>
+                <td><#if o.storeStatus == 1>启用<#else>禁用</#if></td>
                 <td>${o.storeCreateTime?string("yyyy-MM-dd")}</td>
                 <td class="td-manage">
                     <#if o.storeStatus == 1>
-                        <a title="禁用" href="javascript:edit_status(${o.storeId}, 2)" class="ml-5" style="text-decoration:none">禁用</a>
+                        <a title="禁用" href="javascript:edit_status(${o.storeId}, 2)" class="ml-5" style="color: blue;text-decoration:none">禁用</a>
                     <#else>
-                        <a title="启用" href="javascript:edit_status(${o.storeId}, 1)" class="ml-5" style="text-decoration:none">启用</a>
+                        <a title="启用" href="javascript:edit_status(${o.storeId}, 1)" class="ml-5" style="color: blue;text-decoration:none">启用</a>
                     </#if>
                 </td>
             </tr>
@@ -60,9 +57,7 @@
     </table>
 </div>
 </body>
-<script type="text/javascript" src="${path}/common/lib/lightbox2/2.8.1/js/lightbox.min.js"></script>
 <script type="text/javascript">
-
     /**
      * 删除
      */