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

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

@@ -16,7 +16,7 @@ public class ComplaintSignclosedInfo implements Serializable {
     private Integer signclosedId;//id
     private Integer signclosedType;//签收类型
     private String signclosedTypeName;//签收类型名称
-    private String machineNo;//机器编号
+
     private String signclosedLogistics;//寄回物流
     private String signclosedLogisticsNumber;//物流单号
     private String signclosedSendName;//寄件人姓名
@@ -66,14 +66,6 @@ public class ComplaintSignclosedInfo implements Serializable {
         this.signclosedTypeName = signclosedTypeName;
     }
 
-    public String getMachineNo() {
-        return machineNo;
-    }
-
-    public void setMachineNo(String machineNo) {
-        this.machineNo = machineNo;
-    }
-
     public String getSignclosedLogistics() {
         return signclosedLogistics;
     }

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

@@ -20,7 +20,7 @@ public class SignclosedProductInfo implements Serializable {
     private Integer signclosedProductType;//1 产品  2配件
     private Integer signclosedProductId;//关联产品id  （根据产品类型判断）
     private Integer signclosedProductColor;//关联产品颜色id
-
+    private String machineNo;//机器编号
 
     private String colorName;//颜色名称
     private String productNumber;//产品型号
@@ -112,4 +112,12 @@ public class SignclosedProductInfo implements Serializable {
     public void setProductNumber(String productNumber) {
         this.productNumber = productNumber;
     }
+
+    public String getMachineNo() {
+        return machineNo;
+    }
+
+    public void setMachineNo(String machineNo) {
+        this.machineNo = machineNo;
+    }
 }

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

@@ -27,6 +27,8 @@ public class ProductType implements Serializable {
 
     private Integer typeStatus;     //状态
 
+    private Integer typeCompany;    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
+
     public Integer getTypeId() {
         return typeId;
     }
@@ -74,4 +76,12 @@ public class ProductType implements Serializable {
     public void setTypeStatus(Integer typeStatus) {
         this.typeStatus = typeStatus;
     }
+
+    public Integer getTypeCompany() {
+        return typeCompany;
+    }
+
+    public void setTypeCompany(Integer typeCompany) {
+        this.typeCompany = typeCompany;
+    }
 }

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

@@ -17,9 +17,8 @@ public interface ComplaintSignclosedInfoService {
      * @return
      */
     boolean insert(ComplaintSignclosedInfo record,
-               Map<String,Integer> colorNameMap,
-               Map<String,Integer> fittingsNameMap,
                Map<String,Integer> alreadyColorMap,
+               Map<String,String[]> machineNumberMap,
                Map<String,Integer> alreadyFittingsMap);
     /**
      * 查询单个签收记录
@@ -32,6 +31,7 @@ public interface ComplaintSignclosedInfoService {
      */
     boolean updateSignclosedById(ComplaintSignclosedInfo record,
                              Map<String,Integer> alreadyColorMap,
+                             Map<String,String[]> machineNumberMap,
                              Map<String,Integer> alreadyFittingsMap);
 
     /**

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

@@ -37,16 +37,15 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     @Override
     @Transactional
     public boolean insert(ComplaintSignclosedInfo record,
-                      Map<String,Integer> colorNameMap,
-                      Map<String,Integer> fittingsNameMap,
                       Map<String,Integer> alreadyColorMap,
+                      Map<String,String[]> machineNumberMap,
                       Map<String,Integer> alreadyFittingsMap) {
         boolean msg = true;
         int num = complaintSignclosedInfoMapper.insert(record);
         if(num < 1){
             msg = false;
         }else{
-            if(colorNameMap != null || colorNameMap.size() != 0){
+            /*if(colorNameMap != null || colorNameMap.size() != 0){
                 for (Map.Entry<String,Integer> entry : colorNameMap.entrySet()) {
                     AwaitingSignclosedProductInfo awaitingSignclosedInfo = new AwaitingSignclosedProductInfo();
                     //根据颜色id获取产品信息获取产品信息
@@ -81,23 +80,30 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     awaitingSignclosedInfo.setSignclosedCreateTime(new Date());
                     awaitingSignclosedProductMapper.insert(awaitingSignclosedInfo);
                 }
-            }
+            }*/
             if(alreadyColorMap != null || alreadyColorMap.size() != 0){
                 for (Map.Entry<String,Integer> entry : alreadyColorMap.entrySet()) {
+                    int i = 0;
                     SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
                     //根据颜色id获取产品信息获取产品信息
                     Product product = productMapper.getProductById(Integer.valueOf(entry.getKey()));
                     if(product == null){
                         return false;
                     }
-                    signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                    signclosedProductInfo.setProductName(product.getProductName());
-                    signclosedProductInfo.setProductNum(entry.getValue());
-                    signclosedProductInfo.setSignclosedProductType(1);
-                    signclosedProductInfo.setSignclosedProductId(product.getProductId());
-                    signclosedProductInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
-                    signclosedProductInfo.setSignclosedCreateTime(new Date());
-                    complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                    String[] machinenums = machineNumberMap.get("machineNumber"+entry.getKey());
+                    for (int j = 0;j<entry.getValue();j++){
+                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                        signclosedProductInfo.setProductName(product.getProductName());
+                        signclosedProductInfo.setProductNum(1);
+                        signclosedProductInfo.setSignclosedProductType(1);
+                        signclosedProductInfo.setSignclosedProductId(product.getProductId());
+                        signclosedProductInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
+                        signclosedProductInfo.setMachineNo(machinenums[i]);
+                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                        i++;
+                    }
+
                 }
             }
             if(alreadyFittingsMap != null || alreadyFittingsMap.size() != 0){
@@ -108,14 +114,16 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     if(fittingsInfo == null){
                         return false;
                     }
-                    signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                    signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
-                    signclosedProductInfo.setProductNum(entry.getValue());
-                    signclosedProductInfo.setSignclosedProductType(2);
-                    signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
-                    signclosedProductInfo.setSignclosedProductColor(null);
-                    signclosedProductInfo.setSignclosedCreateTime(new Date());
-                    complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                    for (int j = 0;j<entry.getValue();j++){
+                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                        signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
+                        signclosedProductInfo.setProductNum(1);
+                        signclosedProductInfo.setSignclosedProductType(2);
+                        signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
+                        signclosedProductInfo.setSignclosedProductColor(null);
+                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                    }
                 }
             }
         }
@@ -152,6 +160,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     @Override
     public boolean updateSignclosedById(ComplaintSignclosedInfo record,
                                     Map<String,Integer> alreadyColorMap,
+                                    Map<String,String[]> machineNumberMap,
                                     Map<String,Integer> alreadyFittingsMap) {
         boolean msg = true;
         int num = complaintSignclosedInfoMapper.updateSignclosedById(record);
@@ -160,20 +169,27 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         }else{
             if(alreadyColorMap != null || alreadyColorMap.size() != 0){
                 for (Map.Entry<String,Integer> entry : alreadyColorMap.entrySet()) {
+                    int i = 0;
                     SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
                     //根据颜色id获取产品信息获取产品信息
                     Product product = productMapper.getProductById(Integer.valueOf(entry.getKey()));
                     if(product == null){
                         return false;
                     }
-                    signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                    signclosedProductInfo.setProductName(product.getProductName());
-                    signclosedProductInfo.setProductNum(entry.getValue());
-                    signclosedProductInfo.setSignclosedProductType(1);
-                    signclosedProductInfo.setSignclosedProductId(product.getProductId());
-                    signclosedProductInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
-                    signclosedProductInfo.setSignclosedCreateTime(new Date());
-                    complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                    String[] machinenums = machineNumberMap.get("machineNumber"+entry.getKey());
+                    for (int j = 0;j<entry.getValue();j++){
+                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                        signclosedProductInfo.setProductName(product.getProductName());
+                        signclosedProductInfo.setProductNum(1);
+                        signclosedProductInfo.setSignclosedProductType(1);
+                        signclosedProductInfo.setSignclosedProductId(product.getProductId());
+                        signclosedProductInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
+                        signclosedProductInfo.setMachineNo(machinenums[i]);
+                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                        i++;
+                    }
+
                 }
             }
             if(alreadyFittingsMap != null || alreadyFittingsMap.size() != 0){
@@ -184,14 +200,16 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     if(fittingsInfo == null){
                         return false;
                     }
-                    signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                    signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
-                    signclosedProductInfo.setProductNum(entry.getValue());
-                    signclosedProductInfo.setSignclosedProductType(2);
-                    signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
-                    signclosedProductInfo.setSignclosedProductColor(null);
-                    signclosedProductInfo.setSignclosedCreateTime(new Date());
-                    complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                    for (int j = 0;j<entry.getValue();j++){
+                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                        signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
+                        signclosedProductInfo.setProductNum(1);
+                        signclosedProductInfo.setSignclosedProductType(2);
+                        signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
+                        signclosedProductInfo.setSignclosedProductColor(null);
+                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                    }
                 }
             }
         }

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

@@ -80,17 +80,19 @@
       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
+      pc.color_name colorName,
+      count(1) productNum
       FROM
       tb_rst_complaint_awaiting_signclosed_product sp
       LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
       WHERE
       signclosed_id = #{signclosedId}
+      GROUP BY sp.product_name,pc.color_name
   </select>
 </mapper>

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

@@ -5,7 +5,6 @@
     <id column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
     <result column="signclosed_type" property="signclosedType" jdbcType="BIT" />
     <result column="signclosed_type_name" property="signclosedTypeName" jdbcType="VARCHAR" />
-    <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
     <result column="signclosed_logistics" property="signclosedLogistics" jdbcType="VARCHAR" />
     <result column="signclosed_logistics_number" property="signclosedLogisticsNumber" jdbcType="VARCHAR" />
     <result column="signclosed_send_name" property="signclosedSendName" jdbcType="VARCHAR" />
@@ -28,7 +27,7 @@
     <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    signclosed_id, signclosed_type, signclosed_type_name, machine_no, signclosed_logistics, 
+    signclosed_id, signclosed_type, signclosed_type_name, signclosed_logistics,
     signclosed_logistics_number, signclosed_send_name, signclosed_send_tel, signclosed_addr_provinces, 
     signclosed_addr_city, signclosed_is_fittings, signclosed_date, signclosed_is_quality, 
     signclosed_is_into, signclosed_state, signclosed_objects_state, signclosed_customer_id, 
@@ -46,7 +45,6 @@
     <id column="signclosed_id" property="signclosedId"/>
     <result column="signclosed_type" property="signclosedType"/>
     <result column="signclosed_type_name" property="signclosedTypeName"/>
-    <result column="machine_no" property="machineNo"/>
     <result column="signclosed_logistics" property="signclosedLogistics"/>
     <result column="signclosed_logistics_number" property="signclosedLogisticsNumber"/>
     <result column="signclosed_send_name" property="signclosedSendName"/>
@@ -75,19 +73,20 @@
     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
+    pi.product_number productNumber,
+    count(1) productNum
     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 sp.signclosed_id = #{signclosedId}
+    GROUP BY sp.product_name,pc.color_name
   </select>
 
   <select id="listSignclosedById" resultType="SignclosedProductInfo" parameterType="Integer" >
@@ -95,26 +94,25 @@
     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
+    count(1) productNum
     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 sp.signclosed_id = #{signclosedId}
+    GROUP BY sp.product_name,pc.color_name
   </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,
@@ -171,7 +169,7 @@
 
   <insert id="insert" parameterType="ComplaintSignclosedInfo" useGeneratedKeys="true" keyProperty="signclosedId" >
     insert into tb_rst_complaint_signclosed (signclosed_type, signclosed_type_name,
-      machine_no, signclosed_logistics, signclosed_logistics_number, 
+      signclosed_logistics, signclosed_logistics_number,
       signclosed_send_name, signclosed_send_tel, 
       signclosed_addr_provinces, signclosed_addr_city, 
       signclosed_is_fittings, signclosed_date, signclosed_is_quality, 
@@ -181,7 +179,7 @@
       signclosed_desc
       )
     values (#{signclosedType,jdbcType=BIT}, #{signclosedTypeName,jdbcType=VARCHAR},
-      #{machineNo,jdbcType=VARCHAR}, #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR}, 
+      #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
       #{signclosedSendName,jdbcType=VARCHAR}, #{signclosedSendTel,jdbcType=VARCHAR}, 
       #{signclosedAddrProvinces,jdbcType=INTEGER}, #{signclosedAddrCity,jdbcType=INTEGER}, 
       #{signclosedIsFittings,jdbcType=BIT}, #{signclosedDate,jdbcType=DATE}, #{signclosedIsQuality,jdbcType=INTEGER}, 
@@ -200,9 +198,6 @@
       <if test="signclosedTypeName != null" >
         signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
       </if>
-      <if test="machineNo != null" >
-        machine_no = #{machineNo,jdbcType=VARCHAR},
-      </if>
       <if test="signclosedLogistics != null" >
         signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
       </if>

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

@@ -11,10 +11,12 @@
     <result column="signclosed_product_type" property="signclosedProductType" jdbcType="INTEGER" />
     <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
     <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
+    <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     product_id, signclosed_id, product_name, product_num, signclosed_create_time,
-    signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color
+    signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color,machine_no
   </sql>
   <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -33,6 +35,7 @@
 	sp.signclosed_product_type signclosedProductType,
 	sp.signclosed_product_id signclosedProductId,
 	sp.signclosed_product_color signclosedProductColor,
+	sp.machine_no machineNo,
     pc.color_name colorName,
     pi.product_number productNumber
     from
@@ -44,23 +47,25 @@
 
   <insert id="insert" parameterType="SignclosedProductInfo" >
     insert into tb_rst_complaint_signclosed_product (product_id, signclosed_id, product_name, 
-      product_num, signclosed_create_time, signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color
+      product_num, signclosed_create_time, signclosed_update_time,signclosed_product_type,signclosed_product_id,
+      signclosed_product_color,machine_no
       )
     values (#{productId,jdbcType=INTEGER}, #{signclosedId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
       #{productNum,jdbcType=INTEGER}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-      ,#{signclosedProductType,jdbcType=INTEGER}, #{signclosedProductId,jdbcType=INTEGER}, #{signclosedProductColor,jdbcType=INTEGER}
+      ,#{signclosedProductType,jdbcType=INTEGER}, #{signclosedProductId,jdbcType=INTEGER},
+       #{signclosedProductColor,jdbcType=INTEGER},#{machineNo,jdbcType=VARCHAR}
       )
   </insert>
 
   <insert id="insertList" parameterType="SignclosedProductInfo" >
     insert into tb_rst_complaint_awaiting_signclosed_product
       (
-          signclosed_id, product_name,product_num,signclosed_product_type,signclosed_product_id,signclosed_product_color
+          signclosed_id, product_name,product_num,signclosed_product_type,signclosed_product_id,signclosed_product_color,machine_no
       )
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
-        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}
+        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}, #{node.machineNo}
       )
     </foreach>
   </insert>
@@ -77,6 +82,9 @@
       <if test="productNum != null" >
         product_num = #{productNum,jdbcType=INTEGER},
       </if>
+      <if test="machineNo != null" >
+        machine_no = #{machineNo,jdbcType=VARCHAR},
+      </if>
       <if test="signclosedCreateTime != null" >
         signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
       </if>

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

@@ -115,13 +115,13 @@
       company_id, store_id, customer_source_type, 
       customer_source, customer_counsel_type, customer_name, 
       customer_tel, customer_is_solve, customer_is_visit, 
-      customer_in_TDS, customer_out_TDS, customer_area
+      customer_in_TDS, customer_out_TDS, customer_area, type_id
       )
     values (#{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{questionId,jdbcType=INTEGER}, 
       #{companyId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{customerSourceType,jdbcType=TINYINT}, 
       #{customerSource,jdbcType=VARCHAR}, #{customerCounselType,jdbcType=BIT}, #{customerName,jdbcType=VARCHAR}, 
       #{customerTel,jdbcType=VARCHAR}, #{customerIsSolve,jdbcType=TINYINT}, #{customerIsVisit,jdbcType=VARCHAR}, 
-      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR}
+      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR},#{typeId}
       )
   </insert>
 

watero-rst-service/src/main/java/com/iamberry/rst/util/SmsConfig.java

@@ -29,6 +29,18 @@ public class SmsConfig {
     public static String SEND_NOTICE_INFORM="";
     /**		通知发送滤芯短信2	*/
     public static String SEND_NOTICE_INFORM2="";
+    /* 发送邮寄信息  -- 美国watero */
+    public static String SEND_PRODUCT_SMS_WATERO="";
+    /* 发送邮寄信息  -- 上朵 */
+    public static String SEND_PRODUCT_SMS_SHANGDUO="";
+    /* 发送邮寄信息  -- 优尼雅 */
+    public static String SEND_PRODUCT_SMS_YULIA="";
+    /* 发送问题回复  -- 美国watero */
+    public static String SEND_PRODUCT_SEND_WATERO="";
+    /* 发送问题回复  -- 上朵 */
+    public static String SEND_PRODUCT_SEND_SHANGDUO="";
+    /* 发送问题回复  -- 优尼雅 */
+    public static String SEND_PRODUCT_SEND_YULIA="";
 
 
 
@@ -51,6 +63,12 @@ public class SmsConfig {
             SEND_NOTICE=pro.getProperty("SEND_NOTICE");
             SEND_NOTICE_INFORM=pro.getProperty("SEND_NOTICE_INFORM");
             SEND_NOTICE_INFORM2=pro.getProperty("SEND_NOTICE_INFORM2");
+            SEND_PRODUCT_SMS_WATERO=pro.getProperty("SEND_PRODUCT_SMS_WATERO");
+            SEND_PRODUCT_SMS_SHANGDUO=pro.getProperty("SEND_PRODUCT_SMS_SHANGDUO");
+            SEND_PRODUCT_SMS_YULIA=pro.getProperty("SEND_PRODUCT_SMS_YULIA");
+            SEND_PRODUCT_SEND_WATERO=pro.getProperty("SEND_PRODUCT_SEND_WATERO");
+            SEND_PRODUCT_SEND_SHANGDUO=pro.getProperty("SEND_PRODUCT_SEND_SHANGDUO");
+            SEND_PRODUCT_SEND_YULIA=pro.getProperty("SEND_PRODUCT_SEND_YULIA");
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -11,14 +11,18 @@ import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.util.SmsConfig;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.OrderNoUtil;
 import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +43,8 @@ import static com.iamberry.rst.util.SmsConfig.CONFIRM_TEXT;
 @RequestMapping("/admin/customer")
 public class AdminCustomerController {
 
+    private Logger logger = LoggerFactory.getLogger(AdminCustomerController.class);
+
     @Autowired
     private CompanyInfoService companyInfoService;
     @Autowired
@@ -621,33 +627,66 @@ public class AdminCustomerController {
     @ResponseBody
     @RequiresPermissions("customer:add:customer")
     @RequestMapping("/send_phone_sms")
-    public ResponseJson sendPhoneSms(HttpServletRequest request,String type,String phone,ComplaintQuestionInfo complaintQuestionInfo) throws Exception {
-        String url = "https://rst.iamberry.com/QA";
+    public ResponseJson sendPhoneSms(HttpServletRequest request,String type,String phone,Integer typeCompany,ComplaintQuestionInfo complaintQuestionInfo) throws Exception {
+        String url = NameUtils.getConfig("website");
         Integer flag = 1;
+
+        if(typeCompany == null || typeCompany == 0){
+            return new ResponseJson(500, "未获取到产品类型!", 500);
+        }
+
+        String con = "";
         if(type != null && !"".equals(type)){
             if( "p".equals(type)){
                 url += "/problem?questionId="+complaintQuestionInfo.getQuestionId();
+
+                switch (typeCompany){
+                    case 1:
+                        con = SmsConfig.SEND_PRODUCT_SMS_WATERO;
+                        break;
+                    case 2:
+                        con = SmsConfig.SEND_PRODUCT_SMS_SHANGDUO;
+                        break;
+                    case 3:
+                        con = SmsConfig.SEND_PRODUCT_SMS_YULIA;
+                        break;
+                }
+
             }else if( "m".equals(type)){
-                url += "/adress";
+                complaintQuestionInfo.setQuestionName(null);
+                url += "/address";
+
+                switch (typeCompany){
+                    case 1:
+                        con = SmsConfig.SEND_PRODUCT_SEND_WATERO;
+                        break;
+                    case 2:
+                        con = SmsConfig.SEND_PRODUCT_SEND_SHANGDUO;
+                        break;
+                    case 3:
+                        con = SmsConfig.SEND_PRODUCT_SEND_YULIA;
+                        break;
+                }
+
             }
         }
 
+        logger.info("发送短信url地址：" + url);
+
         flag =  complaintQuestionInfoService.updateQuestionById(complaintQuestionInfo);
         if (flag < 1) {
             return new ResponseJson(500, "问题修改失败!", 500);
         }
-
-        String text = MessageFormat.format(CONFIRM_TEXT, complaintQuestionInfo.getQuestionProfile());
+        String text = MessageFormat.format(con, url);
         String result = smsService.sendOtherCMS(phone, text);
 
-        ResponseJson json = new ResponseJson();
-        ResponseJson rj = json.addResponseKeyValue(result);
-
-        if (rj.getResultCode() != 200) {
-            return new ResponseJson(500, "发送短信失败!", 500);
-        } else {
-            return new ResponseJson(200, "发送短信成功!", 200);
+        if("SUCCESS".equals(result)){
+            return new ResponseJson(200, "发送短信成功", 200);
+        }else{
+            return new ResponseJson(200, "发送短信失败", 200);
         }
+
+
     }
 
     /**

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

@@ -113,19 +113,23 @@ public class AdminSignclosedController {
     public ResponseJson addSignclosed(HttpServletRequest request,ComplaintSignclosedInfo signclosedInfo) throws Exception {
         ResponseJson msg = new ResponseJson();
         if(signclosedInfo == null){
-            msg.setResultCode(500);
+            msg.setResultCode(200);
             msg.setReturnCode(500);
             return msg;
         }
 
         /**寄回产品**/
-        String[] colorName = request.getParameterValues("colorName");
-        String[] fittingsName = request.getParameterValues("fittingsName");
+        /*String[] colorName = request.getParameterValues("colorName");
+        String[] fittingsName = request.getParameterValues("fittingsName");*/
         /**签收产品**/
         String[] alreadyColorName = request.getParameterValues("alreadyColorName");
         String[] alreadyFittingsName = request.getParameterValues("alreadyFittingsName");
-
-        Map<String,Integer> colorNameMap = new HashMap<>();
+        if(alreadyColorName == null && alreadyFittingsName == null){
+            msg.setResultCode(200);
+            msg.setReturnCode(502);
+            return msg;
+        }
+        /*Map<String,Integer> colorNameMap = new HashMap<>();
         if(colorName != null && colorName.length> 0){
             for (int i = 0;i<colorName.length;i++){
                 colorNameMap.put(colorName[i],Integer.valueOf(request.getParameter("colorId"+colorName[i])));
@@ -136,11 +140,22 @@ public class AdminSignclosedController {
             for (int i = 0;i<fittingsName.length;i++){
                 fittingsNameMap.put(fittingsName[i],Integer.valueOf(request.getParameter("fittingsId"+fittingsName[i])));
             }
-        }
+        }*/
         Map<String,Integer> alreadyColorMap = new HashMap<>();
+        Map<String,String[]> machineNumberMap = new HashMap<>();
         if(alreadyColorName != null && alreadyColorName.length> 0){
             for (int i = 0;i<alreadyColorName.length;i++){
-                alreadyColorMap.put(alreadyColorName[i],Integer.valueOf(request.getParameter("alreadyColorId"+alreadyColorName[i])));
+                /**获取机器数量**/
+                String number = request.getParameter("alreadyColorId"+alreadyColorName[i]);
+                alreadyColorMap.put(alreadyColorName[i],Integer.valueOf(number));
+                /**获取机器编号数组**/
+                String[] machineNumbers = request.getParameterValues("machineNumber"+alreadyColorName[i]);
+                /*if(machineNumbers.length != Integer.valueOf(number)){
+                    msg.setResultCode(200);
+                    msg.setReturnCode(501);
+                    return msg;
+                }*/
+                machineNumberMap.put("machineNumber"+alreadyColorName[i],machineNumbers);
             }
         }
         Map<String, Integer> alreadyFittingsMap = new HashMap<>();
@@ -157,11 +172,11 @@ public class AdminSignclosedController {
         if(signclosedInfo.getSignclosedState() == 2){
             signclosedInfo.setSignclosedObjectsState(3);
         }
-        boolean num = complaintSignclosedInfoService.insert(signclosedInfo,colorNameMap,fittingsNameMap,alreadyColorMap,alreadyFittingsMap);
+        boolean num = complaintSignclosedInfoService.insert(signclosedInfo,alreadyColorMap,machineNumberMap,alreadyFittingsMap);
 
 
         if (!num) {
-            msg.setResultCode(500);
+            msg.setResultCode(200);
             msg.setReturnCode(500);
         } else {
             msg.setResultCode(200);
@@ -212,11 +227,21 @@ public class AdminSignclosedController {
         /**签收产品**/
         String[] alreadyColorName = request.getParameterValues("alreadyColorName");
         String[] alreadyFittingsName = request.getParameterValues("alreadyFittingsName");
-
+        if(alreadyColorName == null && alreadyFittingsName == null){
+            msg.setResultCode(200);
+            msg.setReturnCode(502);
+            return msg;
+        }
         Map<String,Integer> alreadyColorMap = new HashMap<>();
+        Map<String,String[]> machineNumberMap = new HashMap<>();
         if(alreadyColorName != null && alreadyColorName.length> 0){
             for (int i = 0;i<alreadyColorName.length;i++){
-                alreadyColorMap.put(alreadyColorName[i],Integer.valueOf(request.getParameter("alreadyColorId"+alreadyColorName[i])));
+                /**获取机器数量**/
+                String number = request.getParameter("alreadyColorId"+alreadyColorName[i]);
+                alreadyColorMap.put(alreadyColorName[i],Integer.valueOf(number));
+                /**获取机器编号数组**/
+                String[] machineNumbers = request.getParameterValues("machineNumber"+alreadyColorName[i]);
+                machineNumberMap.put("machineNumber"+alreadyColorName[i],machineNumbers);
             }
         }
         Map<String, Integer> alreadyFittingsMap = new HashMap<>();
@@ -231,7 +256,7 @@ public class AdminSignclosedController {
             signclosedInfo.setSignclosedDate(format.parse(signclosedDate));
         }
         signclosedInfo.setSignclosedState(1);
-        boolean num = complaintSignclosedInfoService.updateSignclosedById(signclosedInfo,alreadyColorMap,alreadyFittingsMap);
+        boolean num = complaintSignclosedInfoService.updateSignclosedById(signclosedInfo,alreadyColorMap,machineNumberMap,alreadyFittingsMap);
 
 
         if (!num) {

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

@@ -0,0 +1,133 @@
+package com.iamberry.rst.controllers.cm;
+
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
+import com.iamberry.wechat.tools.ResponseJson;
+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.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by wxm
+ * 问题
+ */
+@Controller
+@RequestMapping("/QA")
+public class AppComplaintQuestionInfoController {
+
+    /**
+     *  邮寄地址id
+     */
+    private Integer backOutQuestionId = 5;
+
+
+    @Autowired
+    private ComplaintQuestionInfoService complaintQuestionInfoService;
+
+
+    /**
+     * 进入客诉问题描述
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/problem")
+    public ModelAndView problem(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("wap/cm/request_message");
+        String questionId = request.getParameter("questionId");
+        mv.addObject("questionId", questionId);
+        return mv;
+    }
+
+    /**
+     * 进入客诉问题描述
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/address")
+    public ModelAndView adress(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("wap/cm/send_message");
+        return mv;
+    }
+
+    /**
+     * 查询退回短信客诉问题
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/get_back_out_question")
+    public ResponseJson getBackOutQuestion(HttpServletRequest request){
+        ResponseJson msg = new ResponseJson();
+        ComplaintQuestionInfo complaintQuestionInfo = complaintQuestionInfoService.getQuestionById(backOutQuestionId);
+        if (complaintQuestionInfo  == null) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+            msg.addResponseKeyValue("complaintQuestionInfo",complaintQuestionInfo);
+        }
+        return msg;
+    }
+
+    /**
+     * 查询客诉问题
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/get_question")
+    public ResponseJson getQuestion(HttpServletRequest request, Integer questionId){
+        ResponseJson msg = new ResponseJson();
+        if(questionId == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        ComplaintQuestionInfo complaintQuestionInfo = complaintQuestionInfoService.getQuestionById(questionId);
+        if (complaintQuestionInfo  == null) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+            msg.addResponseKeyValue("complaintQuestionInfo",complaintQuestionInfo);
+        }
+        return msg;
+    }
+
+    /**
+     * 修改是否已解决总数
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/update_question_num")
+    public ResponseJson updateQuestionNum(HttpServletRequest request, ComplaintQuestionInfo complaintQuestionInfo){
+        ResponseJson msg = new ResponseJson();
+        if(complaintQuestionInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        Integer num = complaintQuestionInfoService.updateQuestionById(complaintQuestionInfo);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
+
+
+}

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

@@ -1,45 +0,0 @@
-package com.iamberry.rst.controllers.cm.app;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by wxm
- * 问题
- */
-@Controller
-@RequestMapping("/QA")
-public class AppComplaintQuestionInfoController {
-
-
-    /**
-     * 进入客诉问题描述
-     *
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping("/problem")
-    public ModelAndView problem(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("wap/cm/request_message");
-        String questionId = request.getParameter("questionId");
-        mv.addObject("questionId", questionId);
-        return mv;
-    }
-
-    /**
-     * 进入客诉问题描述
-     *
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping("/adress")
-    public ModelAndView adress(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("wap/cm/send_message");
-        return mv;
-    }
-}

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -68,6 +68,10 @@
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">
         <form action="${path}/admin/customer/save_customer" method="post" class="form form-horizontal" id="form-customer-add"  onkeydown="if(event.keyCode==13)return false;">
+
+            <input type="hidden" id="customerName" name="customerName" value="">
+            <input type="hidden" id="customerTel" name="customerTel" value="">
+
             <div class="row cl">
 
                 <label class="form-label col-3">
@@ -298,7 +302,7 @@
                     <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="s1-20" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
                 </div>
             </div>
             <div class="row cl" id="recipientAddress" style="display: none;">
@@ -406,8 +410,8 @@
             </div>
             <div class="row cl" id="sendAddressInfo">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
-                <div class="formControls col-5 col-sm-5" style="height: 300px">
-                    <script id="sendAddressSms" type="text/plain" style="width:1000px;height:250px;"></script>
+                <div class="formControls col-5 col-sm-5" style="height: 250px">
+                    <script id="sendAddressSms" type="text/plain" style="width:1000px;height:200px;"></script>
                     </script>
                 </div>
             </div>
@@ -586,7 +590,7 @@
     var sendAddressSms = UE.getEditor('sendAddressSms');
 
     sendAddressSms.ready(function() {
-        sendAddressSms.setHeight(250);  //固定高度
+        sendAddressSms.setHeight(130);  //固定高度
     });
 </script>
 <script type="text/javascript">
@@ -827,7 +831,7 @@
                     for(var i=0;i<data.returnMsg.productTypeList.length;i++){
                         var produce = data.returnMsg.productTypeList[i];
                         html += ' <div class="radio-box">' +
-                                '<input type="radio" id="produce-type-'+ i +'" name="typeId"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
+                                '<input type="radio" id="produce-type-'+ i +'" name="typeId" typeCompany="'+ produce.typeCompany +'"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
                                 ' <label for="produce-type-'+ i +'">'+ produce.typeName +'</label>' +
                                 ' </div>';
                         check = "";
@@ -1132,6 +1136,7 @@
         var phone = "";
         var questionId = "";
         var describeTitle = "";
+        var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
         if(type == "p"){
             phone = $("#p-phone").val();
             questionId = $("#questionId").val();
@@ -1140,7 +1145,7 @@
         }else if(type == "m"){
             phone = $("#m-phone").val();
             questionId = complaint_questionId;
-            desc = UE.getEditor('describeContentText').getContent();
+            desc = UE.getEditor('sendAddressSms').getContent();
         }else{
             layer.close(index);
             layer.msg("发送报错", {icon: 5, time: 3000});
@@ -1158,6 +1163,7 @@
             type: "POST",
             data: {
                 type : type,
+                typeCompany : typeCompany,
                 phone : phone,
                 questionId : questionId,
                 questionName : describeTitle,

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_add.ftl

@@ -86,10 +86,10 @@
             <div class="row cl" id="recipientInfo" style=" margin-top: 20px;">
                 <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>购买信息：</label>
                 <div class="formControls col-3 col-sm-3">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="salesAddressTel" datatype="s1-20" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="salesAddressName" datatype="s1-20" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-3 col-sm-3">
-                    <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="salesAddressName" datatype="m" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="salesAddressTel" datatype="m" errormsg="联系人电话格式不正确！">
                 </div>
                 <div class="formControls col-3 col-sm-3">
                     <input type="text" placeholder="购买日期" id="salesPayTime"  name="salesPayTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt: 'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly">

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

@@ -179,48 +179,19 @@
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收产品：</label>
                 <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
                     <div>
-                        <input type="text" onchange="selectProduct();" class="input-text" style="width: 716px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 826px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
                     </div>
 
-                    <table class="table table-border table-bg table-bordered">
+                    <table class="table table-border table-bg table-bordered" style="width: 826px;">
                         <thead>
                         <tr class="text-c">
-                            <th style="text-align: center;" width="100">产品名称</th>
-                            <th style="text-align: center;" width="100">产品颜色</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
+                            <th style="text-align: center;" width="130">产品颜色</th>
                             <th style="text-align: center;" width="100">产品配件</th>
                         </tr>
                         </thead>
                         <tbody id="addProduct">
-                        <#if (productList?size > 0)>
-                            <#list productList as product>
-                        <tr >
-
-
-                            <td>${product.productName!''}</td>
-                            <td>
-                                <#if (product.colorList?size > 0)>
-                                    <#list product.colorList as colorList>
-                                        <input type="checkbox" id="" value="${colorList.colorId!''}" name="alreadyColorName" datatype="*">${colorList.colorName!''}
-                                        <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="alreadyColorId${colorList.colorId!''}" name="alreadyColorId${colorList.colorId!''}"><br>
-                                    </#list>
-                                <#else>
-                                暂无颜色，请先添加产品颜色
-                                </#if>
-                             </td>
-                            <td>
-                                <#if (product.fittingsList?size > 0)>
-                                    <#list product.fittingsList as fittingsList>
-                                        <input type="checkbox" id="" value="${fittingsList.fittingsId!''}" name="alreadyFittingsName" datatype="*">${fittingsList.fittingsName!''}
-                                        <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId${fittingsList.fittingsId!''}" name="alreadyFittingsId${fittingsList.fittingsId!''}"><br>
-                                    </#list>
-                                <#else>
-                                    暂无配件，请先添加配件
-                                </#if>
-                            </td>
-
-                        </tr>
-                            </#list>
-                        </#if>
+                        <td colspan="3">暂无数据！</td>
                         </tbody>
                     </table>
                 </div>
@@ -336,7 +307,11 @@
     //动态回显产品js state
     function selectProduct(){
         var productName = $("#selectProcuct").val();
-        alert(productName);
+        if(productName == null || productName == ""){
+            var productTable = '<td colspan="3">暂无数据！</td>';
+            $("#addProduct").html(productTable);
+            return false;
+        }
         $.ajax({
             cache: true,
             type: "POST",
@@ -345,17 +320,76 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    layer.msg('查询成功',{icon: 5,time:1000});
-                } else {
-                    layer.msg('查询失败，请刷新页面再试',{icon: 5,time:1000});
+                    $("#addProduct").html("");
+                    $.each(data.returnMsg.productList,function(i,value) {
+                        var colorTable = '';
+                        var fittingsTable = '';
+
+                        /*var colorlength = value.colorList.length;
+                        var fittingslength = value.fittingsList.length;*/
+                        if(value.colorList != null) {
+                            if (value.colorList.length > 0) {
+                                $.each(value.colorList, function (i, value) {
+                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
+                                            + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" oninput="generateInput(' + value.colorId + ')" onpropertychange="generateInput(' + value.colorId + ')"  placeholder="数量" id="alreadyColorId' + value.colorId + '" name="alreadyColorId' + value.colorId + '"><br>' +
+                                            '</td>'
+                                });
+                            }else{
+                                colorTable = '暂无颜色，请先添加产品颜色';
+                            }
+                        }else {
+                            colorTable = '暂无颜色，请先添加产品颜色';
+                        }
+                        if(value.fittingsList != null) {
+                            if (value.fittingsList.length > 0) {
+                                $.each(value.fittingsList, function (i, value) {
+                                    fittingsTable = fittingsTable + '<input type="checkbox" value="' + value.fittingsId + '" name="alreadyFittingsName" datatype="*">' + value.fittingsName + ''
+                                            + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId' + value.fittingsId + '" name="alreadyFittingsId' + value.fittingsId + '"><br>'
+                                });
+                            }else{
+                                fittingsTable = '暂无配件，请先添加配件';
+                            }
+                        }else{
+                            fittingsTable = '暂无配件，请先添加配件';
+                        }
+                        var productTable = '<tr>'
+                                +'<td>'+value.productName+'</td>'
+                                +'<td><table border="0">'+colorTable+'</table></td>'
+                                +'<td>'+fittingsTable+'</td>'
+                                +'</tr>';
+                        $("#addProduct").append(productTable);
+                    });
+                }else{
+                    var productTable = '<td colspan="3">暂无数据！</td>';
+                    $("#addProduct").html(productTable);
+
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){
-                layer.msg('添加错误',{icon: 5,time:1000});
+                layer.msg('查询错误，请刷新页面重试',{icon: 5,time:1000});
             }
         });
     }
 
+    //填写数量后动态生成相同数量的文本框
+    function generateInput(colorId){
+        var inputList = "";
+        var number = $("#alreadyColorId"+colorId).val();
+        var machineNumberName = "machineNumber"+colorId;
+        if(!/^\d+$/.test(number)){
+            layer.msg('请输入正确的数量',{icon: 5,time:1000});
+            $('input[name='+machineNumberName+']').remove();
+            return false;
+        }
+        $('input[name='+machineNumberName+']').remove();
+        for (var i = 1;i<=number;i++){
+            inputList = inputList + '<input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber' + colorId + '" >';
+        }
+
+
+        $("#tdColorId"+colorId).append(inputList);
+    }
+
     //动态回显产品js end
 
     $(function(){
@@ -448,7 +482,11 @@
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
                         location.replace(location.href);
                     });
-                } else {
+                } else if(data.returnCode == 501) {
+                    layer.msg('机器编号未填写',{icon: 5,time:1000});
+                } else if(data.returnCode == 502) {
+                    layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
+                }else{
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }
             },

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

@@ -78,38 +78,45 @@
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回产品：</label>
                 <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
+                    <div>
+                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 826px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+                    </div>
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c">
-                            <th style="text-align: center;" width="100">产品名称</th>
-                            <th style="text-align: center;" width="100">产品数量</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
+                            <th style="text-align: center;" width="130">产品颜色</th>
+                            <th style="text-align: center;" width="100">产品配件</th>
                         </tr>
                         </thead>
                         <tbody id="addProduct">
                         <#if (signclosedList?size > 0)>
                             <#list signclosedList as signclosed>
-                            <tr >
+                            <tr>
                                 <#if signclosed.signclosedProductType == 1>
-                                    <td>
-                                        <input type="checkbox" id="" value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">
-                                        ${signclosed.productName!''}-${signclosed.colorName!''}</td>
-                                    <td>
-                                        <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="${signclosed.productNum!''}" placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
-                                    </td>
-                                <#else>
-                                    <td>
-                                        <input type="checkbox" id="" value="${signclosed.signclosedProductId!''}" name="alreadyFittingsName" datatype="*">
-                                        ${signclosed.productName!''}</td>
-                                    <td>
-                                        <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="${signclosed.productNum!''}" placeholder="数量" id="alreadyFittingsId${signclosed.signclosedProductId!''}" name="alreadyFittingsId${signclosed.signclosedProductId!''}"><br>
+                                <td>${signclosed.productName!''}</td>
+                                <td><table border="0">
+                                    <td id="tdColorId${signclosed.signclosedProductColor!''}"><input type="checkbox" value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
+                                    <input type="text" style="width: 50px;margin-left: 10px;" value="${signclosed.productNum!''}" class="input-text" oninput="generateInput( ${signclosed.signclosedProductColor!''})" onpropertychange="generateInput(${signclosed.signclosedProductColor!''})"  placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
+                                        <#list 1..signclosed.productNum as t>
+                                            <input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber${signclosed.signclosedProductColor!''}" >
+                                        </#list>
+
                                     </td>
+                                </table></td>
+                                <td> </td>
+                                </#if>
+                                <#if signclosed.signclosedProductType == 2>
+                                <td></td>
+                                <td></td>
+                                <td><input type="checkbox" value="${signclosed.signclosedProductId!''}" name="alreadyFittingsName" datatype="*">${signclosed.productName!''}
+                                    <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="${signclosed.productNum!''}" placeholder="数量" id="alreadyFittingsId${signclosed.signclosedProductId!''}" name="alreadyFittingsId${signclosed.signclosedProductId!''}"><br>
+                                </td>
                                 </#if>
-
                             </tr>
                             </#list>
-                        <#else>
-                        <tr><td class="td-manage text-c" colspan = "2">暂无数据</td></tr>
                         </#if>
+
                         </tbody>
                     </table>
                 </div>
@@ -185,7 +192,7 @@
             </div>
             <div class="row cl">
                 <div class="col-2 col-sm-2 col-offset-3">
-                    <input type="hidden" id="signclosedId" name="signclosedId" value="<#if ifcomplaintSignclosedInfo?? >${complaintSignclosedInfo.signclosedId!''}</#if>">
+                    <input type="hidden" id="signclosedId" name="signclosedId" value="<#if complaintSignclosedInfo?? >${complaintSignclosedInfo.signclosedId!''}</#if>">
                     <button onClick="add();" class="btn btn-block btn-primary size-XL" type="button">确认签收</button>
                 </div>
             </div>
@@ -202,6 +209,95 @@
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
 <script type="text/javascript">
+    //动态回显产品js state
+    function selectProduct(){
+        var productName = $("#selectProcuct").val();
+        if(productName == null || productName == ""){
+            var productTable = '<td colspan="3">暂无数据！</td>';
+            $("#addProduct").html(productTable);
+            return false;
+        }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/signclosed/select_product",
+            data:{'productName':productName},
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#addProduct").html("");
+                    $.each(data.returnMsg.productList,function(i,value) {
+                        var colorTable = '';
+                        var fittingsTable = '';
+
+                        /*var colorlength = value.colorList.length;
+                        var fittingslength = value.fittingsList.length;*/
+                        if(value.colorList != null) {
+                            if (value.colorList.length > 0) {
+                                $.each(value.colorList, function (i, value) {
+                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
+                                            + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" oninput="generateInput(' + value.colorId + ')" onpropertychange="generateInput(' + value.colorId + ')"  placeholder="数量" id="alreadyColorId' + value.colorId + '" name="alreadyColorId' + value.colorId + '"><br>' +
+                                            '</td>'
+                                });
+                            }else{
+                                colorTable = '暂无颜色，请先添加产品颜色';
+                            }
+                        }else {
+                            colorTable = '暂无颜色，请先添加产品颜色';
+                        }
+                        if(value.fittingsList != null) {
+                            if (value.fittingsList.length > 0) {
+                                $.each(value.fittingsList, function (i, value) {
+                                    fittingsTable = fittingsTable + '<input type="checkbox" value="' + value.fittingsId + '" name="alreadyFittingsName" datatype="*">' + value.fittingsName + ''
+                                            + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId' + value.fittingsId + '" name="alreadyFittingsId' + value.fittingsId + '"><br>'
+                                });
+                            }else{
+                                fittingsTable = '暂无配件，请先添加配件';
+                            }
+                        }else{
+                            fittingsTable = '暂无配件，请先添加配件';
+                        }
+                        var productTable = '<tr>'
+                                +'<td>'+value.productName+'</td>'
+                                +'<td><table border="0">'+colorTable+'</table></td>'
+                                +'<td>'+fittingsTable+'</td>'
+                                +'</tr>';
+                        $("#addProduct").append(productTable);
+                    });
+                }else{
+                    var productTable = '<td colspan="3">暂无数据！</td>';
+                    $("#addProduct").html(productTable);
+
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('查询错误，请刷新页面重试',{icon: 5,time:1000});
+            }
+        });
+    }
+
+    //填写数量后动态生成相同数量的文本框
+    function generateInput(colorId){
+        var inputList = "";
+        var number = $("#alreadyColorId"+colorId).val();
+        var machineNumberName = "machineNumber"+colorId;
+        if(!/^\d+$/.test(number)){
+            layer.msg('请输入正确的数量',{icon: 5,time:1000});
+            $('input[name='+machineNumberName+']').remove();
+            return false;
+        }
+        $('input[name='+machineNumberName+']').remove();
+        for (var i = 1;i<=number;i++){
+            inputList = inputList + '<input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber' + colorId + '" >';
+        }
+
+
+        $("#tdColorId"+colorId).append(inputList);
+    }
+    //动态回显产品js end
+
+
+
     $(function(){
         var province = listProvince(null,null);
         var provinceHtml = '';
@@ -274,7 +370,11 @@
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
                         location.replace(location.href);
                     });
-                } else {
+                } else if(data.returnCode == 501) {
+                    layer.msg('机器编号未填写',{icon: 5,time:1000});
+                } else if(data.returnCode == 502) {
+                    layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
+                }else {
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }
             },

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/request_message.ftl

@@ -59,15 +59,18 @@
 			<button type="button" class="mui-btn my-btn no">未解决</button>
 			<button type="button" class="mui-btn my-btn yes">已解决</button>
 		</div>
-</div>	
-<script type="text/javascript" src="../lib/mui/js/mui.min.js"></script>
-<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
+</div>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.view.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.picker.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/city.data-3.js"></script>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script>
 	var questionId=getQueryString("questionId");
 	//自己写的js
 	mui.ready(function() {
 		if(questionId!=null){
-		$.ajax('${path}/admin/complaintQuestion/get_question?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/get_question?dates=' + new Date().getTime(), {
 						data: {
 							"questionId":questionId
 						},
@@ -84,9 +87,9 @@
 								location.href = dt.redirectURL;
 							} else {
 								if(dt.returnCode == "200") {
-									$(".my-btn").attr("name",dt.complaintQuestionInfo.questionId);
-									$("#questionName").text(dt.complaintQuestionInfo.questionName);
-									$(".ul-list").html('<li>'+dt.complaintQuestionInfo.questionProfile+'</li>');
+									$(".my-btn").attr("name",dt.returnMsg.complaintQuestionInfo.questionId);
+									$("#questionName").text(dt.returnMsg.complaintQuestionInfo.questionName);
+									$(".ul-list").html('<li>'+dt.returnMsg.complaintQuestionInfo.questionProfile+'</li>');
 								}else {
 									mui.alert("获取数据失败！")
 								}
@@ -109,7 +112,7 @@
 			parameter["questionNotSolvedNum"] = 1;
 		}
 		
-		$.ajax('${path}/admin/complaintQuestion/update_question_num?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/update_question_num?dates=' + new Date().getTime(), {
 						data:parameter,
 						dataType: 'json',
 						xhrFields: {

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/send_message.ftl

@@ -57,12 +57,15 @@
 			<button type="button" class="mui-btn my-btn yes">已解决</button>
 		</div>
 </div>	
-<script type="text/javascript" src="../lib/mui/js/mui.min.js"></script>
-<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.view.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.picker.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/city.data-3.js"></script>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script>
 	//自己写的js
 	mui.ready(function() {
-		$.ajax('${path}/admin/complaintQuestion/get_back_out_question?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/get_back_out_question?dates=' + new Date().getTime(), {
 						data: {},
 						dataType: 'json',
 						xhrFields: {
@@ -77,8 +80,8 @@
 								location.href = dt.redirectURL;
 							} else {
 								if(dt.returnCode == "200") {
-									$(".my-btn").attr("name",dt.complaintQuestionInfo.questionId);
-									$(".ul-list").html('<li>'+dt.complaintQuestionInfo.questionProfile+'</li>');
+									$(".my-btn").attr("name",dt.returnMsg.complaintQuestionInfo.questionId);
+									$(".ul-list").html('<li>'+dt.returnMsg.complaintQuestionInfo.questionProfile+'</li>');
 								}else {
 									mui.alert("获取数据失败！")
 								}
@@ -100,7 +103,7 @@
 			parameter["questionNotSolvedNum"] = 1;
 		}
 		
-		$.ajax('${path}/admin/complaintQuestion/update_question_num?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/update_question_num?dates=' + new Date().getTime(), {
 						data:parameter,
 						dataType: 'json',
 						xhrFields: {