修改客诉bug

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

@@ -22,6 +22,8 @@ public class ClosedFitting  implements Serializable {
 
     private String closedFittingsBar;     //配件sku
 
+    private String colorBar;        //69码
+
     public Integer getClosedFittingType() {
         return closedFittingType;
     }
@@ -93,4 +95,12 @@ public class ClosedFitting  implements Serializable {
     public void setClosedProductName(String closedProductName) {
         this.closedProductName = closedProductName;
     }
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
 }

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

@@ -28,6 +28,8 @@ public class ClosedProdcue  implements Serializable {
     private String productNumber;       //产品型号
     private ProductColor productColor;      //颜色
 
+    private String colorBar;        //69码
+
     public String getClosedProductName() {
         return closedProductName;
     }
@@ -123,4 +125,12 @@ public class ClosedProdcue  implements Serializable {
     public void setClosedColorName(String closedColorName) {
         this.closedColorName = closedColorName;
     }
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
 }

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

@@ -18,10 +18,10 @@ public class SendFitting  implements Serializable {
 
     private String sendFittingsName; //配件名称
 
-    private String sendFittingsBar; //配件sku
-
     private String sendProductName;         //商品名称
 
+    private String colorBar;        //69码
+
     public String getSendFittingsName() {
         return sendFittingsName;
     }
@@ -30,14 +30,6 @@ public class SendFitting  implements Serializable {
         this.sendFittingsName = sendFittingsName;
     }
 
-    public String getSendFittingsBar() {
-        return sendFittingsBar;
-    }
-
-    public void setSendFittingsBar(String sendFittingsBar) {
-        this.sendFittingsBar = sendFittingsBar;
-    }
-
     public Integer getSendFittingType() {
         return sendFittingType;
     }
@@ -93,4 +85,12 @@ public class SendFitting  implements Serializable {
     public void setSendProductName(String sendProductName) {
         this.sendProductName = sendProductName;
     }
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
 }

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

@@ -27,6 +27,8 @@ public class SendProdcue  implements Serializable {
     private String productNumber;       //产品型号
     private ProductColor productColor;      //颜色
 
+    private String colorBar;        //69码
+
     public String getSendProduceName() {
         return sendProduceName;
     }
@@ -114,4 +116,13 @@ public class SendProdcue  implements Serializable {
     public void setSendColorName(String sendColorName) {
         this.sendColorName = sendColorName;
     }
-}
+
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/product/ProductService.java

@@ -111,5 +111,5 @@ public interface ProductService {
      * 根据sku查询配件信息
      * @return
      */
-    FittingsInfo getFittingsBySku(FittingsInfo fittingsInfo);
+    FittingsInfo getFittingsBySku(String colorBar);
 }

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

@@ -46,7 +46,6 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     private SalesOrderMapper salesOrderMapper;
 
 
-
     @Override
     public CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon) {
         ClosedFitting closedFitting = new ClosedFitting();

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

@@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -831,33 +830,44 @@ public class CustomerServiceImpl implements CustomerService {
     @Transactional
     public void setName(CustomerCommon cc){
         for (int i=0;i<cc.getSendProdcues().size();i++) {
-            Product product = productMapper.getProduce(cc.getSendProdcues().get(i).getProductId());
+            ProductColor productColor = productMapper.getProductBySku(cc.getSendProdcues().get(i).getColorBar());
+            cc.getSendProdcues().get(i).setProductColor(productColor);
+            cc.getSendProdcues().get(i).setColorId(productColor.getColorId());
+
+            Product product = productMapper.getProduce(productColor.getColorProductId());
+            cc.getSendProdcues().get(i).setProductId(product.getProductId());
             cc.getSendProdcues().get(i).setSendProduceName(product.getProductName());
             cc.getSendProdcues().get(i).setProductType(product.getProductType());
             cc.getSendProdcues().get(i).setProductNumber(product.getProductNumber());
-
-            ProductColor productColor = productMapper.getProduceColor(cc.getSendProdcues().get(i).getColorId());
-            cc.getSendProdcues().get(i).setProductColor(productColor);
         }
         for (int i=0;i<cc.getSendFittings().size();i++) {
-            FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById( cc.getSendFittings().get(i).getFittingsId());
+            FittingsInfo fittingsInfo = productMapper.getFittingsBySku( cc.getSendFittings().get(i).getColorBar());
             cc.getSendFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
+            cc.getSendFittings().get(i).setProductId(fittingsInfo.getFittingsId());
             cc.getSendFittings().get(i).setSendFittingsName(fittingsInfo.getFittingsName());
-            cc.getSendFittings().get(i).setSendFittingsBar(fittingsInfo.getFittingsName());
+
+            Product product = productMapper.getProduce(fittingsInfo.getProductId());
+            cc.getSendFittings().get(i).setSendFittingsName(product.getProductName());
         }
         for (int i=0;i<cc.getClosedProdcues().size();i++) {
-            Product product = productMapper.getProduce(cc.getClosedProdcues().get(i).getProductId());
+            ProductColor productColor = productMapper.getProductBySku(cc.getClosedProdcues().get(i).getColorBar());
+            cc.getClosedProdcues().get(i).setProductColor(productColor);
+            cc.getClosedProdcues().get(i).setColorId(productColor.getColorId());
+
+            Product product = productMapper.getProduce(productColor.getColorProductId());
+            cc.getClosedProdcues().get(i).setProductId(product.getProductId());
             cc.getClosedProdcues().get(i).setClosedProductName(product.getProductName());
             cc.getClosedProdcues().get(i).setProductType(product.getProductType());
             cc.getClosedProdcues().get(i).setProductNumber(product.getProductNumber());
-            ProductColor productColor = productMapper.getProduceColor(cc.getClosedProdcues().get(i).getColorId());
-            cc.getClosedProdcues().get(i).setProductColor(productColor);
         }
         for (int i=0;i<cc.getClosedFittings().size();i++) {
-            FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(cc.getClosedFittings().get(i).getFittingsId());
+            FittingsInfo fittingsInfo = productMapper.getFittingsBySku(cc.getClosedFittings().get(i).getColorBar());
             cc.getClosedFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
+            cc.getClosedFittings().get(i).setProductId(fittingsInfo.getProductId());
             cc.getClosedFittings().get(i).setClosedFittingsName(fittingsInfo.getFittingsName());
-            cc.getClosedFittings().get(i).setClosedFittingsBar(fittingsInfo.getFittingsName());
+
+            Product product = productMapper.getProduce(fittingsInfo.getProductId());
+            cc.getClosedFittings().get(i).setClosedProductName(product.getProductName());
         }
     }
 

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

@@ -15,7 +15,6 @@ public interface SendFittingMapper {
 
     int updateByPrimaryKeySelective(SendFitting record);
 
-    int updateByPrimaryKey(SendFitting record);
 
     /**
      * 查询寄送的配件集合

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

@@ -15,7 +15,6 @@ public interface SendProdcueMapper {
 
     int updateByPrimaryKeySelective(SendProdcue record);
 
-    int updateByPrimaryKey(SendProdcue record);
 
     /**
      * 获取寄出产品集合

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

@@ -7,9 +7,10 @@
     <result column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="fittings_id" property="fittingsId" jdbcType="INTEGER" />
     <result column="closed_fitting_number" property="closedFittingNumber" jdbcType="INTEGER" />
+    <result column="color_bar" property="colorBar" />
   </resultMap>
   <sql id="Base_Column_List" >
-    closed_fitting_id, relation_id, product_id, fittings_id, closed_fitting_number
+    closed_fitting_id, relation_id, product_id, fittings_id, closed_fitting_number,color_bar
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -20,11 +21,11 @@
   <insert id="insert" parameterType="ClosedFitting" >
     insert into tb_rst_closed_fitting
     (
-      relation_id, product_id,fittings_id, closed_fitting_number,closed_fitting_type
+      relation_id, product_id,fittings_id, closed_fitting_number,closed_fitting_type,color_bar
     )
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
-      ( #{node.relationId}, #{node.productId}, #{node.fittingsId}, #{node.closedFittingNumber},#{node.closedFittingType})
+      ( #{node.relationId}, #{node.productId}, #{node.fittingsId}, #{node.closedFittingNumber},#{node.closedFittingType},#{node.colorBar})
     </foreach>
   </insert>
 
@@ -87,6 +88,9 @@
       <if test="closedFittingNumber != null" >
         closed_fitting_number = #{closedFittingNumber,jdbcType=INTEGER},
       </if>
+      <if test="colorBar != null" >
+        color_bar = #{colorBar},
+      </if>
     </set>
     where closed_fitting_id = #{closedFittingId,jdbcType=INTEGER}
   </update>

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

@@ -7,9 +7,10 @@
     <result column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="color_id" property="colorId" jdbcType="INTEGER" />
     <result column="closed_prodcue_number" property="closedProdcueNumber" jdbcType="INTEGER" />
+    <result column="color_bar" property="colorBar" />
   </resultMap>
   <sql id="Base_Column_List" >
-    closed_prodcue_id, relation_id, product_id, closed_prodcue_machine_no, color_id, closed_prodcue_number
+    closed_prodcue_id, relation_id, product_id, closed_prodcue_machine_no, color_id, closed_prodcue_number,color_bar
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -20,12 +21,12 @@
 
   <insert id="insert" parameterType="ClosedProdcue" >
     insert into tb_rst_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
-      color_id, closed_prodcue_number,closed_prodcue_type)
+      color_id, closed_prodcue_number,closed_prodcue_type,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId}, #{node.closedProdcueMachineNo},
-       #{node.colorId}, #{node.closedProdcueNumber},#{node.closedProdcueType}
+       #{node.colorId}, #{node.closedProdcueNumber},#{node.closedProdcueType},#{node.colorBar}
       )
     </foreach>
   </insert>
@@ -53,7 +54,6 @@
     </where>
   </delete>
 
-
   <update id="updateByPrimaryKeySelective" parameterType="ClosedProdcue" >
     update tb_rst_closed_prodcue
     <set >
@@ -69,18 +69,12 @@
       <if test="closedProdcueNumber != null" >
         closed_prodcue_number = #{closedProdcueNumber,jdbcType=INTEGER},
       </if>
+      <if test="colorBar != null" >
+        color_bar = #{colorBar},
+      </if>
     </set>
     where closed_prodcue_id = #{closedProdcueId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="ClosedProdcue" >
-    update tb_rst_closed_prodcue
-    set relation_id = #{relationId,jdbcType=INTEGER},
-      product_id = #{productId,jdbcType=INTEGER},
-      closed_prodcue_machine_no = #{closedProdcueMachineNo},
-      color_id = #{colorId,jdbcType=INTEGER},
-      closed_prodcue_number = #{closedProdcueNumber,jdbcType=INTEGER}
-    where closed_prodcue_id = #{closedProdcueId,jdbcType=INTEGER}
-  </update>
 
   <!-- 查询售后寄回产品集合 -->
   <select id="listclosedProdcue" parameterType="ClosedProdcue" resultType="ClosedProdcue">

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

@@ -69,7 +69,7 @@
   </delete>
 
   <!-- 查询客诉基本信息列表 老排序规则 ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc -->
-  <select id="listCustomer" parameterType="CustomerInfo" resultMap="customerMap">
+  <!--<select id="listCustomer" parameterType="CustomerInfo" resultMap="customerMap">
     select
       c.customer_id,
       c.customer_counsel_type,
@@ -230,10 +230,10 @@
         )
       </if>
     </where>
-
     ORDER BY c.customer_id desc
-  </select>
-  <!--<select id="listCustomer" parameterType="CustomerInfo" resultMap="customerMap">
+  </select>-->
+
+  <select id="listCustomer" parameterType="CustomerInfo" resultMap="customerMap">
     SELECT
     c.customer_id,
     c.customer_counsel_type,
@@ -498,7 +498,7 @@
         and ct.complaint_id = #{complaintId}
       </if>
       <if test="smallClassId != null and smallClassId != ''">
-        and s.small_class_id = #{smallClassId}
+        and csc.small_class_id = #{smallClassId}
       </if>
       <if test="customerIsVisit != null and customerIsVisit != ''">
         and c.customer_is_visit = #{customerIsVisit}
@@ -583,8 +583,9 @@
         )
       </if>
     </where>
+    GROUP BY c.customer_id
     ORDER BY c.customer_id desc
-  </select>-->
+  </select>
 
   <resultMap id="customerMap" type="CustomerInfo">
     <id column="customer_id" property="customerId"/>

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

@@ -7,9 +7,10 @@
     <result column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="fittings_id" property="fittingsId" jdbcType="INTEGER" />
     <result column="send_fitting_number" property="sendFittingNumber" jdbcType="INTEGER" />
+    <result column="color_bar" property="colorBar" />
   </resultMap>
   <sql id="Base_Column_List" >
-    send_fitting_id, relation_id, product_id, fittings_id, send_fitting_number
+    send_fitting_id, relation_id, product_id, fittings_id, send_fitting_number,color_bar
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -52,11 +53,11 @@
 
   <insert id="insert" parameterType="SendFitting" >
     insert into tb_rst_send_fitting ( relation_id, product_id,
-      fittings_id, send_fitting_number,send_fitting_type)
+      fittings_id, send_fitting_number,send_fitting_type,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (#{node.relationId}, #{node.productId},
-      #{node.fittingsId}, #{node.sendFittingNumber}, #{node.sendFittingType})
+      #{node.fittingsId}, #{node.sendFittingNumber}, #{node.sendFittingType}, #{node.colorBar})
     </foreach>
   </insert>
 
@@ -79,6 +80,9 @@
       <if test="sendFittingNumber != null" >
         send_fitting_number,
       </if>
+      <if test="colorBar != null" >
+        color_bar,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sendFittingId != null" >
@@ -96,6 +100,9 @@
       <if test="sendFittingNumber != null" >
         #{sendFittingNumber,jdbcType=INTEGER},
       </if>
+      <if test="colorBar != null" >
+        #{colorBar},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="SendFitting" >
@@ -113,15 +120,11 @@
       <if test="sendFittingNumber != null" >
         send_fitting_number = #{sendFittingNumber,jdbcType=INTEGER},
       </if>
+      <if test="colorBar != null" >
+        color_bar = #{colorBar},
+      </if>
     </set>
     where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="SendFitting" >
-    update tb_rst_send_fitting
-    set relation_id = #{relationId,jdbcType=INTEGER},
-      product_id = #{productId,jdbcType=INTEGER},
-      fittings_id = #{fittingsId,jdbcType=INTEGER},
-      send_fitting_number = #{sendFittingNumber,jdbcType=INTEGER}
-    where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}
-  </update>
+
 </mapper>

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

@@ -7,9 +7,10 @@
     <result column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="color_id" property="colorId" jdbcType="INTEGER" />
     <result column="send_prodcue_number" property="sendProdcueNumber" jdbcType="INTEGER" />
+    <result column="color_bar" property="colorBar" />
   </resultMap>
   <sql id="Base_Column_List" >
-    send_prodcue_id, relation_id, product_id, color_id, send_prodcue_number
+    send_prodcue_id, relation_id, product_id, color_id, send_prodcue_number,color_bar
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -52,12 +53,12 @@
 
   <insert id="insert" parameterType="SendProdcue" >
     insert into tb_rst_send_prodcue ( relation_id, product_id,
-      color_id, send_prodcue_number,send_produce_type)
+      color_id, send_prodcue_number,send_produce_type,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId},
-        #{node.colorId}, #{node.sendProdcueNumber}, #{node.sendProduceType}
+        #{node.colorId}, #{node.sendProdcueNumber}, #{node.sendProduceType}, #{node.colorBar}
       )
     </foreach>
 
@@ -81,6 +82,9 @@
       <if test="sendProdcueNumber != null" >
         send_prodcue_number,
       </if>
+      <if test="colorBar != null" >
+        color_bar,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sendProdcueId != null" >
@@ -98,6 +102,9 @@
       <if test="sendProdcueNumber != null" >
         #{sendProdcueNumber,jdbcType=INTEGER},
       </if>
+      <if test="colorBar != null" >
+        #{colorBar},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="SendProdcue" >
@@ -115,15 +122,10 @@
       <if test="sendProdcueNumber != null" >
         send_prodcue_number = #{sendProdcueNumber,jdbcType=INTEGER},
       </if>
+      <if test="colorBar != null" >
+        color_bar = #{colorBar},
+      </if>
     </set>
     where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="SendProdcue" >
-    update tb_rst_send_prodcue
-    set relation_id = #{relationId,jdbcType=INTEGER},
-      product_id = #{productId,jdbcType=INTEGER},
-      color_id = #{colorId,jdbcType=INTEGER},
-      send_prodcue_number = #{sendProdcueNumber,jdbcType=INTEGER}
-    where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}
-  </update>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/product/ProductServiceImpl.java

@@ -155,8 +155,8 @@ public class ProductServiceImpl implements ProductService {
     }
 
     @Override
-    public FittingsInfo getFittingsBySku(FittingsInfo fittingsInfo) {
-        return productMapper.getFittingsBySku(fittingsInfo);
+    public FittingsInfo getFittingsBySku(String colorBar) {
+        return productMapper.getFittingsBySku(colorBar);
     }
 
 

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/ProductMapper.java

@@ -92,5 +92,10 @@ public interface ProductMapper {
      * 根据sku查询配件信息
      * @return
      */
-    FittingsInfo getFittingsBySku(FittingsInfo fittingsInfo);
+    FittingsInfo getFittingsBySku(String colorBar);
+    /**
+     * 根据sku查询颜色信息
+     * @return
+     */
+    ProductColor getProductBySku(String colorBar);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -215,7 +215,7 @@
         WHERE ci.customer_id = #{customerId}
     </select>
     <!--根据sku查询配件信息 -->
-    <select id="getFittingsBySku" resultType="FittingsInfo" parameterType="FittingsInfo">
+    <select id="getFittingsBySku" resultType="FittingsInfo" parameterType="String">
         SELECT
         *
         FROM
@@ -223,5 +223,14 @@
         WHERE
         fittings_bar = #{fittingsBar}
     </select>
+    <!--根据sku查询配件信息 -->
+    <select id="getProductBySku" resultType="ProductColor" parameterType="String">
+        SELECT
+        *
+        FROM
+        tb_rst_product_color
+        WHERE
+        color_bar = #{colorBar}
+    </select>
 
 </mapper>

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

@@ -1,6 +1,5 @@
 package com.iamberry.rst.controllers.cm;
 
-import com.iamberry.rst.core.address.City;
 import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.Product;
 import com.iamberry.rst.core.order.ProductColor;
@@ -612,6 +611,7 @@ public class AdminCustomerController {
         StitchAttrUtil sa = StitchAttrUtil.getSa();
         sa.addDatePro("yyyy-MM-dd","startTime","endTime");
         sa.setModelAndView(customerInfo, mv, "/admin/customer/select_customer_list", pagedResult);
+
         long y = new Date().getTime();
         System.out.println("使用时间："+(y-x));
         return mv;

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

@@ -498,6 +498,7 @@
                                         <td style="text-align: center;">
                                             <input type="hidden" class="input-produce-id" value="${closedProdcues.productId}">
                                             <input type="hidden" class="input-fc-id" value="${closedProdcues.colorId}">
+                                            <input type="hidden" class="input-69code" value="${closedProdcues.colorBar}">
                                             <input type="text" class="input-text input-number" style="width: 100%;border: none;text-align: center;" value="${closedProdcues.closedProdcueMachineNo!""}" placeholder="机器编号" name="" id="item-${closedProdcues.productId}-${closedProdcues.colorId}" number="${closedProdcues.closedProdcueNumber}"  itemIsSource="1"  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >
                                         </td>
                                 </tr>
@@ -516,6 +517,7 @@
                                         <td style="text-align: center;">
                                             <input type="hidden" class="input-produce-id" value="${closedFittings.productId}">
                                             <input type="hidden" class="input-fc-id" value="${closedFittings.fittingsId}">
+                                            <input type="hidden" class="input-69code" value="${closedFittings.colorBar}">
                                             -
                                             <input type="hidden" class="input-text input-number" style="width: 100%;border: none;text-align: center;" value="" placeholder="机器编号" name="" id="item-${closedFittings.productId}-${closedFittings.fittingsId}" number="${closedFittings.closedFittingNumber}"  itemIsSource="1"  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >
                                         </td>

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

@@ -1401,6 +1401,7 @@ function setProduce(orderItemList) {
             + '<td style="text-align: center;" >'
             + '<input type="hidden" class="input-produce-id" value="' + item.itemProductId + '">'
             + '<input type="hidden" class="input-fc-id" value="' + item.itemColorId +'">'
+            + '<input type="hidden" class="input-69code" value="' + item.itemColorBar +'">'
             +  fiHtml
             + '<input type="'+ fiHidden +'" class="input-text input-number" style="width: 100%;border: none;text-align: center;" value="" placeholder="机器编号" name="" id="item-' + item.itemProductId + '-' + item.itemColorId +'" number="'+ item.itemNum +'"  itemIsSource="'+ item.itemIsSource +'"  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >'
             + '</td>'
@@ -1792,10 +1793,12 @@ function addCustomerReady(){
             if (number != null && number != "" && number != 0) {
                 var product = new Object();
                 var fittings = new Object();
-                product.productId = $(this).parent().find(".input-produce-id").val();
-                product.colorId = $(this).parent().find(".input-fc-id").val();
-                fittings.productId = $(this).parent().find(".input-produce-id").val();
-                fittings.fittingsId = $(this).parent().find(".input-fc-id").val();
+                // product.productId = $(this).parent().find(".input-produce-id").val();
+                // product.colorId = $(this).parent().find(".input-fc-id").val();
+                product.colorBar = $(this).parent().find(".input-69code").val();
+                // fittings.productId = $(this).parent().find(".input-produce-id").val();
+                // fittings.fittingsId = $(this).parent().find(".input-fc-id").val();
+                fittings.colorBar = $(this).parent().find(".input-69code").val();
                 if(itemIsSource == 1){ //产品颜色
                     product.sendProdcueNumber = number;
                     product.closedProdcueNumber = number;