Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -77,6 +77,7 @@ public class SalesOrder implements Serializable {
     private String storeEfast;               //Efast 的店铺id
 
     private Integer orderDateType;   //时间类型  1：创建时间   2：打单时间  3：出库时间
+    private Integer isSelectCustomer;   //是否查询客诉订单 1是 2否
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
@@ -119,6 +120,8 @@ public class SalesOrder implements Serializable {
 
     private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉的订单
 
+    private Date salesDistributionTime;//通知配货时间
+
     public Integer getStartOrderNO() {
         return startOrderNO;
     }
@@ -694,4 +697,20 @@ public class SalesOrder implements Serializable {
     public void setIsCustmerAddOrder(Integer isCustmerAddOrder) {
         this.isCustmerAddOrder = isCustmerAddOrder;
     }
+
+    public Date getSalesDistributionTime() {
+        return salesDistributionTime;
+    }
+
+    public void setSalesDistributionTime(Date salesDistributionTime) {
+        this.salesDistributionTime = salesDistributionTime;
+    }
+
+    public Integer getIsSelectCustomer() {
+        return isSelectCustomer;
+    }
+
+    public void setIsSelectCustomer(Integer isSelectCustomer) {
+        this.isSelectCustomer = isSelectCustomer;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -275,7 +275,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             /*productionItem.setItemShouldStorage(productionItem.getItemLackNumber());*/
             productionItem.setItemLackNumber(productionItem.getItemLackNumber() - jsonRecords.getInt("actualStorage"));
             productionItem.setItemActualStorage(productionItem.getItemActualStorage()+jsonRecords.getInt("actualStorage"));
-            productionItem.setItemCanpickNumber(productionItem.getItemActualStorage()+jsonRecords.getInt("actualStorage"));
+            productionItem.setItemCanpickNumber(productionItem.getItemCanpickNumber()+jsonRecords.getInt("actualStorage"));
             if(approvalOrderMapper.updateProductionItem(productionItem) < 1){
                 return new ResponseJson(200, "修改审批产品项失败", 500);
             }
@@ -646,6 +646,23 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                         }
                     }
                 }else{
+                    //修改生产审批项的可提货数量
+                    ApprovalInfo approval = new ApprovalInfo();
+                    approval.setApprovalId(ainfo.getApprovalId());
+                    List<ApprovalInfo> listApprovalInfo =  approvalOrderMapper.listApprovalInfo(approval);
+                    for(ApprovalApplyPickItem item : listApprovalInfo.get(0).getApprovalApplyPick().getListApplyPickItem()){
+                        //查询生产审批id
+                        ApprovalProductionItem productionItem = approvalOrderMapper.getProductionItem(item.getProductionItemId());
+                        ApprovalProductionItem productItem = new ApprovalProductionItem();
+                        productItem.setItemId(item.getProductionItemId());
+                        productItem.setItemCanpickNumber(productionItem.getItemCanpickNumber()+item.getItemProductNum());
+                        if(approvalOrderMapper.updateProductionItem(productItem) < 1){
+                            rj = ResponseJson.getFAILURE();
+                            rj.setResultMsg("返回生产审批可提货数量失败！");
+                            return  rj;
+                        }
+                    }
+
                     //通知申请人该提货审批已驳回
                     ApprovalApplyPick  approvalApplyPick = new ApprovalApplyPick();
                     approvalApplyPick.setApprovalId(approvalInfo.getApprovalId());
@@ -721,6 +738,24 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                             return  rj;
                         }
                     }
+                    /*//如果为审批状态为已完成提货则需要修改状态为已完成部分提货
+                    if(listApprovalInfo.get(0).getApprovalApplyPick().getProductionApprovalId() == null){
+                        rj = ResponseJson.getFAILURE();
+                        rj.setResultMsg("提货订单关联生产审批id为空！");
+                        return  rj;
+                    }
+                    if(approvalOrderMapper.getApprovalInfoById(listApprovalInfo.get(0).getApprovalApplyPick().getProductionApprovalId()).getApprovalStatus() == 10){
+                        ApprovalInfo infos = new ApprovalInfo();
+                        infos.setApprovalId(listApprovalInfo.get(0).getApprovalApplyPick().getProductionApprovalId());
+                            //修改关联生产审批信息状态为已完成部分提货
+                            info.setApprovalStatusDetails("已完成部分提货");
+                            info.setApprovalStatus(11);
+                            if(approvalOrderMapper.updateApprovalInfo(info) < 1){
+                                rj = ResponseJson.getFAILURE();
+                                rj.setResultMsg("修改关联审批信息状态为已完成部分提货失败！");
+                                return  rj;
+                            }
+                    }*/
                 }
                 //调用第三方revokeTask接口执行撤销
                 approvalTaskService.revokeTask(approvalInfo.getActivitiId(),"业务员撤销审核");

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

@@ -58,6 +58,7 @@
     <result column="apply_pick_remk" property="applyPickRemk" jdbcType="VARCHAR" />
     <result column="apply_pick_create_time" property="applyPickCreateTime" jdbcType="TIMESTAMP" />
     <result column="apply_pick_update_time" property="applyPickUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="production_approval_id" property="productionApprovalId" jdbcType="INTEGER" />
     <collection property="listApplyPickItem" column="apply_pick_id" ofType="ApprovalApplyPickItem" select="listApplyPickItem"/>
   </resultMap>
 
@@ -354,7 +355,7 @@
         AND hr.record_state  = 1
       </if>
       <if test="selectState != null and selectState != '' and selectState == 2">
-        AND hr.record_state  = 2
+        AND ai.approval_status in (2,3,4,5,6,7,8,10,11)
       </if>
       <if test="selectState != null and selectState != '' and selectState == 3">
         AND ai.approval_status in (2,6)
@@ -365,6 +366,9 @@
       <if test="selectState != null and selectState != '' and selectState == 5">
         AND ai.approval_status in (1,4)
       </if>
+      <if test="selectState != null and selectState != '' and selectState == 6">
+        AND ai.approval_status in (6,7,11)
+      </if>
     </where>
     group by ai.approval_id
     ORDER BY ai.approval_id DESC
@@ -413,7 +417,8 @@
     aap.apply_pick_struts,
     aap.apply_pick_remk,
     aap.apply_pick_create_time,
-    aap.apply_pick_update_time
+    aap.apply_pick_update_time,
+    aap.production_approval_id
     from tb_rst_approval_apply_pick aap
     where
         aap.approval_id = #{approvalId}
@@ -461,7 +466,8 @@
     aapi.item_product_box_number itemProductBoxNumber,
     aapi.item_create_time itemCreateTime,
     aapi.item_update_time itemUpdateTime,
-    aapi.item_external_model  itemExternalModel
+    aapi.item_external_model itemExternalModel,
+    aapi.production_item_id productionItemId
     from tb_rst_approval_apply_pick_item aapi
     where
         aapi.apply_pick_id = #{applyPickId}
@@ -556,13 +562,13 @@
   <update id="updateProductionItem" parameterType="ApprovalProductionItem">
     update tb_rst_approval_production_item
     <set >
-      <if test="itemActualStorage != null and itemActualStorage != ''" >
+      <if test="itemActualStorage != null" >
         item_actual_storage = #{itemActualStorage},
       </if>
-      <if test="itemLackNumber != null and itemLackNumber != ''" >
+      <if test="itemLackNumber != null" >
         item_lack_number = #{itemLackNumber},
       </if>
-      <if test="itemCanpickNumber != null and itemCanpickNumber != ''" >
+      <if test="itemCanpickNumber != null" >
         item_canpick_number = #{itemCanpickNumber}
       </if>
     </set>

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

@@ -75,6 +75,9 @@
             FROM tb_rst_sales_order_info soi
             LEFT JOIN tb_rst_sales_order_item oi ON soi.sales_id = oi.item_order_id
             <where>
+                <if test="isSelectCustomer !=null and isSelectCustomer !='' and isSelectCustomer == 2 ">
+                    soi.sales_batch_id != 'KS00000000000001'
+                </if>
                 <if test="salesIsDownload !=null and salesIsDownload !=''">
                     AND sales_is_download = #{salesIsDownload}
                 </if>
@@ -328,10 +331,10 @@
                 AND oi.item_color_id = #{colorId}
             </if>
             <if test="startDate != null and startDate != ''">
-                AND sales_create_time <![CDATA[>=]]> #{startDate}
+                AND sales_distribution_time <![CDATA[>=]]> #{startDate}
             </if>
             <if test="endDate != null and endDate != ''">
-                AND sales_create_time <![CDATA[<=]]> #{endDate}
+                AND sales_distribution_time <![CDATA[<=]]> #{endDate}
             </if>
             <if test="salesAdminId != null ">
                 AND sales_admin_id = #{salesAdminId}
@@ -1215,7 +1218,8 @@
         update tb_rst_sales_order_info
         SET
           sales_shipping_status = #{salesShippingStatus},
-          sales_orderId = #{salesOrderId}
+          sales_orderId = #{salesOrderId},
+          sales_distribution_time = NOW()
         WHERE
           sales_shipping_status = 0
         AND
@@ -1418,6 +1422,14 @@
                     AND sales_deliver_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="orderDateType != null and orderDateType == 4">
+                <if test="startDate != null and startDate != ''">
+                    AND sales_distribution_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND sales_distribution_time <![CDATA[<=]]> #{endDate}
+                </if>
+            </if>
         </where>
         GROUP BY tb_rst_sales_order_info.sales_id
         ORDER BY tb_rst_sales_order_info.sales_id DESC

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -121,6 +121,11 @@ public class ApplyPickController {
         approvalApplyPick.setApplyPickStruts(1);
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(2);
+        for(int i = 0; i<listApplyPickItem.size();i++){
+            if (listApplyPickItem.get(i).getItemProductNum() == 0){
+                listApplyPickItem.remove(i);
+            }
+        }
         try{
           applyPickService.save(approvalApplyPick,openId,taskinfo,approvalProductionContractList);
         }catch (Exception e){
@@ -270,8 +275,8 @@ public class ApplyPickController {
             return  rj;
         }
 
-        //查询生产审批项可提货数量,并修改可提货数量
-        ApprovalInfo appinfo = approvalOrderService.getApprovalInfoById(aap.getProductionApprovalId());
+        //查询生产审批项可提货数量
+        /*ApprovalInfo appinfo = approvalOrderService.getApprovalInfoById(aap.getProductionApprovalId());
         Integer canpickNumber = 0;//可提货数量
         for(ApprovalProductionItem item : appinfo.getApprovalProduction().getListProductionItem()){
             canpickNumber += item.getItemCanpickNumber();
@@ -297,7 +302,7 @@ public class ApplyPickController {
                 rj.setResultMsg("修改关联审批信息状态为已完成提货失败！");
                 return  rj;
             }
-        }
+        }*/
         return rj;
     }
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -87,13 +87,12 @@ public class ApprovalController {
         if(deliveryDate == null ){
             return  ResponseJson.getFAILURE();
         }
-        if(inspectionTime == null ){
-            return  ResponseJson.getFAILURE();
-        }
+
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         approvalProduction.setProductionDeliveryDate(format.parse(deliveryDate));
-        approvalProduction.setInspectionTime(format.parse(inspectionTime));
-
+        if(inspectionTime != null ){
+            approvalProduction.setInspectionTime(format.parse(inspectionTime));
+        }
         //封装生产审批产品项
         List<ApprovalProductionItem> listApprovalProductionItem = new ArrayList<ApprovalProductionItem>();
             JSONArray jsonProductionItems = JSONArray.fromObject(productionItems);
@@ -362,7 +361,9 @@ public class ApprovalController {
             if(selectType == 1){//我发起的
                 approvalInfo.setAdminId(admin.getAdminId());
             }else if(selectType == 2){//我审核的
-                approvalInfo.setApprovalAdminId(admin.getAdminId());
+                if(approvalInfo.getSelectState() == null || approvalInfo.getSelectState() != 2){
+                    approvalInfo.setApprovalAdminId(admin.getAdminId());
+                }
             }
             if(selectType == 3){
                 //判断是否是仓库人员
@@ -659,24 +660,24 @@ public class ApprovalController {
         }
         return rj;
     }
-    /*@ResponseBody
+    @ResponseBody
     @RequestMapping(value = "/deploymentPrecessDefinition")
     public void deploymentPrecessDefinition(){
-        getBpmnModel();
-        repositoryService.deleteDeployment("310008",true);
-        repositoryService.deleteDeployment("427508",true);
-        repositoryService.deleteDeployment("427501",true);
-        repositoryService.deleteDeployment("422501",true);
-        *//*Deployment deployment = repositoryService.createDeployment()
+        /*getBpmnModel();*/
+        /*repositoryService.deleteDeployment("520001",true);
+        repositoryService.deleteDeployment("520005",true);*/
+        /*repositoryService.deleteDeployment("427501",true);
+        repositoryService.deleteDeployment("422501",true);*/
+        Deployment deployment = repositoryService.createDeployment()
                 .key("GenerationApproval")
                 .name("提交审批流程")
                 .addClasspathResource("RST.bpmn")
                 .deploy();
-        Deployment deployment = repositoryService.createDeployment()
+        Deployment deployment2 = repositoryService.createDeployment()
                 .key("ApplicationForDelivery")
                 .name("提交提货订单审批流程")
                 .addClasspathResource("pickRst.bpmn")
-                .deploy();*//*
+                .deploy();
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(1);
         String[] split = (String[])taskinfo.get("users");
@@ -690,5 +691,5 @@ public class ApprovalController {
         }
 
 
-    }*/
+    }
 }

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

@@ -782,6 +782,7 @@ public class AdminOrderController {
         titles.add("销售公司名称");
         titles.add("店铺名称");
         titles.add("出库日期");
+        titles.add("通知配货日期");
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
@@ -858,6 +859,7 @@ public class AdminOrderController {
                 row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
                 row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));
+                row.add(salesOrder.getSalesDistributionTime() == null ? null:formatter.format(salesOrder.getSalesDistributionTime()));
                 countexts.add(row);
             }
         }

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

@@ -91,7 +91,7 @@ public class AdminSalesOrderController {
         if(identity == 2){
             salesOrder.setSalesAdminId(admin.getAdminId());
         }
-
+        salesOrder.setIsSelectCustomer(2);//不查询客诉添加的订单
         //分页获取订单信息
         PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
@@ -1109,4 +1109,30 @@ public class AdminSalesOrderController {
         Integer res = salesOrderService.delSalesOrder(id);
         return res <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
     }
+    /**
+     * 进入修改订单备注页面
+     * @param salesId
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/to_update_order_remark")
+    @RequiresPermissions("salesOrder:select:salesOrder")
+    public ModelAndView to_update_order_remark(@RequestParam("salesId") Integer salesId) {
+        SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
+        return new ModelAndView("order/salesOrder/update_order_remark").addObject("salesOrder", salesOrder);
+    }
+    /**
+     * 进入修改订单备注页面
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/update_order_remark")
+    @RequiresPermissions("salesOrder:select:salesOrder")
+    public ResponseJson update_order_remark(SalesOrder salesOrder) {
+        if(salesOrder == null  || salesOrder.getSalesId() == null || salesOrder.getSalesAdminRemark() == null){
+            return ResponseJson.getFAILURE();
+        }
+        Integer num = salesOrderService.updateSalesOrder(salesOrder);
+        return num <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
+    }
 }

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

@@ -75,6 +75,7 @@
         <#--<th width="40">客户备注</th>-->
             <th width="40">后台备注</th>
             <th width="40">下单时间</th>
+            <th width="40">通知配货时间</th>
             <th width="60">操作</th>
         </tr>
         </thead>
@@ -163,6 +164,7 @@
             <#--<td>${(o.salesUserRemark)!}</td>-->
                 <td>${(o.salesAdminRemark)!}</td>
                 <td>${(o.salesCreateTime?string("yyyy-MM-dd"))!}</td>
+                <td><#if (o.salesPostFirm)??>${(o.salesDistributionTime?string("yyyy-MM-dd"))!}</#if></td>
                 <td class="td-manage">
                     <#if o.salesShippingStatus == 11>
                         <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none;display:inline">打单发货</a><br>

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

@@ -259,6 +259,10 @@
                         <a class="del_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="删除订单" onclick="delSalesOrder(${order.salesId!''})">
                             <i class="Hui-iconfont">&#xe609;</i>
                         </a>
+                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
+                           onclick="distribution_postFirm('修改备注','${path}/admin/salesOrder/to_update_order_remark?salesId=${order.salesId!''}','570','450');">
+                            <i class="Hui-iconfont">&#xe60c;</i>
+                        </a>
                     </td>
                 </tr>
                 </#list>

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

@@ -0,0 +1,80 @@
+<!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" />
+<#include "/base/add_base.ftl">
+    <title>修改备注</title>
+    <style>
+        .my-title{font-weight: 500;padding-left: 15px;position: relative;}
+        .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
+        .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 50%;}
+        .input-box{margin: 18px 0;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
+        .add-list>li{margin: 10px 0;}
+        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+    </style>
+    <meta name="keywords" content="${path}">
+    <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
+</head>
+<body>
+<article class="page-container">
+    <form class="form form-horizontal" id="form-admin-add">
+        <div class="input-box"   style="text-align:center;">
+            <span class="input-dic spanhidth">备注</span>
+                <textarea rows="5" cols="20" name="salesAdminRemark" id="salesAdminRemark" class="my-textarea" placeholder="请详细备注">${salesOrder.salesAdminRemark!''}</textarea>
+                <input type="hidden" value="${salesOrder.salesId!''}" id="salesId" name="salesId">
+        </div>
+        <div style="text-align:center;">
+           <button type="button" class="my-btn-submit" onclick="update();">确认提交</button>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+
+
+    function  update() {
+        var salesAdminRemark = $("#salesAdminRemark").val();
+        if( salesAdminRemark != null){
+            if( salesAdminRemark.length > 200 ){
+                layer.msg('备注长度不得大于100个字符',{icon: 5,time:1000});
+                return;
+            }
+        }
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/salesOrder/update_order_remark",
+            data:$('#form-admin-add').serialize(),// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('修改成功',{icon: 1,time:1000},function () {
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index)
+                    });
+                } else {
+                    layer.msg('修改失败',{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('修改错误',{icon: 5,time:1000});
+            }
+        });
+    }
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/order_statistics.ftl

@@ -86,6 +86,7 @@
                     <option value="1" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 1 >selected="selected"</#if></#if>>创建时间</option>
                     <option value="2" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 2 >selected="selected"</#if></#if>>打单时间</option>
                     <option value="3" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 3 >selected="selected"</#if></#if>>出库时间</option>
+                    <option value="4" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 4 >selected="selected"</#if></#if>>通知配货时间</option>
                 </select>
 
             </div>