审批系统修改

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

@@ -2,6 +2,7 @@ package com.iamberry.rst.core.order;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 1.6.11	订单中心-订单更正表
@@ -17,6 +18,8 @@ public class OrderCorrectInfo implements Serializable {
     private String correctDesc;//备注信息
     private Integer adminId;//更正人/客服id
     private Date correctCreateDate;//创建时间
+    private List<OrderCorrectItem> orderCorrectItemList;//更正项
+    private String adminName;//更正人姓名
 
     public Integer getCorrectId() {
         return correctId;
@@ -73,4 +76,20 @@ public class OrderCorrectInfo implements Serializable {
     public void setCorrectCreateDate(Date correctCreateDate) {
         this.correctCreateDate = correctCreateDate;
     }
+
+    public List<OrderCorrectItem> getOrderCorrectItemList() {
+        return orderCorrectItemList;
+    }
+
+    public void setOrderCorrectItemList(List<OrderCorrectItem> orderCorrectItemList) {
+        this.orderCorrectItemList = orderCorrectItemList;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
 }

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

@@ -3,8 +3,11 @@ 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.OrderCorrectInfo;
+import com.iamberry.rst.core.order.OrderCorrectItem;
 import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -349,4 +352,52 @@ public interface SalesOrderService {
      * @return
      */
     List<SalesOrderItem> selectSalesOrderItemList(Integer salesId);
+
+    /**
+     * 添加更正信息
+     * @param orderCorrectInfo
+     * @return
+     */
+    Boolean addCorrectInfo(OrderCorrectInfo orderCorrectInfo, String arrayItem, Admin admin);
+
+    /**
+     * 添加更正信息项
+     * @param OrderCorrectItem
+     * @return
+     */
+    Integer addCorrectItem(OrderCorrectItem OrderCorrectItem );
+
+    /**
+     * 获取更正信息
+     * @param correctId
+     * @return
+     */
+    OrderCorrectInfo getOrderCorrectInfo(Integer correctId);
+
+    /**
+     * 获取更正信息项
+     * @param correctId
+     * @return
+     */
+    List<OrderCorrectItem> listOrderCorrectItem(Integer correctId);
+    /**
+     * 获取订单项
+     * @param itemId
+     * @return
+     */
+    SalesOrderItem getSalesOrderItem(Integer itemId);
+
+    /**
+     * 修改订单项数量
+     * @param salesOrderItem
+     * @return
+     */
+    Integer updateOrderItemById(SalesOrderItem salesOrderItem);
+
+    /**
+     * 查询更正信息集合
+     * @param orderId
+     * @return
+     */
+    List<OrderCorrectInfo> listOrderCorrectInfo(Integer orderId);
 }

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

@@ -8,6 +8,7 @@ import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.address.AddressService;
@@ -1018,4 +1019,70 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public List<SalesOrderItem> selectSalesOrderItemList(Integer salesId) {
         return salesOrderMapper.selectSalesOrderItemList(salesId);
     }
+
+    @Transactional
+    @Override
+    public Boolean addCorrectInfo(OrderCorrectInfo orderCorrectInfo, String arrayItem, Admin admin) {
+        //添加更新信息
+        orderCorrectInfo.setAdminId(admin.getAdminId());
+        if(salesOrderMapper.addCorrectInfo(orderCorrectInfo) < 1){
+            throw  new RuntimeException("更正订单-订单异常！");
+        }
+        //封装订单项数据
+        JSONArray jsonArray = JSONArray.fromObject(arrayItem);
+        List salesOrderItemList = ((List)JSONArray.toCollection(jsonArray, SalesOrderItem.class));
+        for(Object temp : salesOrderItemList){
+            SalesOrderItem salesOrderItem = (SalesOrderItem) temp;
+            //查询订单项原数量
+            SalesOrderItem orderItem = salesOrderMapper.getSalesOrderItem(salesOrderItem.getItemId());
+            OrderCorrectItem orderCorrectItem = new OrderCorrectItem();
+            orderCorrectItem.setCorrectId(orderCorrectInfo.getCorrectId());
+            orderCorrectItem.setOrderItemId(salesOrderItem.getItemId());
+            orderCorrectItem.setItemProductColor(salesOrderItem.getItemProductColor());
+            orderCorrectItem.setItemProductName(salesOrderItem.getItemProductName());
+            orderCorrectItem.setCorrectNum(salesOrderItem.getItemNum());
+            orderCorrectItem.setOldNum(orderItem.getItemNum());
+            if(orderItem.getItemNum().intValue() != salesOrderItem.getItemNum().intValue()){
+                //修改订单项数量
+                orderItem.setItemNum(salesOrderItem.getItemNum());
+                if(salesOrderMapper.updateOrderItemById(orderItem) < 1){
+                    throw  new RuntimeException("更正订单-修改订单项数量失败！");
+                }
+                if(salesOrderMapper.addCorrectItem(orderCorrectItem) < 1){
+                    throw  new RuntimeException("更正订单-添加记录失败！");
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Integer addCorrectItem(OrderCorrectItem orderCorrectItem) {
+        return salesOrderMapper.addCorrectItem(orderCorrectItem);
+    }
+
+    @Override
+    public OrderCorrectInfo getOrderCorrectInfo(Integer correctId) {
+        return salesOrderMapper.getOrderCorrectInfo(correctId);
+    }
+
+    @Override
+    public List<OrderCorrectItem> listOrderCorrectItem(Integer correctId) {
+        return salesOrderMapper.listOrderCorrectItem(correctId);
+    }
+
+    @Override
+    public SalesOrderItem getSalesOrderItem(Integer itemId) {
+        return salesOrderMapper.getSalesOrderItem(itemId);
+    }
+
+    @Override
+    public Integer updateOrderItemById(SalesOrderItem salesOrderItem) {
+        return salesOrderMapper.updateOrderItemById(salesOrderItem);
+    }
+
+    @Override
+    public List<OrderCorrectInfo> listOrderCorrectInfo(Integer orderId) {
+        return salesOrderMapper.listOrderCorrectInfo(orderId);
+    }
 }

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

@@ -3,6 +3,8 @@ 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.OrderCorrectInfo;
+import com.iamberry.rst.core.order.OrderCorrectItem;
 import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 
@@ -286,4 +288,49 @@ public interface SalesOrderMapper {
      */
     List<SalesOrderItem> selectSalesOrderItemList(Integer salesId);
 
+    /**
+     * 添加更正信息
+     * @param orderCorrectInfo
+     * @return
+     */
+    Integer addCorrectInfo(OrderCorrectInfo orderCorrectInfo );
+
+    /**
+     * 添加更正信息项
+     * @param OrderCorrectItem
+     * @return
+     */
+    Integer addCorrectItem(OrderCorrectItem OrderCorrectItem );
+
+    /**
+     * 获取更正信息
+     * @param correctId
+     * @return
+     */
+    OrderCorrectInfo getOrderCorrectInfo(Integer correctId);
+
+    /**
+     * 获取更正信息项
+     * @param correctId
+     * @return
+     */
+    List<OrderCorrectItem> listOrderCorrectItem(Integer correctId);
+    /**
+     * 获取订单项
+     * @param itemId
+     * @return
+     */
+    SalesOrderItem getSalesOrderItem(Integer itemId);
+    /**
+     * 修改订单项数量
+     * @param salesOrderItem
+     * @return
+     */
+    Integer updateOrderItemById(SalesOrderItem salesOrderItem);
+    /**
+     * 查询更正信息集合
+     * @param orderId
+     * @return
+     */
+    List<OrderCorrectInfo> listOrderCorrectInfo(Integer orderId);
 }

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

@@ -1444,5 +1444,113 @@
         WHERE  item_order_id = #{salesId}
     </select>
 
+    <insert id="addCorrectInfo" parameterType="OrderCorrectInfo"  keyProperty="correctId" useGeneratedKeys="true" >
+        INSERT INTO tb_rst_order_correct_info
+        (
+        correct_type,
+        item_order_id,
+        replacement_order_id,
+        correct_desc,
+        admin_id,
+        correct_create_date
+        )
+        VALUES
+        (
+        #{correctType},
+        #{itemOrderId},
+        #{replacementOrderId},
+        #{correctDesc},
+        #{adminId},
+        NOW()
+        )
+    </insert>
+
+    <insert id="addCorrectItem" parameterType="OrderCorrectItem">
+      INSERT INTO tb_rst_order_correct_item
+      ( correct_id,
+        item_product_name,
+        item_product_color,
+        order_item_id,
+        old_num,
+        correct_num,
+        item_create_date
+        )
+      VALUES
+      ( #{correctId},
+        #{itemProductName},
+        #{itemProductColor},
+        #{orderItemId},
+        #{oldNum},
+        #{correctNum},
+        NOW()
+      )
+    </insert>
+    <resultMap id="OrderCorrectMap" type="OrderCorrectInfo" >
+        <id column="correct_id" property="correctId" jdbcType="INTEGER" />
+        <result column="correct_type" property="correctType" jdbcType="INTEGER" />
+        <result column="item_order_id" property="itemOrderId" jdbcType="INTEGER" />
+        <result column="replacement_order_id" property="replacementOrderId" jdbcType="INTEGER" />
+        <result column="correct_desc" property="correctDesc" jdbcType="VARCHAR" />
+        <result column="admin_id" property="adminId" jdbcType="INTEGER" />
+        <result column="correct_create_date" property="correctCreateDate" jdbcType="TIMESTAMP" />
+        <result column="admin_name" property="adminName" jdbcType="VARCHAR" />
+        <collection property="orderCorrectItemList" column="correct_id" ofType="OrderCorrectItem" select="listOrderCorrectItem"/>
+    </resultMap>
+    <select id="getOrderCorrectInfo" parameterType="Integer" resultMap="OrderCorrectMap">
+        select
+        ci.correct_id,
+        ci.correct_type,
+        ci.item_order_id,
+        ci.replacement_order_id,
+        ci.correct_desc,
+        ci.admin_id,
+        ci.correct_create_date,
+        sa.admin_name
+        from
+        tb_rst_order_correct_info ci
+        left JOIN tb_rst_sys_admin sa on ci.admin_id = sa.admin_id
+        WHERE
+        ci.correct_id = #{correctId}
+    </select>
+    <select id="listOrderCorrectInfo" parameterType="Integer" resultMap="OrderCorrectMap">
+        select
+        ci.correct_id,
+        ci.correct_type,
+        ci.item_order_id,
+        ci.replacement_order_id,
+        ci.correct_desc,
+        ci.admin_id,
+        ci.correct_create_date,
+        sa.admin_name
+        from
+        tb_rst_order_correct_info ci
+        left JOIN tb_rst_sys_admin sa on ci.admin_id = sa.admin_id
+        WHERE
+        ci.item_order_id = #{orderId}
+    </select>
+
+    <select id="listOrderCorrectItem" parameterType="Integer" resultType="OrderCorrectItem">
+        SELECT
+        correct_item_id,
+        correct_id,
+        item_product_name,
+        item_product_color,
+        order_item_id,
+        old_num,
+        correct_num,
+        item_create_date
+        from tb_rst_order_correct_item
+        WHERE correct_id = #{correctId}
+    </select>
 
+    <select id="getSalesOrderItem" parameterType="Integer" resultType="SalesOrderItem">
+        select * from tb_rst_sales_order_item where item_id = #{itemId}
+    </select>
+
+    <update id="updateOrderItemById" parameterType="SalesOrderItem">
+        UPDATE tb_rst_sales_order_item
+        set
+        item_num = #{itemNum}
+        where item_id = #{itemId}
+    </update>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.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.StoreInfo;
 import com.iamberry.rst.core.order.OrderBatch;
+import com.iamberry.rst.core.order.OrderCorrectInfo;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -25,6 +26,7 @@ import net.sf.json.JSONArray;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.xpath.operations.Bool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,6 +141,9 @@ public class AdminSalesOrderController {
         //批量获取订单项信息
         List<SalesOrderItem> itemList = salesOrderService.listSalesOrderItem(item);
         order.setSalesOrderItemList(itemList);
+        //查询更正信息
+        List<OrderCorrectInfo> listOrderCorrectInfo = salesOrderService.listOrderCorrectInfo(order.getSalesId());
+        mv.addObject("listOrderCorrectInfo",listOrderCorrectInfo);
         mv.addObject("order",order);
         return mv;
     }
@@ -1122,7 +1127,7 @@ public class AdminSalesOrderController {
         return new ModelAndView("order/salesOrder/update_order_remark").addObject("salesOrder", salesOrder);
     }
     /**
-     * 进入修改订单备注页面
+     * 修改订单备注
      * @return
      */
     @ResponseBody
@@ -1141,7 +1146,7 @@ public class AdminSalesOrderController {
      *
      * @return
      */
-    @RequiresPermissions("customer:add:customer")
+    @RequiresPermissions("salesOrder:add:manual")
     @RequestMapping(value = "/select_correct_order")
     public ModelAndView selectOrder(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("order/salesOrder/order_correct_list");
@@ -1153,11 +1158,11 @@ public class AdminSalesOrderController {
         return mv;
     }
     /**
-     * 搜索订单列表弹出框
+     * 进入更正订单页面
      *
      * @return
      */
-    @RequiresPermissions("customer:add:customer")
+    @RequiresPermissions("salesOrder:add:manual")
     @RequestMapping(value = "/to_acorrect_order")
     public ModelAndView to_acorrect_order(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("order/salesOrder/correct_order");
@@ -1182,5 +1187,18 @@ public class AdminSalesOrderController {
         return mv;
     }
 
+    @RequiresPermissions("salesOrder:add:manual")
+    @RequestMapping(value = "/correct_order")
+    @ResponseBody
+    public ResponseJson correct_order(HttpServletRequest request,OrderCorrectInfo orderCorrectInfo,String arrayItem){
+        if(orderCorrectInfo == null){
+            return ResponseJson.FAILURE;
+        }
+        Admin admin = AdminUtils.getLoginAdmin();
+        if(!salesOrderService.addCorrectInfo(orderCorrectInfo,arrayItem,admin)){
+            return ResponseJson.getFAILURE();
+        }
+        return ResponseJson.getSUCCESS();
+    }
 
 }

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

@@ -66,28 +66,28 @@
                 <label class="form-label col-1 col-sm-1">更正类型：</label>
                 <div class="formControls col-8 col-sm-8 skin-minimal" style="">
                     <div class="radio-box">
-                        <input type="radio" id="tel-1" name="correctType" value="1" onclick="son()" >
+                        <input type="radio" id="tel-1" name="correctType"  value="1" checked>
                         <label for="tel-1">下错订单</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-2" name="correctType" value="2" onclick="son()" checked>
+                        <input type="radio" id="tel-2" name="correctType" value="2" >
                         <label for="tel-2">订单漏发</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-3" name="correctType" value="3" onclick="son()" >
+                        <input type="radio" id="tel-3" name="correctType" value="3" >
                         <label for="tel-3">其它原因</label>
                     <#--<input type="text" class="input-text trim_input customerSourceType_text_4"  value="" style="width: 100px;">-->
                     </div>
                 </div>
             </div>
-            <div class="row cl" style="">
+            <div class="row cl" style=""  id="replacementDiv">
                 <label class="form-label col-1 col-sm-1">补发订单：</label>
                 <div class="formControls col-2 col-sm-2">
                     <input type="button" style="width: 100%;" class="btn btn-primary" id="selectOrder" value="选择补发订单" >
                 </div>
             </div>
 
-            <div class="row cl" id="salesCustomer">
+            <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2" style="color: #c00;">
                     <span id="salesCustomerIdHtml"></span>
@@ -119,9 +119,11 @@
                             <#list order.salesOrderItemList as item>
                                 <tr class="text-c">
                                     <input type="hidden" class="color_id" id="" value="${item.itemColorId}">
+                                    <input type="hidden" class="color_name" id="" value="${item.itemProductName}">
+                                    <input type="hidden" class="color_color" id="" value="${item.itemProductColor}">
                                     <input type="hidden" class="color_price" id="" value="${item.itemProductPrice}">
-                                    <input type="hidden" class="color_Price" id="" value="${item.itemProductPrice}">
                                     <input type="hidden" class="color_discount" id="" value="${item.itemProductDiscount}">
+                                    <input type="hidden" class="item_id" id="" value="${item.itemId}">
                                     <td>${item.itemProductName}</td>
                                     <td>${item.itemProductColor}</td>
                                     <td>${item.itemProductPrice/100}</td>
@@ -134,8 +136,8 @@
                                                id=""
                                                value="${item.itemNum}"
                                                placeholder="产品数量"
-                                               onkeyup="keyFun($(this),999,1)"
-                                               onpaste="keyFun($(this),999,1)">
+                                               onkeyup="keyFun($(this),999,0)"
+                                               onpaste="keyFun($(this),999,0)">
                                     </td>
                                 </tr>
                             </#list>
@@ -162,6 +164,8 @@
 
             <div class="row cl">
                 <div class="col-2 col-sm-2 col-offset-3">
+                    <input type="hidden" name="salesId" id="salesId" value="${order.salesId}">
+                    <input type="hidden" name="arrayItem" id="arrayItem" value="">
                     <button class="btn btn-block btn-primary size-XL" type="button" onclick="correct_order();">确认录入</button>
                 </div>
             </div>
@@ -180,21 +184,110 @@
 
 <script type="text/javascript">
 
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+        $("#replacementDiv").hide();
+        $("#tel-1").on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
+            $("#replacementDiv").hide();
+            $("#replacementOrderId").val("");
+        });
 
-        initCheck();
+        $("#tel-2").on('ifChecked', function(event){
+            $("#replacementDiv").show();
+        });
 
-        $("input[name='correctType']").change(function (){
-            alert("11");
+        $("#tel-3").on('ifChecked', function(event){
+            $("#replacementDiv").hide();
+            $("#replacementOrderId").val("");
         });
-function son() {
-    alert("2");
-}
 
+    });
     /**
      * 确认录入
      **/
     function correct_order() {
+        //封装订单项数据
+        var array = new Array();
+        var nums = 0;
+        $("#add_product").find("tr").each(function () {
+            var item_id = $(this).find(".item_id").val();
+            var color_id = $(this).find(".color_id").val();
+            var color_name = $(this).find(".color_name").val();
+            var color_color = $(this).find(".color_color").val();
+            var color_price = parseInt($(this).find(".color_price").val()/100);
+            var color_discount = parseInt($(this).find(".color_discount").val()/100);
+            var item_num = parseInt($(this).find(".item-num").val());
+            nums = parseInt(nums + item_num);
+            var item = new Object();
+            item.itemId = item_id;
+            item.itemColorId = color_id;
+            item.itemProductName = color_name;
+            item.itemProductColor = color_color;
+            item.itemProductPrice = color_price;
+            item.itemProductDiscount = color_discount;
+            item.itemNum = item_num;
+            array.push(item);
+        });
+        $("#arrayItem").val(JSON.stringify(array));
         //封装数据
+        var salesId = $("#salesId").val();
+        var correctType=$('input:radio[name="correctType"]:checked').val();
+        var replacementOrderId = $("#replacementOrderId").val();
+        var correctDesc = $("#correctDesc").val();
+        var arrayItem = $("#arrayItem").val();
+        if(salesId == null || salesId == ""){
+            layer.alert("参数有误，请刷新页面重试");
+            return;
+        }
+        if(correctType == null || correctType == ""){
+            layer.alert("参数有误，请刷新页面重试");
+            return;
+        }
+        if(correctType == 2){
+            if(replacementOrderId == null || replacementOrderId == ""){
+                layer.alert("更正类型为漏发时需要选择补发订单");
+                return;
+            }
+        }
+
+        if(arrayItem == null || arrayItem == ""){
+            layer.alert("参数有误，请刷新页面重试");
+            return;
+        }
+        if(correctDesc != null){
+            if(correctDesc.length > 100){
+                layer.alert("备注长度过长");
+                return;
+            }
+        }
+        if(nums <= 0){
+            layer.alert("订单项总数量不能为0");
+            return;
+        }
+        $.ajax({
+            type: "POST",
+            data: { itemOrderId : salesId,
+                    correctType : correctType,
+                    replacementOrderId : replacementOrderId,
+                    correctDesc : correctDesc,
+                    arrayItem : arrayItem},
+            url: url_path +"/admin/salesOrder/correct_order",
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.alert("更正订单成功！",function () {
+                        history.go(-1);
+                    });
+
+                }else{
+                    layer.alert("更正订单失败！");
+                }
+            }
+        });
+
     }
 
     /*搜索订单事件*/

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

@@ -292,6 +292,59 @@
             </tr>
             </thead>
         </table>
+        <#if listOrderCorrectInfo?? &&  (listOrderCorrectInfo?size > 0) >
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">
+                        更正信息
+                    </div>
+                </label>
+                <div class="formControls col-10 col-sm-10">
+                </div>
+            </div>
+
+            <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+                <tr class="text-c">
+                    <th>更正人</th>
+                    <th>类型</th>
+                    <th>更正时间</th>
+                    <th>更正产品</th>
+                    <th>备注</th>
+                </tr>
+            <#if listOrderCorrectInfo?? &&  (listOrderCorrectInfo?size > 0) >
+                <#list listOrderCorrectInfo as info>
+                    <tr class="text-c">
+                        <td>${info.adminName!''}</td>
+                        <td><#if info.correctType == 1>下错订单</#if>
+                            <#if info.correctType == 2>订单漏发</#if>
+                            <#if info.correctType == 3>其它原因所属订单</#if></td>
+                        <td>
+                            ${(info.correctCreateDate?string("yy-MM-dd"))!''}</br>
+                            ${(info.correctCreateDate?string("HH:mm:ss"))!''}</td>
+                        <td>
+                            <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+                                <tr class="text-c">
+                                    <th>产品名称</th>
+                                    <th>原数量</th>
+                                    <th>变更后数量</th>
+                                </tr>
+                                <#if info.orderCorrectItemList?? &&  (info.orderCorrectItemList?size > 0) >
+                                    <#list info.orderCorrectItemList as item>
+                                        <tr class="text-c">
+                                            <td>${item.itemProductName!''}(${item.itemProductColor!''})</td>
+                                            <td>${item.oldNum!''}</td>
+                                            <td>${item.correctNum!''}</td>
+                                        </tr>
+                                    </#list>
+                                </#if>
+                            </table>
+                        </td>
+                        <td>${info.correctDesc}</td>
+                    </tr>
+                </#list>
+            </#if>
+            </table>
+        </#if>
          <button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="javascript :history.back(-1);" class="my-btn-search"><<返回</button>
     </form>
     </div>

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

@@ -265,7 +265,7 @@
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="更正订单"
                            onclick="acorrect_order(${order.salesId!''});">
-                            <i class="Hui-iconfont">更正订单</i>
+                            <i class="Hui-iconfont">&#xe6f7;</i>
                         </a>
                     </td>
                 </tr>