仓储管理

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

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 1.1.57	客诉-签收表
@@ -36,6 +38,10 @@ public class ComplaintSignclosedInfo implements Serializable {
     private Date signclosedCreateTime;//创建时间
     private Date signclosedUpdateTime;//修改时间
 
+    private List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList = new ArrayList<AwaitingSignclosedProductInfo>();	//待签收实体类
+    private List<SignclosedProductInfo> signclosedProductInfoList = new ArrayList<SignclosedProductInfo>();	//签收实体类
+    private String provincesName;//寄件地址（省）
+    private String cityName;//寄件地址（市）
     public Integer getSignclosedId() {
         return signclosedId;
     }
@@ -227,4 +233,36 @@ public class ComplaintSignclosedInfo implements Serializable {
     public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
         this.signclosedUpdateTime = signclosedUpdateTime;
     }
+
+    public List<AwaitingSignclosedProductInfo> getAwaitingSignclosedProductInfoList() {
+        return awaitingSignclosedProductInfoList;
+    }
+
+    public void setAwaitingSignclosedProductInfoList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList) {
+        this.awaitingSignclosedProductInfoList = awaitingSignclosedProductInfoList;
+    }
+
+    public List<SignclosedProductInfo> getSignclosedProductInfoList() {
+        return signclosedProductInfoList;
+    }
+
+    public void setSignclosedProductInfoList(List<SignclosedProductInfo> signclosedProductInfoList) {
+        this.signclosedProductInfoList = signclosedProductInfoList;
+    }
+
+    public String getProvincesName() {
+        return provincesName;
+    }
+
+    public void setProvincesName(String provincesName) {
+        this.provincesName = provincesName;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
 }

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

@@ -1,6 +1,11 @@
 package com.iamberry.rst.faces.cm;
 
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
 import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+import java.util.List;
 
 /**
  * 客诉-签收表Service
@@ -27,4 +32,10 @@ public interface ComplaintSignclosedInfoService {
      * @return
      */
     int updateUrgedNumById(ComplaintSignclosedInfo complaintSignclosedInfo);
+
+    /**
+     * 查询多个签收记录
+     * @return
+     */
+    PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest);
 }

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

@@ -1,15 +1,22 @@
 package com.iamberry.rst.service.cm;
 
 
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
 import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
 import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
 import com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
+import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedInfoService {
     @Autowired
@@ -35,4 +42,13 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     public int updateUrgedNumById(ComplaintSignclosedInfo complaintSignclosedInfo) {
         return complaintSignclosedInfoMapper.updateUrgedNumById(complaintSignclosedInfo);
     }
+
+    @Override
+    public PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ComplaintSignclosedInfo> signclosedList = complaintSignclosedInfoMapper.listSignclosed(pageRequest.getData());
+        return PageUtil.getPage(signclosedList);
+
+    }
+
 }

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

@@ -1,6 +1,9 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+
+import java.util.List;
+
 /**
  * 客诉-签收表mapper
  */
@@ -27,4 +30,10 @@ public interface ComplaintSignclosedInfoMapper {
      */
     int updateUrgedNumById(ComplaintSignclosedInfo complaintSignclosedInfo);
 
+    /**
+     * 查询多个签收记录
+     * @return
+     */
+    List<ComplaintSignclosedInfo> listSignclosed(ComplaintSignclosedInfo record);
+
 }

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

@@ -41,6 +41,134 @@
     from tb_rst_complaint_signclosed
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </select>
+
+  <resultMap id="complaintSignclosedInfoMap" type="ComplaintSignclosedInfo">
+    <id property="signclosed_id" column="signclosedId"/>
+    <result property="signclosed_type" column="signclosedType"/>
+    <result property="signclosed_type_name" column="signclosedTypeName"/>
+    <result property="machine_no" column="machineNo"/>
+    <result property="signclosed_logistics" column="signclosedLogistics"/>
+    <result property="signclosed_logistics_number" column="signclosedLogisticsNumber"/>
+    <result property="signclosed_send_name" column="signclosedSendName"/>
+    <result property="signclosed_send_tel" column="signclosedSendTel"/>
+    <result property="signclosed_addr_provinces" column="signclosedAddrProvinces"/>
+    <result property="signclosed_addr_city" column="signclosedAddrCity"/>
+    <result property="signclosed_is_fittings" column="signclosedIsFittings"/>
+    <result property="signclosed_date" column="signclosedDate"/>
+    <result property="signclosed_is_quality" column="signclosedIsQuality"/>
+    <result property="signclosed_is_into" column="signclosedIsInto"/>
+    <result property="signclosed_state" column="signclosedState"/>
+    <result property="signclosed_objects_state" column="signclosedObjectsState"/>
+    <result property="signclosed_customer_id" column="signclosedCustomerId"/>
+    <result property="signclosed_urged_num" column="signclosedUrgedNum"/>
+    <result property="old_efast_id" column="oldEfastId"/>
+    <result property="new_efast_id" column="newEfastId"/>
+    <result property="signclosed_customer_desc" column="signclosedCustomerDesc"/>
+    <result property="signclosed_desc" column="signclosedDesc"/>
+    <result property="signclosed_create_time" column="signclosedCreateTime"/>
+    <result property="signclosed_update_time" column="signclosedUpdateTime"/>
+    <collection property="awaitingSignclosedProductInfoList" column="SIGNCLOSED_ID" ofType="AwaitingSignclosedProductInfo" select="listAwaitingSignclosedById"/>
+    <collection property="signclosedProductInfoList" column="SIGNCLOSED_ID" ofType="SignclosedProductInfo" select="listSignclosedById"/>
+  </resultMap>
+  <select id="listAwaitingSignclosedById" resultType="AwaitingSignclosedProductInfo" parameterType="String" >
+    select
+    sp.product_id productId,
+    sp.signclosed_id signclosedId,
+    sp.product_name productName,
+    sp.product_num productNum,
+    sp.signclosed_create_time signclosedCreateTime,
+    sp.signclosed_update_time signclosedUpdateTime,
+    sp.signclosed_product_type signclosedProductType,
+    sp.signclosed_product_id signclosedProductId,
+    sp.signclosed_product_color signclosedProductColor,
+    pc.color_name colorName,
+    pi.product_number productNumber
+    from
+    tb_rst_complaint_awaiting_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where signclosed_id = #{signclosedId}
+  </select>
+
+  <select id="listSignclosedById" resultType="SignclosedProductInfo" parameterType="String" >
+    select
+    sp.product_id productId,
+    sp.signclosed_id signclosedId,
+    sp.product_name productName,
+    sp.product_num productNum,
+    sp.signclosed_create_time signclosedCreateTime,
+    sp.signclosed_update_time signclosedUpdateTime,
+    sp.signclosed_product_type signclosedProductType,
+    sp.signclosed_product_id signclosedProductId,
+    sp.signclosed_product_color signclosedProductColor,
+    pc.color_name colorName,
+    pi.product_number productNumber
+    from
+    tb_rst_complaint_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where signclosed_id = #{signclosedId}
+  </select>
+  <select id="listSignclosed" resultMap="complaintSignclosedInfoMap" parameterType="ComplaintSignclosedInfo" >
+    SELECT
+      cs.signclosed_id,
+      cs.signclosed_type,
+      cs.signclosed_type_name,
+      cs.machine_no,
+      cs.signclosed_logistics,
+      cs.signclosed_logistics_number,
+      cs.signclosed_send_name,
+      cs.signclosed_send_tel,
+      cs.signclosed_addr_provinces,
+      cs.signclosed_addr_city,
+      cs.signclosed_is_fittings,
+      cs.signclosed_date,
+      cs.signclosed_is_quality,
+      cs.signclosed_is_into,
+      cs.signclosed_state,
+      cs.signclosed_objects_state,
+      cs.signclosed_customer_id,
+      cs.signclosed_urged_num,
+      cs.old_efast_id,
+      cs.new_efast_id,
+      cs.signclosed_customer_desc,
+      cs.signclosed_desc,
+      cs.signclosed_create_time,
+      cs.signclosed_update_time,
+      ap.province provincesName,
+      ac.city cityName
+    FROM
+	tb_rst_complaint_signclosed cs
+	LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
+	LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
+    <where>
+      <if test="signclosedSendName != null and signclosedSendName != ''" >
+        cs.signclosed_send_name = #{signclosedSendName}
+      </if>
+      <if test="signclosedSendTel != null and signclosedSendTel != ''" >
+        AND cs.signclosed_send_tel = #{signclosedSendTel}
+      </if>
+      <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
+        AND cs.signclosed_logistics_number = #{signclosedLogisticsNumber}
+      </if>
+      <if test="signclosedType != null and signclosedType != ''" >
+        AND cs.signclosed_type = #{signclosedType}
+      </if>
+      <if test="signclosedObjectsState != null and signclosedObjectsState != ''" >
+        AND cs.signclosed_objects_state = #{signclosedObjectsState}
+      </if>
+      <if test="signclosedState != null and signclosedState != ''" >
+        AND cs.signclosed_state = #{signclosedState}
+      </if>
+      <if test="signclosedIsInto != null and signclosedIsInto != ''" >
+        AND cs.signclosed_is_into = #{signclosedIsInto}
+      </if>
+      <if test="signclosedIsQuality != null and signclosedIsQuality != ''" >
+        AND cs.signclosed_is_quality = #{signclosedIsQuality}
+      </if>
+    </where>
+  </select>
+
   <insert id="insert" parameterType="ComplaintSignclosedInfo" >
     insert into tb_rst_complaint_signclosed (signclosed_id, signclosed_type, signclosed_type_name, 
       machine_no, signclosed_logistics, signclosed_logistics_number, 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -7,7 +7,9 @@ import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsDevice;
+import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
+import com.iamberry.rst.faces.cm.ComplaintSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.FittingsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
@@ -46,9 +48,9 @@ public class AdminDetectController {
     @Autowired
     private ComplaintSignclosedInfoMapper complaintSignclosedInfoMapper;
     @Autowired
-    private ComplaintSignclosedProductInfoMapper signclosedProductInfoMapper;
+    private ComplaintSignclosedProductInfoService signclosedProductInfoService;
     @Autowired
-    private AwaitingSignclosedProductMapper awaitingSignclosedProductMapper;
+    private AwaitingSignclosedProductInfoService awaitingSignclosedProductService;
     /**
      * 跳转到添加检测记录页面
      *
@@ -328,9 +330,9 @@ public class AdminDetectController {
         ComplaintSignclosedInfo complaintSignclosedInfo = complaintSignclosedInfoMapper.getSignclosedById(Integer.valueOf(signclosedId));
 
         if(complaintSignclosedInfo.getSignclosedState() == 1){//如果已签收。查询签收表所有产品 反之查询待签收表
-            signclosedProductInfo = signclosedProductInfoMapper.listSignclosedById(complaintSignclosedInfo.getSignclosedId());
+            signclosedProductInfo = signclosedProductInfoService.listSignclosedById(complaintSignclosedInfo.getSignclosedId());
         }else{
-            awaitingSignclosedProductInfo = awaitingSignclosedProductMapper.listByPrimaryId(complaintSignclosedInfo.getSignclosedId());
+            awaitingSignclosedProductInfo = awaitingSignclosedProductService.listByPrimaryId(complaintSignclosedInfo.getSignclosedId());
         }
 
         mv.addObject("signclosedProductInfo",signclosedProductInfo == null ? awaitingSignclosedProductInfo :signclosedProductInfo);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -0,0 +1,125 @@
+package com.iamberry.rst.controllers.cm;
+
+import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.core.order.Product;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
+import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.faces.cm.FittingsInfoService;
+import com.iamberry.rst.faces.product.ProductService;
+import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper;
+import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ * Created by wxm on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/signclosed")
+public class AdminSignclosedController {
+
+   // private
+    @Autowired
+    private ComplaintDetectInfoService complaintDetectInfoService;
+    @Autowired
+    private ProductService productService;
+    @Autowired
+    private FittingsInfoService fittingsInfoService;
+    @Autowired
+    private ComplaintSignclosedInfoService complaintSignclosedInfoService;
+    /**
+     * 跳转到添加检测记录页面
+     *
+     * @return
+     */
+    @RequiresPermissions("detect:add:detect")
+    @RequestMapping(value = "/to_add_detect")
+    public ModelAndView toAddDetect(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/add_detect");
+        //获取所有产品
+        List<Product> productList = productService.listProduce();
+        mv.addObject("productList",productList);
+        /*//获取所有配件
+        List<FittingsInfo> listFittings = fittingsInfoService.listFittings();
+        mv.addObject("listFittings",listFittings);*/
+        return mv;
+    }
+
+
+
+    /**
+     * 客诉 - 查询签收/仓储列表
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("signclosed:select:signclosed")
+    @RequestMapping("/select_signclosed_list")
+    public ModelAndView selectDetectList(HttpServletRequest request,
+                                        @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
+                                        @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
+                                        @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
+                                         ComplaintSignclosedInfo signclosedInfo) {
+
+        ModelAndView mv = new ModelAndView("cm/signclosed/signclosed_list");
+        StringBuilder url = new StringBuilder("/admin/signclosed/select_signclosed_list?pageSize=" + pageSize);
+// 请求参数
+        /*if (signclosedInfo.getSignclosedType() != null) {
+            url.append("&signclosedType=").append(signclosedInfo.getSignclosedType());
+            mv.addObject("signclosedType",signclosedInfo.getSignclosedType());
+        }
+        if (StringUtils.isNotEmpty(signclosedInfo.getSignclosedSendName())) {
+            url.append("&signclosedInfo=").append(signclosedInfo.getSignclosedSendName());
+            mv.addObject("signclosedInfo",signclosedInfo.getSignclosedSendName());
+        }
+        if (StringUtils.isNotEmpty(signclosedInfo.getSignclosedSendTel())) {
+            url.append("&signclosedSendTel=").append(signclosedInfo.getSignclosedSendTel());
+            mv.addObject("signclosedSendTel",signclosedInfo.getSignclosedSendTel());
+        }
+        if (StringUtils.isNotEmpty(signclosedInfo.getSignclosedLogisticsNumber())) {
+            url.append("&signclosedLogisticsNumber=").append(signclosedInfo.getSignclosedLogisticsNumber());
+            mv.addObject("signclosedLogisticsNumber",signclosedInfo.getSignclosedLogisticsNumber());
+        }
+        if (signclosedInfo.getSignclosedObjectsState() != null) {
+            url.append("&signclosedObjectsState=").append(signclosedInfo.getSignclosedObjectsState());
+            mv.addObject("signclosedObjectsState",signclosedInfo.getSignclosedObjectsState());
+        }*/
+        // 封装请求数据
+        PageRequest<ComplaintSignclosedInfo> pageRequest = new PageRequest<>(signclosedInfo, pageNO, pageSize, pageTotal == null);
+        // 查询订单列表
+        PagedResult<ComplaintSignclosedInfo> result = complaintSignclosedInfoService.listSignclosed(pageRequest);
+        long total = 0;
+        if (pageTotal == null) {
+            total = result.getPages();
+        } else {
+            total = pageTotal;
+            result.setPages(total);
+        }
+
+       /* url.append("&pageTotal=").append(total).append("&pageNO=");
+        mv.addObject("page", result);
+        mv.addObject("url", url.toString());*/
+        StitchAttrUtil.setModelAndView(signclosedInfo, mv, "/admin/signclosed/select_signclosed_list", result);
+        return mv;
+    }
+
+
+}
+

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+<#include "/base/list_base.ftl">
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;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;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #e2f6ff;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/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(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> RST管理
+    <span class="c-gray en">&gt;</span> 仓储列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <div class="text-c">
+        <form name="form1" action="${path}/admin/signclosed/select_signclosed_list" method="post">
+            <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_detect('添加品质检测','${path}/admin/detect/to_add_detect','570','450');">新建签收</button>
+            <input class="my-input" style="width: 70px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
+            <input class="my-input" style="width: 70px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
+            <input class="my-input" style="width: 70px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
+            <select class="my-select" name="signclosedType" style="height: 30px;width: 150px">
+                <option value ="">签收类型</option>
+                <option value ="1" <#if signclosedType??><#if signclosedType == 1>selected="selected"</#if></#if>>客诉寄回</option>
+                <option value ="2" <#if signclosedType??><#if signclosedType == 2>selected="selected"</#if></#if>>代理商退货</option>
+                <option value ="3" <#if signclosedType??><#if signclosedType == 3>selected="selected"</#if></#if>>其它</option>
+            </select>
+            <select class="my-select" name="signclosedObjectsState" style="height: 30px;width: 150px">
+                <option value ="">物件状态</option>
+                <option value ="1" <#if signclosedObjectsState??><#if signclosedObjectsState == 1>selected="selected"</#if></#if>>正常签收</option>
+                <option value ="2" <#if signclosedObjectsState??><#if signclosedObjectsState == 2>selected="selected"</#if></#if>>物件不对</option>
+            </select>
+            <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
+        </form>
+    </div>
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="100">签收类型</th>
+                <th width="100">物流</th>
+                <th width="90">寄件人姓名</th>
+                <th width="100">寄件人电话</th>
+                <th width="450">退换产品</th>
+                <th width="450">签收产品</th>
+                <th width="130">退货地区</th>
+                <th width="100">是否少配件</th>
+                <th width="150">售后原因</th>
+                <th width="150">客服备注</th>
+                <th width="150">返厂日期</th>
+                <th width="100">处理状态</th>
+                <th width="120">是否转入QC</th>
+                <th width="130">物件状态</th>
+                <th width="100">备注</th>
+                <th width="50">操作</th>
+            </tr>
+            </thead>
+            <tbody id="listid">
+            <#if (page.dataList?size > 0)>
+                <#list page.dataList as signclosed>
+                <tr>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedType == 1>
+                            客诉寄回
+                        </#if>
+                        <#if signclosed.signclosedType == 2>
+                            代理商退货
+                        </#if>
+                        <#if signclosed.signclosedType == 3>
+                            其它
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">${signclosed.signclosedLogistics!}${signclosed.signclosedLogisticsNumber!}</td>
+                    <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
+                    <td class="text-c" width="100">${signclosed.signclosedSendTel!}</td>
+                    <td class="text-c" width="100">
+                        <div class="update-parts">
+                        <#if signclosed.awaitingSignclosedProductInfoList??>
+                            <#if (signclosed.awaitingSignclosedProductInfoList?size > 0)>
+                                <#list signclosed.awaitingSignclosedProductInfoList as info>
+                                    <#if info.signclosedProductType == 1 >
+                                        <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                    <#else >
+                                        <span>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                    </#if>
+                                </#list>
+                            <#else >
+                                暂无数据！
+                            </#if>
+                        <#else >
+                            暂无数据！
+                        </#if>
+                        </div>
+                    </td>
+                    <td class="text-c" width="100">
+                        <div class="update-parts">
+                        <#if signclosed.signclosedProductInfoList??>
+                            <#if (signclosed.signclosedProductInfoList?size > 0)>
+                                <#list signclosed.signclosedProductInfoList as info>
+                                    <#if info.signclosedProductType == 1 >
+                                        <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                    <#else >
+                                        <span>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                    </#if>
+                                </#list>
+                            <#else >
+                                暂无数据！
+                            </#if>
+                        <#else >
+                            暂无数据！
+                        </#if>
+                        </div>
+                    </td>
+                    <td class="text-c" width="100">
+                    <#if signclosed.provincesName??>
+                        <#if signclosed.provincesName == "sto">
+                            申通快递
+                        <#elseif signclosed.provincesName == "yto">
+                            圆通快递
+                        <#elseif signclosed.provincesName == "zto">
+                            中通速递
+                        <#elseif signclosed.provincesName == "sf">
+                            顺丰快递
+                        <#elseif signclosed.provincesName == "ems">
+                            邮政EMS
+                        <#elseif signclosed.provincesName == "eyb">
+                            E邮宝
+                        <#elseif signclosed.provincesName == "zjs">
+                            宅急送
+                        <#elseif signclosed.provincesName == "yunda">
+                            韵达快递
+                        <#elseif signclosed.provincesName == "cces">
+                            cces快递
+                        <#elseif signclosed.provincesName == "pick">
+                            上门提货
+                        <#elseif signclosed.provincesName == "htky">
+                            汇通快递
+                        <#elseif signclosed.provincesName == "ttkdex">
+                            天天快递
+                        <#elseif signclosed.provincesName == "stars">
+                            星晨急便
+                        <#elseif signclosed.provincesName == "jd">
+                            京东快递
+                        <#elseif signclosed.provincesName == "01">
+                            其他
+                        <#elseif signclosed.provincesName == "02">
+                            上门送货
+                        <#elseif signclosed.provincesName == "longbanwuliu">
+                            龙邦快递
+                        </#if>
+                    </#if>
+                    ${signclosed.provincesName!}-${signclosed.cityName!}</td>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedIsFittings == 1>
+                            缺少
+                        <#else>
+                            不缺少
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">售后原因暂无</td>
+                    <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>
+                    <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedState == 1>
+                            已签收
+                        <#else>
+                            未签收
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedIsInto == 1>
+                            已转入品检
+                        <#else>
+                            未转入品检
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedObjectsState == 1>
+                            正常签收
+                        <#else>
+                            物件不对
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">${signclosed.signclosedDesc!}</td>
+                    <!-- 遍历操作 -->
+                    <td class="td-manage text-c">
+
+                    </td>
+                </tr>
+                </#list>
+            <#else >
+            <tr><td class="td-manage text-c" colspan = "16">暂时没有仓储信息</td></tr>
+            </#if>
+            </tbody>
+        </table>
+    </div>
+</div>
+<div style="padding-top: 10px;"></div>
+<#include "/base/page_util.ftl">
+
+<script type="text/javascript">
+    /*添加*/
+    function add_detect(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+    /*修改备注*/
+    function add_remark(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+    /*转入生产*/
+    function update_info(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -140,3 +140,63 @@ function listDistrict(cityId,districtName){
     });
     return district;
 }
+/**物流名称替换**/
+function replace(code) {
+    var name = null;
+    switch (billName){
+        case "sto":
+            name= "申通快递";
+            break;
+        case "yto":
+            name= "圆通快递";
+            break;
+        case "zto":
+            name= "中通速递";
+            break;
+        case "sf":
+            name= "顺丰快递";
+            break;
+        case "ems":
+            name= "邮政EMS";
+            break;
+        case "eyb":
+            name= "E邮宝";
+            break;
+        case "zjs":
+            name= "宅急送";
+            break;
+        case "yunda":
+            name= "韵达快递";
+            break;
+        case "cces":
+            name= "cces快递";
+            break;
+        case "pick":
+            name= "上门提货";
+            break;
+        case "htky":
+            name= "汇通快递";
+            break;
+        case "ttkdex":
+            name= "天天快递";
+            break;
+        case "stars":
+            name= "星晨急便";
+            break;
+        case "jd":
+            name= "京东快递";
+            break;
+        case "01":
+            name= "其他";
+            break;
+        case "02":
+            name= "上门送货";
+            break;
+        case "longbanwuliu":
+            name= "龙邦快递";
+            break;
+        default:
+            break;
+    }
+    return name;
+}