批次修改

出库统计

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -90,6 +90,7 @@ public class SalesOrder implements Serializable {
     private String itemProductColor;        //产品颜色
     private Integer itemNum;                //产品数量
     private String itemColorBar;            //产品69码
+    private Integer colorId;            //颜色id
     private List<String> listColorBar;      //产品69码集合
 
     private String[] salesIds;              //传入mybatis的订单编号
@@ -665,4 +666,12 @@ public class SalesOrder implements Serializable {
     public void setSalesDeliverTime(Date salesDeliverTime) {
         this.salesDeliverTime = salesDeliverTime;
     }
+
+    public Integer getColorId() {
+        return colorId;
+    }
+
+    public void setColorId(Integer colorId) {
+        this.colorId = colorId;
+    }
 }

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

@@ -40,6 +40,13 @@ public class OrderBatch  implements  Serializable{
 
     private Integer salesAdminId;   //录入人id
 
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date startDate;                 //开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date endDate;                   //结束时间
+
     public String getBatchId(){
         return batchId;
     }
@@ -135,4 +142,20 @@ public class OrderBatch  implements  Serializable{
     public void setShippedNum(Integer shippedNum) {
         this.shippedNum = shippedNum;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

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

@@ -316,6 +316,9 @@
                   oi.item_color_bar LIKE CONCAT('%',#{itemProductName},'%')
                 )
             </if>
+            <if test="colorId !=null ">
+                AND oi.item_color_id = #{colorId}
+            </if>
             <if test="startDate != null and startDate != ''">
                 AND sales_create_time <![CDATA[>=]]> #{startDate}
             </if>
@@ -1273,6 +1276,7 @@
         FROM tb_rst_sales_order_info t
         LEFT JOIN tb_rst_sales_order_item oi ON t.sales_id = oi.item_order_id
         <where>
+            t.sales_batch_id != 'KS00000000000001'
             <if test="salesShippingStatus !=null">
                 AND t.sales_shipping_status =  #{salesShippingStatus}
             </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/orderBatchMapper.xml

@@ -33,6 +33,12 @@
             <if test="batchStatus != null ">
                 AND t.batch_status = #{batchStatus}
             </if >
+            <if test="startDate != null and startDate != ''">
+                AND sales_create_time <![CDATA[>=]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND sales_create_time <![CDATA[<=]]> #{endDate}
+            </if>
         </where>
         GROUP BY soi.sales_batch_id
         ORDER BY t.batch_create_time DESC

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

@@ -59,7 +59,9 @@ public class AdminOrderBatchController {
         }
 
         StitchAttrUtil.getSa()
+                .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .setModelAndView(orderBatch, mv, "/admin/order_batch/batch_list", pagedResult);
+
         return mv;
     }
 

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

@@ -6,11 +6,13 @@ 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.order.ProductColor;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreShipService;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
+import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.utils.OrderUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.AddrUtil;
@@ -50,6 +52,8 @@ public class AwaitSendController {
     private StoreShipService storeShipService;
     @Autowired
     private LogisticsInfoService logisticsInfoService;
+    @Autowired
+    private ProductService productService;
 
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AwaitSendController.class);
@@ -100,6 +104,9 @@ public class AwaitSendController {
                 postMap.put(key, temp.getNumber());
             }
         }
+
+        List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
+
         salesOrder.setSalesOrderItemList(null);
         ModelAndView mv = new ModelAndView("order/salesOrder/list_wait_send_order");
         StitchAttrUtil.getSa()
@@ -109,6 +116,7 @@ public class AwaitSendController {
         mv.addObject("logisticsInfoList",logisticsInfoService.getLogisticsInfoList(new LogisticsInfo()));
         mv.addObject("postMap", postMap);
         mv.addObject("errorOrderNum", errorOrderNum);
+        mv.addObject("productColorList", productColorList);
         return mv;
     }
 
@@ -453,7 +461,18 @@ public class AwaitSendController {
     @RequestMapping(value = "/deliverList")
     public ModelAndView deliverList(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("order/salesOrder/deliver_list");
+        return mv;
+    }
 
+    /**
+     * 跳转出库页面
+     *
+     * @return
+     */
+    @RequiresPermissions("salesOrder:statistics:deliver")
+    @RequestMapping(value = "/deliver_statistics")
+    public ModelAndView deliverStatistics(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("order/salesOrder/deliver_statistics");
         return mv;
     }
 
@@ -526,60 +545,62 @@ public class AwaitSendController {
 
         List<Map<String,Object>> list = new ArrayList<>();
 
+        //总数
+        SalesOrder allSalesOrder = new SalesOrder();
+        //已发货
         SalesOrder waitSalesOrder = new SalesOrder();
+        waitSalesOrder.setSalesShippingStatus(1);
+        //已出库
         SalesOrder sendSalesOrder = new SalesOrder();
+        sendSalesOrder.setSalesShippingStatus(1);
+        sendSalesOrder.setSalesDeliver(2);
         if(type == 1){
             //今日
+            allSalesOrder.setStartDate(calendarStart.getTime());
+            allSalesOrder.setEndDate(calendarEnd.getTime());
+
             waitSalesOrder.setStartDate(calendarStart.getTime());
             waitSalesOrder.setEndDate(calendarEnd.getTime());
-            waitSalesOrder.setSalesShippingStatus(11);
 
             sendSalesOrder.setStartDate(calendarStart.getTime());
             sendSalesOrder.setEndDate(calendarEnd.getTime());
-            sendSalesOrder.setSalesShippingStatus(1);
-            sendSalesOrder.setSalesDeliver(2);  //已出库
         }else{
             //2：昨日
             calendarStart.add(Calendar.DATE, -1);// 日期减1
             calendarEnd.add(Calendar.DATE, -1);// 日期减1
 
+            allSalesOrder.setStartDate(calendarStart.getTime());
+            allSalesOrder.setEndDate(calendarEnd.getTime());
+
             waitSalesOrder.setStartDate(calendarStart.getTime());
             waitSalesOrder.setEndDate(calendarEnd.getTime());
-            waitSalesOrder.setSalesShippingStatus(11);
 
             sendSalesOrder.setStartDate(calendarStart.getTime());
             sendSalesOrder.setEndDate(calendarEnd.getTime());
-            sendSalesOrder.setSalesShippingStatus(1);
-            sendSalesOrder.setSalesDeliver(2);  //已出库
         }
+        List<SalesOrderItem> allOrderItemList = salesOrderService.getDeliverNum(allSalesOrder);
         List<SalesOrderItem> waitOrderItemList = salesOrderService.getDeliverNum(waitSalesOrder);
         List<SalesOrderItem> sentOrderItemList = salesOrderService.getDeliverNum(sendSalesOrder);
-        for(SalesOrderItem  waitOrderItem : waitOrderItemList){
+
+        for (SalesOrderItem allSalesOrderItem:allOrderItemList) {
             Map<String,Object> map = new HashMap<>();
-            map.put("productName",waitOrderItem.getItemProductName());
-            map.put("colorName",waitOrderItem.getItemProductColor());
-            map.put("bar",waitOrderItem.getItemColorBar());
-            map.put("waitNum",waitOrderItem.getItemNum());
-            map.put("sendNum",0);
-            list.add(map);
-        }
-        for (SalesOrderItem sentOrderItem : sentOrderItemList) {
-            boolean flag = false;
-            for (Map<String,Object> m:list) {
-                if( m.get("bar").equals(sentOrderItem.getItemColorBar())){
-                    m.put("sendNum",sentOrderItem.getItemNum());
-                    flag = true;
+            map.put("productName",allSalesOrderItem.getItemProductName());
+            map.put("colorName",allSalesOrderItem.getItemProductColor());
+            map.put("bar",allSalesOrderItem.getItemColorBar());
+            map.put("allNum",allSalesOrderItem.getItemNum());
+            map.put("waitNum",0);
+            for(SalesOrderItem  waitOrderItem : waitOrderItemList){
+                if(waitOrderItem.getItemColorBar().equals(allSalesOrderItem.getItemColorBar())){
+                    map.put("waitNum",waitOrderItem.getItemNum());
                 }
             }
-            if(!flag){
-                Map<String,Object> map = new HashMap<>();
-                map.put("productName",sentOrderItem.getItemProductName());
-                map.put("colorName",sentOrderItem.getItemProductColor());
-                map.put("bar",sentOrderItem.getItemColorBar());
-                map.put("waitNum",0);
-                map.put("sendNum",sentOrderItem.getItemNum());
-                list.add(map);
+            map.put("sendNum",0);
+            for (SalesOrderItem sentOrderItem : sentOrderItemList) {
+                if(sentOrderItem.getItemColorBar().equals(allSalesOrderItem.getItemColorBar())){
+                    map.put("sendNum",sentOrderItem.getItemNum());
+                }
             }
+            list.add(map);
         }
         rj.addResponseKeyValue("list",list);
         return rj;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/product/AdminProductController.java

@@ -44,4 +44,20 @@ public class AdminProductController {
         return rj;
     }
 
+    /**
+     * 获取产品和颜色的下拉框选择
+     * @param request
+     * @param productColor
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/getProductAndColor")
+    public ResponseJson getProductAndColor(HttpServletRequest request, ProductColor productColor) throws Exception {
+        ResponseJson rj =  new ResponseJson(200, "SUCCESS", 200);
+        List<ProductColor> productColorList = productService.listproductAndColor(productColor);
+        rj.addResponseKeyValue("productColorList",productColorList);
+        return rj;
+    }
+
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/wechat/WeChatTestController.java

@@ -1,26 +0,0 @@
-package com.iamberry.rst.controllers.wechat;
-
-import com.iamberry.wechat.core.entity.WechatUtils;
-import com.iamberry.wechat.tools.ResponseJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Controller
-@RequestMapping("/wechat/getTest")
-public class WeChatTestController {
-
-    @ResponseBody
-    @RequestMapping(value = "/wechatTest")
-    public ResponseJson wechatTest(HttpServletRequest request
-            ) throws Exception {
-
-        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
-        ResponseJson rj =new ResponseJson(200, "测试成功+"+openId, 200);
-        return rj;
-    }
-
-
-}

watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/order_batch_list.ftl

@@ -32,16 +32,20 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/order_batch/batch_list" method="post">
-            <#--<select class="my-select" name="produceId" style="height: 36px;width: 150px">-->
-                <#--<option value ="">所有产品</option>-->
-                <#--<#if produceList?? &&  (produceList?size > 0) >-->
-                    <#--<#list produceList as produce>-->
-                        <#--<option value ="${produce.produceId!}" <#if produceId??><#if produceId ==produce.produceId >selected="selected"</#if></#if>>${produce.produceName!}</option>-->
-                    <#--</#list>-->
-                <#--</#if>-->
-            <#--</select>-->
-            <#--<input type="text" class="my-input"  style="width:150px" value="${batchNo!''}" placeholder="批次编号" id="batchNo" name="batchNo">-->
-            <#--<button type="submit" class="my-btn-search" style="" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>-->
+            <#--<select class="my-select" name="produceId" style="height: 36px;width: 150px">
+                <option value ="">所有产品</option>
+                <#if produceList?? &&  (produceList?size > 0) >
+                    <#list produceList as produce>
+                        <option value ="${produce.produceId!}" <#if produceId??><#if produceId ==produce.produceId >selected="selected"</#if></#if>>${produce.produceName!}</option>
+                    </#list>
+                </#if>
+            </select>-->
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${orderBatch.batchId!}" placeholder="批次编号" name="batchId" id="batchId">
+
+             <input type="text" style="margin-top: -3px;width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})" value="${(orderBatch.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>-
+                <input type="text" style="margin-top: -3px;width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})" value="${(orderBatch.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
+
+                <button type="submit" class="my-btn-search" style="" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
 
             <#--<button type="button" style="cursor:pointer;" class="my-btn-search" onclick="toExcel();">导出到Excel</button>-->
         </form>

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

@@ -81,7 +81,7 @@
                 </div>
             </div>
 
-            <div class="mt-20" style="">
+            <div class="mt-20" style="display: none">
                 <table class="table table-border table-bg table-bordered">
                     <tbody>
                         <tr class="text-c">
@@ -161,13 +161,13 @@
 
 <script>
     $(function (){
-        getdeliver(1);
-        getdeliver(2);
+//        getdeliver(1);
+//        getdeliver(2);
     })
 
     /**
      * 获取出库数量
-     * type: 1：代发货总数   2：已出库数量
+     * type: 1：待发货总数   2：已出库数量
      */
     function getdeliver(type){
         $.ajax({
@@ -178,7 +178,7 @@
             },
             dataType: 'json',
             success:function(res) {
-                var html = '<tr class="text-c"><td width="16">产品名称</td><td width="16">代发货总数</td><td width="16">已出库数量</td></tr>';
+                var html = '<tr class="text-c"><td width="16">产品名称</td><td width="16">待发货总数</td><td width="16">已出库数量</td></tr>';
                 for(var i=0;i<res.returnMsg.list.length;i++){
                     var order = res.returnMsg.list[i];
                     html += '<tr class="text-c">';

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

@@ -0,0 +1,145 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/add_base.ftl">
+    <title>出库列表</title>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_results li a span {float:right}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .col-sm-1{width: 150px;}
+
+        .all_down{text-decoration: underline;color: #00c;}
+    </style>
+</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 radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl">
+        <form action="" method="post" class="form form-horizontal" id="form-order-add"  >
+
+
+            <div class="mt-20" style="">
+                <table class="table table-border table-bg table-bordered">
+                    <tbody>
+                        <tr class="text-c">
+                            <td width="10">今日订单<br>产品发货出库统计<br></td>
+                            <td width="100">
+
+                                <table class="table table-border table-bg table-bordered">
+                                    <tbody id="todayOrderNumber">
+
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr class="text-c">
+                            <td width="10">昨日订单<br>产品发货出库统计</td>
+                            <td width="100">
+
+                                <table class="table table-border table-bg table-bordered">
+                                    <tbody id="yesterdayOrderNumber">
+                                        <tr class="text-c">
+                                            <td width="16">产品名称</td>
+                                            <td width="16">总数</td>
+                                            <td width="16">已发货</td>
+                                            <td width="16">已出库</td>
+                                        </tr>
+                                        <tr class="text-c">
+                                            <td width="16">WaterO WA-1桌面净饮水机(橘子红)</td>
+                                            <td width="16">0</td>
+                                            <td width="16">1</td>
+                                            <td width="16">1</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+
+        </form>
+    </div>
+</article>
+
+<tfoot>
+</tfoot>
+<script>
+    $(function (){
+        getdeliver(1);
+        getdeliver(2);
+    })
+
+    /**
+     * 获取出库数量
+     * type: 1：待发货总数   2：已出库数量
+     */
+    function getdeliver(type){
+        $.ajax({
+            type:'POST',
+            url: '${path}/admin/await_send/getDeliverNum',
+            data:{
+                "type" : type
+            },
+            dataType: 'json',
+            success:function(res) {
+                var html = '<tr class="text-c"><td width="16">产品名称</td><td width="16">总数</td><td width="16">已发货</td><td width="16">已出库</td></tr>';
+                for(var i=0;i<res.returnMsg.list.length;i++){
+                    var order = res.returnMsg.list[i];
+                    html += '<tr class="text-c">';
+                    html += '<td width="16">'+ order.productName + '('+ order.colorName +')' +'</td>';
+                    html += '<td width="16">'+ order.allNum +'</td>';
+                    html += '<td width="16">'+ order.waitNum +'</td>';
+                    html += '<td width="16">'+ order.sendNum +'</td>';
+                    html += '</tr>';
+                }
+                if(type == 1){
+                    //今日
+                    $("#todayOrderNumber").html(html);
+                }else{
+                    //昨日
+                    $("#yesterdayOrderNumber").html(html);
+                }
+            }
+        });
+    }
+
+</script>
+
+</body>
+</html>

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

@@ -19,7 +19,7 @@
     <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">-->
+            <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">
                 <option value="">发货状态</option>
                 <#--<option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 0>selected="selected"</#if></#if> value="0">待发货</option>-->
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 11>selected="selected"</#if></#if> value="11">待打单</option>
@@ -44,7 +44,15 @@
             <#--<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">
+
+            <#--<input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.itemProductName)!}" placeholder="产品名称/颜色/69码" id="itemProductName" name="itemProductName">-->
+            <select class="select" name="colorId" id="colorId" style="height: 31px;width: 150px">
+                <option value="">产品名称(颜色)</option>
+                <#list productColorList as productColor>
+                    <option <#if (req.colorId)??><#if req.colorId == productColor.colorId>selected="selected"</#if></#if> value="${productColor.colorId}">${productColor.productName}(${productColor.colorName})</option>
+                </#list>
+            </select>
+
             <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>