审批系统修改

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")
@@ -704,4 +705,12 @@ public class SalesOrder implements Serializable {
     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/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}

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/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>