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

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

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

@@ -610,4 +610,30 @@ public class CustomerCommon implements Serializable {
         }
         return customerCommon;
     }
+
+
+    /**
+     * 将所有的寄回寄出中的类型改为  type
+     * 售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
+     * @param type
+     */
+    public static void setProduceOrFitting(Integer type,CustomerCommon cc){
+        for (int i=0;i<cc.getSendProdcues().size();i++) {
+            cc.getSendProdcues().get(i).setSendProduceType(type);
+            cc.getSendProdcues().get(i).setRelationId(cc.getRelationId());
+        }
+        for (int i=0;i<cc.getSendFittings().size();i++) {
+            cc.getSendFittings().get(i).setSendFittingType(type);
+            cc.getSendFittings().get(i).setRelationId(cc.getRelationId());
+        }
+        for (int i=0;i<cc.getClosedProdcues().size();i++) {
+            cc.getClosedProdcues().get(i).setClosedProdcueType(type);
+            cc.getClosedProdcues().get(i).setRelationId(cc.getRelationId());
+        }
+        for (int i=0;i<cc.getClosedFittings().size();i++) {
+            cc.getClosedFittings().get(i).setClosedFittingType(type);
+            cc.getClosedFittings().get(i).setRelationId(cc.getRelationId());
+        }
+    }
+
 }

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

@@ -63,6 +63,11 @@ public class CustomerServiceImpl implements CustomerService {
     private AddressMapper addressMapper;      //地址
     @Autowired
     private ProductMapper productMapper;  //产品
+    @Autowired
+    private ComplaintSignclosedProductInfoMapper complaintSignclosedProductInfoMapper;
+    @Autowired
+    private FittingsInfoMapper fittingsInfoMapper;
+
 
     @Override
     public CustomerInfo getCustomerInfo(Integer customerId) {
@@ -105,7 +110,10 @@ public class CustomerServiceImpl implements CustomerService {
             }
         }
 
-        if (2 == customerInfo.getCustomerCounselType()) {
+        if (2 == customerInfo.getCustomerCounselType() &&
+                (customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5 ||
+                customerInfo.getCustomerIsSolve() == 6 || customerInfo.getCustomerIsSolve() == 7)
+                ){
             salesOrder = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
 
             CustomerCommon customerCommon = customerInfo.getCustomerCommon();
@@ -120,7 +128,7 @@ public class CustomerServiceImpl implements CustomerService {
             Map<String,Object> map;
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
-                    map = this.sendEfastOrder();  //换新需要向Efast推送一条换新发货的订单
+                    map = this.sendEfastOrder(customerCommon);  //换新需要向Efast推送一条换新发货的订单
                     if(map.get("status") == 1){
                         customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
                         complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
@@ -133,7 +141,7 @@ public class CustomerServiceImpl implements CustomerService {
                     this.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 4: //维修
-                    map = this.sendEfastOrder();  //维修需要向Efast推送一条维修发货的订单
+                    map = this.sendEfastOrder(customerCommon);  //维修需要向Efast推送一条维修发货的订单
                     if(map.get("status") == 1){
                         customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
                         complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
@@ -146,7 +154,7 @@ public class CustomerServiceImpl implements CustomerService {
                     this.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 5: //补发  不用创建仓储签收任务
-                    map = this.sendEfastOrder();  //补发需要向Efast推送一条发货的订单
+                    map = this.sendEfastOrder(customerCommon);  //补发需要向Efast推送一条发货的订单
                     if(map.get("status") == 1){
                         customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
                         complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
@@ -170,7 +178,7 @@ public class CustomerServiceImpl implements CustomerService {
             customerCommon.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储id
 
             Object object = CustomerCommon.getRelation(customerInfo.getCustomerIsSolve(), customerCommon);
-            Integer relationId;
+            Integer relationId = 0;
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
                     Renewed renewed = (Renewed) object;
@@ -199,7 +207,24 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
             }
             if (flag < 1) {
-                throw new Exception("添加客诉失败");
+                throw new Exception("添加客诉处理结果失败");
+            }
+
+            customerCommon.setRelationId(relationId);
+
+            CustomerCommon.setProduceOrFitting(customerInfo.getCustomerIsSolve(),customerCommon);
+
+            if(customerCommon.getClosedFittings()!=null && customerCommon.getClosedFittings().size() > 0){
+                closedFittingMapper.insert(customerCommon.getClosedFittings());
+            }
+            if(customerCommon.getClosedProdcues() != null && customerCommon.getClosedProdcues().size()>0){
+                closedProdcueMapper.insert(customerCommon.getClosedProdcues());
+            }
+            if(customerCommon.getSendProdcues() != null && customerCommon.getSendProdcues().size() > 0){
+                sendProdcueMapper.insert(customerCommon.getSendProdcues());
+            }
+            if(customerCommon.getSendFittings() != null && customerCommon.getSendFittings().size() > 0){
+                sendFittingMapper.insert(customerCommon.getSendFittings());
             }
         }
         return flag;
@@ -252,20 +277,58 @@ public class CustomerServiceImpl implements CustomerService {
         complaintSignclosedInfo.setSignclosedCustomerId(customerCommon.getCustomerId()); //客诉id
         flag = complaintSignclosedInfoMapper.insert(complaintSignclosedInfo);
         if(flag < 1){
-            throw new Exception("添加仓储任务失败");
+            throw new Exception("添加签收失败");
         }
+
         //添加代签收表
+        List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoArrayList = new ArrayList<>();
+        AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
+        awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
+        awaitingSignclosedProductInfo.setSignclosedProductType(1); //类型为产品
+        for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
+            ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
+            awaitingSignclosedProductInfo.setProductNum(closedProdcue.getClosedProdcueNumber());
+            awaitingSignclosedProductInfo.setSignclosedProductId(closedProdcue.getProductId());         //产品id
+            awaitingSignclosedProductInfo.setSignclosedProductColor(closedProdcue.getColorId());        //颜色id
+
+            Product product = productMapper.getProductById(closedProdcue.getProductId());
+            awaitingSignclosedProductInfo.setProductName(product.getProductName());
+
+            awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
+        }
+
+        awaitingSignclosedProductInfo.setSignclosedProductType(2);  //类型为配件
+        for(int i=0 ;i< customerCommon.getClosedFittings().size();i++){
+            ClosedFitting closedFitting = customerCommon.getClosedFittings().get(i);
+            awaitingSignclosedProductInfo.setProductNum(closedFitting.getClosedFittingNumber());
+            awaitingSignclosedProductInfo.setSignclosedProductId(closedFitting.getFittingsId());         //配件id
+            awaitingSignclosedProductInfo.setSignclosedProductColor(null);
+
+            FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(closedFitting.getFittingsId());
+            awaitingSignclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
+
+            awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
+        }
+
+        flag = complaintSignclosedProductInfoMapper.insertList(awaitingSignclosedProductInfoArrayList);
+        if(flag < 1){
+            throw new Exception("添加签收产品失败");
+        }
     }
 
     /**
-     * 像Efast推送订单  仅换新，维修 ,补发
+     * 向Efast推送订单  仅换新，维修 ,补发
      * @return
      */
-    public Map<String,Object> sendEfastOrder(){
+    public Map<String,Object> sendEfastOrder(CustomerCommon customerCommon){
         Map<String,Object> map = new HashMap<String,Object>();
         EfastOrderServiceImpl efastOrderService = new EfastOrderServiceImpl();
         List<EfastOrder> orderList = new ArrayList<EfastOrder>();
         List<OrderItem> itemList = new ArrayList<OrderItem>();
+
+        EfastOrder efastOrder = new EfastOrder();
+        efastOrder.setOrderAddressName(customerCommon.getRelationSendName());//收货人姓名
+
 //        try {
 //            efastOrderService.sendOrderInfoToEfast(orderList,itemList);
 //        } catch (Exception e) {

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

@@ -7,7 +7,7 @@ import java.util.List;
 public interface ClosedFittingMapper {
     int deleteByPrimaryKey(Integer closedFittingId);
 
-    int insert(ClosedFitting record);
+    int insert(List<ClosedFitting> record);
 
     ClosedFitting selectByPrimaryKey(Integer closedFittingId);
 

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

@@ -7,7 +7,7 @@ import java.util.List;
 public interface ClosedProdcueMapper {
     int deleteByPrimaryKey(Integer closedProdcueId);
 
-    int insert(ClosedProdcue record);
+    int insert(List<ClosedProdcue> record);
 
     int insertSelective(ClosedProdcue record);
 

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.cm.mapper;
 
+import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
 import com.iamberry.rst.core.cm.SignclosedProductInfo;
 
 import java.util.List;
@@ -13,6 +14,13 @@ public interface ComplaintSignclosedProductInfoMapper {
      * @return
      */
     int insert(SignclosedProductInfo record);
+
+    /**
+     * 添加签收  产品集合
+     * @return
+     */
+    int insertList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList);
+
     /**
      * 查询单个签收产品记录
      * @return

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

@@ -7,7 +7,7 @@ import java.util.List;
 public interface SendFittingMapper {
     int deleteByPrimaryKey(Integer sendFittingId);
 
-    int insert(SendFitting record);
+    int insert(List<SendFitting> record);
 
     int insertSelective(SendFitting record);
 

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

@@ -7,7 +7,7 @@ import java.util.List;
 public interface SendProdcueMapper {
     int deleteByPrimaryKey(Integer sendProdcueId);
 
-    int insert(SendProdcue record);
+    int insert(List<SendProdcue> record);
 
     int insertSelective(SendProdcue record);
 

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

@@ -55,7 +55,7 @@
     delete from tb_rst_back_goods
     where back_goods_id = #{backGoodsId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="BackGoods" >
+  <insert id="insert" parameterType="BackGoods" useGeneratedKeys="true"  keyProperty="backGoodsId">
     insert into tb_rst_back_goods (customer_id, order_id,
       signclosed_id, back_goods_back_status, back_goods_back_name, 
       back_goods_back_tel, back_goods_back_logistics_company, 

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

@@ -18,10 +18,14 @@
     where closed_fitting_id = #{closedFittingId,jdbcType=INTEGER}
   </select>
   <insert id="insert" parameterType="ClosedFitting" >
-    insert into tb_rst_closed_fitting (closed_fitting_id, relation_id, product_id, 
-      fittings_id, closed_fitting_number)
-    values (#{closedFittingId,jdbcType=INTEGER}, #{relationId,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, 
-      #{fittingsId,jdbcType=INTEGER}, #{closedFittingNumber,jdbcType=INTEGER})
+    insert into tb_rst_closed_fitting
+    (
+      relation_id, product_id,fittings_id, closed_fitting_number,closed_fitting_type
+    )
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      ( #{node.relationId}, #{node.productId}, #{node.fittingsId}, #{node.closedFittingNumber},#{node.closedFittingType})
+    </foreach>
   </insert>
 
   <!-- 获取寄回配件集合 -->

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

@@ -21,12 +21,19 @@
     delete from tb_rst_closed_prodcue
     where closed_prodcue_id = #{closedProdcueId,jdbcType=INTEGER}
   </delete>
+
   <insert id="insert" parameterType="ClosedProdcue" >
-    insert into tb_rst_closed_prodcue (closed_prodcue_id, relation_id, product_id, 
-      color_id, closed_prodcue_number)
-    values (#{closedProdcueId,jdbcType=INTEGER}, #{relationId,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, 
-      #{colorId,jdbcType=INTEGER}, #{closedProdcueNumber,jdbcType=INTEGER})
+    insert into tb_rst_closed_prodcue ( relation_id, product_id,
+      color_id, closed_prodcue_number,closed_prodcue_type)
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      (
+        #{node.relationId}, #{node.productId},
+       #{node.colorId}, #{node.closedProdcueNumber},#{node.closedProdcueType}
+      )
+    </foreach>
   </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="ClosedProdcue" >
     update tb_rst_closed_prodcue
     <set >

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

@@ -52,6 +52,19 @@
       )
   </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
+      )
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      (
+        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}
+      )
+    </foreach>
+  </insert>
+
   <update id="updateSignclosedById" parameterType="SignclosedProductInfo" >
     update tb_rst_complaint_signclosed_product
     <set >

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

@@ -56,7 +56,7 @@
     delete from tb_rst_noreason_back
     where noreason_back_id = #{noreasonBackId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="NoreasonBack" >
+  <insert id="insert" parameterType="NoreasonBack" useGeneratedKeys="true"  keyProperty="noreasonBackId">
     insert into tb_rst_noreason_back (customer_id, order_id,
       signclosed_id, noreason_back_back_status, noreason_back_back_name, 
       noreason_back_back_tel, noreason_back_back_logistics_company, 

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

@@ -56,7 +56,7 @@
     delete from tb_rst_reissue
     where reissue_id = #{reissueId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="Reissue" >
+  <insert id="insert" parameterType="Reissue"   useGeneratedKeys="true"  keyProperty="reissueId">
     insert into tb_rst_reissue (customer_id, order_id,
       reissue_back_efast_order_id, reissue_send_status, 
       reissue_send_name, reissue_send_tel, province_number, 

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

@@ -110,7 +110,7 @@
     delete from tb_rst_renewed
     where renewed_id = #{renewedId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="Renewed" >
+  <insert id="insert" parameterType="Renewed"  useGeneratedKeys="true"  keyProperty="renewedId">
     insert into tb_rst_renewed (customer_id, order_id,
       signclosed_id, renewed_back_efast_order_id, 
       renewed_back_status, renewed_back_name, renewed_back_tel, 

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

@@ -100,7 +100,7 @@
     delete from tb_rst_repair
     where repair_id = #{repairId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="Repair" >
+  <insert id="insert" parameterType="Repair" useGeneratedKeys="true"  keyProperty="repairId">
     insert into tb_rst_repair (customer_id, order_id,
       signclosed_id, repair_back_efast_order_id, repair_back_status, 
       repair_back_name, repair_back_tel, repair_back_logistics_company, 

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

@@ -39,12 +39,19 @@
     delete from tb_rst_send_fitting
     where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}
   </delete>
+
+
   <insert id="insert" parameterType="SendFitting" >
-    insert into tb_rst_send_fitting (send_fitting_id, relation_id, product_id, 
-      fittings_id, send_fitting_number)
-    values (#{sendFittingId,jdbcType=INTEGER}, #{relationId,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, 
-      #{fittingsId,jdbcType=INTEGER}, #{sendFittingNumber,jdbcType=INTEGER})
+    insert into tb_rst_send_fitting ( relation_id, product_id,
+      fittings_id, send_fitting_number,send_fitting_type)
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      (#{node.relationId}, #{node.productId},
+      #{node.fittingsId}, #{node.sendFittingNumber}, #{node.sendFittingType})
+    </foreach>
   </insert>
+
+
   <insert id="insertSelective" parameterType="SendFitting" >
     insert into tb_rst_send_fitting
     <trim prefix="(" suffix=")" suffixOverrides="," >

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

@@ -40,12 +40,20 @@
     delete from tb_rst_send_prodcue
     where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}
   </delete>
+
   <insert id="insert" parameterType="SendProdcue" >
-    insert into tb_rst_send_prodcue (send_prodcue_id, relation_id, product_id, 
-      color_id, send_prodcue_number)
-    values (#{sendProdcueId,jdbcType=INTEGER}, #{relationId,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, 
-      #{colorId,jdbcType=INTEGER}, #{sendProdcueNumber,jdbcType=INTEGER})
+    insert into tb_rst_send_prodcue ( relation_id, product_id,
+      color_id, send_prodcue_number,send_produce_type)
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      (
+        #{node.relationId}, #{node.productId},
+        #{node.colorId}, #{node.sendProdcueNumber}, #{node.sendProduceType}
+      )
+    </foreach>
+
   </insert>
+
   <insert id="insertSelective" parameterType="SendProdcue" >
     insert into tb_rst_send_prodcue
     <trim prefix="(" suffix=")" suffixOverrides="," >

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

@@ -435,10 +435,10 @@ public class AdminCustomerController {
                                     String sendProdcuesJson, String sendFittingsJson, String closedProdcuesJson, String closedFittingsJson) throws Exception {
         Integer flag = 0;
         JSONArray jsonArray;
-        List<SendProdcue> sendProdcueList = new ArrayList<>();
-        List<SendFitting> sendFittingList = new ArrayList<>();
-        List<ClosedProdcue> closedProdcueList = new ArrayList<>();
-        List<ClosedFitting> closedFittingList = new ArrayList<>();
+        List<SendProdcue> sendProdcueList ;
+        List<SendFitting> sendFittingList ;
+        List<ClosedProdcue> closedProdcueList ;
+        List<ClosedFitting> closedFittingList ;
 
         jsonArray = JSONArray.fromObject(sendProdcuesJson);
         sendProdcueList = (List) JSONArray.toCollection(jsonArray, SendProdcue.class);

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

@@ -1473,9 +1473,9 @@
                 if (data) {
                     var index = layer.alert(data.resultMsg, function () {
                         if (data.resultCode == 200) {
-                            //location.href = "${path}/admin/bom/_bom_list";
+                            location.href = "${path}/admin/customer/select_customer_list";
                         } else {
-                            //layer.close(index);
+                            layer.msg(data.resultMsg, {icon: 5, time: 3000});
                         }
                         return ;
                     });
@@ -1532,11 +1532,12 @@
                 var product = new Object();
                 product.productId = $(this).parent().find(".input-produce-id").val();
                 product.colorId = $(this).parent().find(".input-color-id").val();
-                product.closedProdcueNumber = $(this).val();
                 //换新、维修，退货，无理由退货，
                 if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 6 || allCustomerType == 7){
+                    product.closedProdcueNumber = number;
                     closedProdcues.push(product);
                 }else if(allCustomerType == 5){
+                    product.sendProdcueNumber = number;
                     sendProdcues.push(product);
                 }
             }
@@ -1548,11 +1549,12 @@
                 var fittings = new Object();
                 fittings.productId = $(this).parent().find(".input-produce-id").val();
                 fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
-                fittings.sendFittingNumber = $(this).val();
                 //换新、维修，退货，无理由退货，
                 if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 6 || allCustomerType == 7){
+                    fittings.closedFittingNumber = number;
                     closedFittings.push(fittings);
                 }else if(allCustomerType == 5){
+                    fittings.sendFittingNumber = number;
                     sendFittings.push(fittings);
                 }
             }
@@ -1565,8 +1567,8 @@
                 if(allCustomerType == 3 || allCustomerType == 4){
                     var fittings = new Object();
                     fittings.productId = $(this).parent().find(".input-produce-id").val();
-                    fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
-                    fittings.sendFittingNumber = $(this).val();
+                    fittings.colorId = $(this).parent().find(".input-color-id").val();
+                    fittings.sendProdcueNumber = number;
                     sendProdcues.push(fittings);
                 }
             }
@@ -1580,7 +1582,7 @@
                     var fittings = new Object();
                     fittings.productId = $(this).parent().find(".input-produce-id").val();
                     fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
-                    fittings.sendFittingNumber = $(this).val();
+                    fittings.sendFittingNumber = number;
                     sendFittings.push(fittings);
                 }
             }