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

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

@@ -62,6 +62,7 @@ public class SalesOrder implements Serializable {
     private String salesOrderStatusProcTypeName;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- TODO: 2019/1/4 改为 ProcTypeId
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
     private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
+    private Integer salesOldDeliver;            //过去的状态 - 出库状态  1：未出库   2：已出库
     private Date salesDeliverTime;            //出库时间
     private Integer salesPayStatus;         //付款状态 0(未付款)2(已付款)
     private Integer salesProcessStatus;     //单据状态  0(正常单)1(问题单)
@@ -695,6 +696,14 @@ public class SalesOrder implements Serializable {
         this.salesDeliver = salesDeliver;
     }
 
+    public Integer getSalesOldDeliver() {
+        return salesOldDeliver;
+    }
+
+    public void setSalesOldDeliver(Integer salesOldDeliver) {
+        this.salesOldDeliver = salesOldDeliver;
+    }
+
     public String getSalesAdminName() {
         return salesAdminName;
     }

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

@@ -1081,21 +1081,23 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     @Transactional
     @Override
-    public Integer updateDeliver(SalesOrder salesOrder) {
+    public synchronized Integer updateDeliver(SalesOrder salesOrder) {
+        Integer flag = salesOrderMapper.updateDeliver(salesOrder);
+        if(flag < 1){
+            throw new RuntimeException("出库失败,订单出库失败。");
+        }
+
         if(salesOrder.getSalesDeliver() == 2){//标记出库，修改库存
             if(!salesOrderService.updateInventory(salesOrder.getSalesId(),salesOrder.getSalesWarehouseId())){
-                return 0;
+                throw new RuntimeException("出库失败,【出库】库存修改失败。");
             }
         }
+
         if(salesOrder.getSalesDeliver() == 1){//标记未出库，修改库存
             if(!salesOrderService.returnInventory(salesOrder.getSalesId(),salesOrder.getSalesWarehouseId())){
-                return 0;
+                throw new RuntimeException("出库失败,【返还库存】库存修改失败。");
             }
         }
-        Integer flag = salesOrderMapper.updateDeliver(salesOrder);
-        if(flag < 1){
-            throw new RuntimeException("出库失败,订单出库失败。");
-        }
         return flag;
     }
 
@@ -1118,7 +1120,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             if(info != null){
                 if(info.getInventoryGoodProductNum() >= item.getItemNum()){
                     info.setInventoryGoodProductNum(info.getInventoryGoodProductNum() - item.getItemNum());
-                    info.setInventoryRecentRecord(sdf.format(new Date())+"出库："+item.getItemNum()+"件");
+                    info.setInventoryRecentRecord(sdf.format(new Date())+"出库："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                     Integer flag =  inventoryMapper.updateById(info);
                     if(flag < 1){
                         throw new RuntimeException("【出库】更新库存失败，库存修改失败。");
@@ -1130,18 +1132,18 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     inventoryLog.setLogRemainingNum(item.getItemNum());
                     inventoryLog.setLogType(2);
                     inventoryLog.setLogOperationType(2);
-                    inventoryLog.setLogDesc(sdf.format(new Date())+"待发货标记出库："+item.getItemNum()+"件");
+                    inventoryLog.setLogDesc(sdf.format(new Date())+"待发货标记出库："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                     inventoryLog.setLogQualityType(1);
                     inventoryLog.setLogWarehouseId(salesWarehouseId);
                     flag = inventoryLogMapper.insert(inventoryLog);
                     if(flag < 1){
-                        throw new RuntimeException("更新库存失败，增加库存记录失败。");
+                        throw new RuntimeException("【出库】更新库存失败，增加库存记录失败。");
                     }
                 }else{
-                    throw new RuntimeException("更新库存失败，"+ warehouseName +"["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存不足。");
+                    throw new RuntimeException("【出库】更新库存失败，"+ warehouseName +"["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存不足。");
                 }
             }else{
-                throw new RuntimeException("更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
+                throw new RuntimeException("【出库】更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
             }
         }
         return true;
@@ -1152,7 +1154,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public boolean returnInventory(Integer salesId,Integer salesWarehouseId){
         OrderWarehouse orderWarehouse = orderWarehouseService.getOrderWarehouseById(salesWarehouseId);
         if(orderWarehouse == null){
-            throw new RuntimeException("【出库】更新库存失败，查询仓库信息失败。");
+            throw new RuntimeException("【返还库存】更新库存失败，查询仓库信息失败。");
         }
         String warehouseName = orderWarehouse.getWarehouseName();
 
@@ -1164,7 +1166,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             InventoryInfo info = inventoryMapper.getByInventoryByBar(item.getItemColorBar(),salesWarehouseId);
             if(info != null){
                 info.setInventoryGoodProductNum(info.getInventoryGoodProductNum() + item.getItemNum());
-                info.setInventoryRecentRecord(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件");
+                info.setInventoryRecentRecord(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                 Integer flag = inventoryMapper.updateById(info);
                 if(flag < 1){
                     throw new RuntimeException("【返还库存】更新库存失败，库存修改失败。");
@@ -1176,15 +1178,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 inventoryLog.setLogRemainingNum(item.getItemNum());
                 inventoryLog.setLogType(1);
                 inventoryLog.setLogOperationType(1);
-                inventoryLog.setLogDesc(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件");
+                inventoryLog.setLogDesc(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                 inventoryLog.setLogQualityType(1);
                 inventoryLog.setLogWarehouseId(salesWarehouseId);
                 flag = inventoryLogMapper.insert(inventoryLog);
                 if(flag < 1){
-                    throw new RuntimeException("更新库存失败，增加库存记录失败。");
+                    throw new RuntimeException("【返还库存】更新库存失败，增加库存记录失败。");
                 }
             }else{
-                throw new RuntimeException("更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
+                throw new RuntimeException("【返还库存】更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
             }
 
         }

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

@@ -1336,6 +1336,7 @@
         WHERE
           sales_post_num = #{salesPostNum}
         AND sales_id = #{salesId}
+        AND sales_deliver = #{salesOldDeliver}
         AND sales_shipping_status = 1
     </update>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -56,7 +56,10 @@
       cd.detect_completion_time detectCompletionTime,
       cd.maintenance_completion_time maintenanceCompletionTime,
       cd.renovation_completion_time renovationCompletionTime,
-      cd.scrap_completion_time scrapCompletionTime
+      cd.scrap_completion_time scrapCompletionTime,
+      qd.describe_content describeContent,
+      qd.describe_handle_desc describeHandleDesc,
+      sa.admin_name adminName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryMapper.xml

@@ -73,6 +73,7 @@
   <select id="listByInventoryId" resultMap="BaseResultMap" parameterType="InventoryInfo" >
     select
     fi.inventory_id,
+    fi.warehouse_id,
     fi.inventory_product_name,
     fi.inventory_product_bar,
     fi.inventory_remaining_num,

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -620,6 +620,7 @@ public class AwaitSendController {
             return rj;
         }
         salesOrder.setSalesDeliver(2);
+        salesOrder.setSalesOldDeliver(1);
         Integer flag = 0;
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
@@ -796,32 +797,43 @@ public class AwaitSendController {
     @RequiresPermissions("salesOrder:markDeliver:deliverList")
     @RequestMapping("/markDeliver")
     public ResponseJson markDeliver(HttpServletRequest request,Integer salesId, Integer type) {
+        ResponseJson rj = ResponseJson.getFAILURE();
         if(salesId == null || type == null){
             return ResponseJson.getFAILURE();
         }
-        ResponseJson rj = ResponseJson.getSUCCESS();
 
         SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
         if(salesOrder == null){
-            rj.setResultMsg("出货失败，该订单号未查询到订单。");
+            rj.setResultMsg("标记失败，该订单号未查询到订单。");
             return rj;
         }
         if(salesOrder.getSalesShippingStatus() != 1){
-            rj.setResultMsg("出货失败，该订单未发货。");
+            rj.setResultMsg("标记失败，该订单未发货。");
             return rj;
         }
 
+        if(type == salesOrder.getSalesDeliver()){
+            if(type == 1){
+                rj.setResultMsg("标记未出库失败，该订单已标记为未出库。");
+                return rj;
+            }else  if(type == 2){
+                rj.setResultMsg("标记出库失败，该订单已标记为已出库。");
+                return rj;
+            }
+        }
+
+        salesOrder.setSalesOldDeliver(salesOrder.getSalesDeliver());
         salesOrder.setSalesDeliver(type);
         Integer flag = 0;
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
         }catch (Exception e){
-            rj.setResultMsg("出货失败;</br>原因："+e.getMessage());
+            rj.setResultMsg("标记失败;</br>原因："+e.getMessage());
             return rj;
         }
 
         if(flag < 1){
-            rj.setResultMsg("出货失败，请检查该订单的发货状态及产品库存是否充足。");
+            rj.setResultMsg("标记失败，请检查该订单的发货状态及产品库存是否充足。");
             return rj;
         }
         rj = ResponseJson.getSUCCESS();

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/InventoryController.java

@@ -140,6 +140,9 @@ public class InventoryController {
         List<WarehouseInfo> warehouseList = inventoryLogService.listFactoryInfo();
         mv.addObject("warehouseList",warehouseList);*/
         StitchAttrUtil.getSa().setModelAndView(inventoryLog, mv, "/admin/inventory/select_inventoryLog_list", result);
+
+        InventoryInfo inventoryInfo = inventoryService.getByInventoryByBar(inventoryLog.getLogProductBar(),inventoryLog.getLogWarehouseId());
+        mv.addObject("inventoryInfo",inventoryInfo);
         return mv;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/scm/AdminScmOrderController.java

@@ -300,7 +300,7 @@ public class AdminScmOrderController {
     @ResponseBody
     @RequestMapping("/get_order")
     @RequiresPermissions(value = {"scmOrder:order:add", "scmOrder:update:add", "scmOrder:order:list", "scmOrder:order:send"}, logical = Logical.OR)
-    public ResponseJson addSalesOrder(HttpServletRequest request,ScmOrderInfo scmOrderInfo) throws Exception {
+    public ResponseJson getOrder(HttpServletRequest request,ScmOrderInfo scmOrderInfo) throws Exception {
         if(scmOrderInfo.getOrderId() == null && (scmOrderInfo.getOrderMadeId() == null||"".equals(scmOrderInfo.getOrderMadeId())) &&
                 (scmOrderInfo.getOrderNo() == null || "".equals(scmOrderInfo.getOrderNo()))){
             return new ResponseJson(500, "查询失败", 500);

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

@@ -33,13 +33,12 @@
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="手机号码" id="customerTel" name="customerTel">
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">处理结果</option>
-                <option value="1" >已解决</option>
-                <option value="2" >未解决</option>
-                <option value="3" >换新</option>
-                <option value="4" >维修</option>
+                <option value="1" >操作指导</option>
+                <option value="2" >换货</option>
+                <option value="3" >维修</option>
+                <option value="4" >退货</option>
                 <option value="5" >补发</option>
-                <option value="6" >退货</option>
-                <option value="7" >无理由退货</option>
+                <option value="6" >其他</option>
             </select>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;height: 35px;margin-bottom: 10px;"name="" onclick="searchOrder()"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>

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

@@ -1093,9 +1093,9 @@
                     <div class="formControls col-12 col-sm-12">
                             <div class="row cl" >
                                 <div class="formControls col-2 col-sm-2 text-r">
-                                    <strong>检测ID：</strong>
+                                    <strong>维修编号：</strong>
                                 </div>
-                                <div class="formControls col-4 col-sm-4" id="detectIdDiv">
+                                <div class="formControls col-4 col-sm-4" id="detectNumberDiv">
 
                                 </div>
                                 <div class="formControls col-2 col-sm-2 text-r">
@@ -2773,7 +2773,7 @@
                     }else{
                         detectOfferName = "0元";
                     }
-                    $("#detectIdDiv").html("");
+                    $("#detectNumberDiv").html("");
                     $("#detectStateDIV").html("");
                     $("#productTypeNameDIV").html("");
                     $("#detectOfferDIV").html("");
@@ -2788,7 +2788,7 @@
                     $("#imgDiv").html();
 
 
-                    $("#detectIdDiv").html(detectInfo.detectId);
+                    $("#detectNumberDiv").html(detectInfo.detectNumber);
                     $("#detectStateDIV").html(detectStateName);
                     $("#productTypeNameDIV").html(detectInfo.productName+"("+detectInfo.colorName+")");
                     $("#detectOfferDIV").html(detectOfferName);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventoryLog_list.ftl

@@ -29,6 +29,10 @@
             text-overflow: ellipsis;
         }
 
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
+
+
     </style>
 </head>
 <body>
@@ -38,6 +42,17 @@
     <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
+
+    <div class="row cl" style="    margin-bottom: 20px;">
+        <label class="form-label col-12">
+            <div class="tit-2">产品名称：${inventoryInfo.inventoryProductName!''}(${inventoryInfo.productColorName!''}-${inventoryInfo.inventoryProductBar!''})</div>
+        </label>
+        <div class="formControls col-9">
+        </div>
+    </div>
+
+    <#--<pre style="font-size: 12px;margin-top: -1%;">产品名称：${inventoryInfo.inventoryProductName!''}(${inventoryInfo.productColorName!''}-${inventoryInfo.inventoryProductBar!''})</pre>-->
+
     <div class="text-c">
         <form name="form1" action="${path}/admin/inventory/select_inventoryLog_list" method="post">
         <#--<input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
@@ -74,13 +89,14 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
-                <th width="100">产品名称</th>
-                <th width="100">产品sku</th>
+                <th width="35">时间</th>
+                <#--<th width="100">产品名称</th>-->
+                <#--<th width="100">产品sku</th>-->
                 <#--<th width="100">仓库名称</th>-->
-                <th width="100">变动数量</th>
-                <th width="100">类型</th>
-                <th width="100">质量类型</th>
-                <th width="100">操作类型</th>
+                <th width="20">变动数量</th>
+                <th width="20">类型</th>
+                <th width="20">质量类型</th>
+                <th width="20">操作类型</th>
                 <th width="100">备注</th>
             </tr>
             </thead>
@@ -88,11 +104,14 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as info>
                 <tr>
-                    <td class="text-c" width="100">${info.logProductName!}</td>
-                    <td class="text-c" width="100">${info.logProductBar!}</td>
+                    <td class="text-c" width="35">
+                        ${(info.logCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}
+                    </td>
+                    <#--<td class="text-c" width="100">${info.logProductName!}</td>-->
+                    <#--<td class="text-c" width="100">${info.logProductBar!}</td>-->
                     <#--<td class="text-c" width="100">${info.logWarehouseName!}</td>-->
-                    <td class="text-c" width="100">${info.logRemainingNum!}</td>
-                    <td class="text-c" width="100">
+                    <td class="text-c" width="20">${info.logRemainingNum!}</td>
+                    <td class="text-c" width="20">
                         <#if info.logType == 1>
                             采购
                         </#if>
@@ -103,7 +122,7 @@
                             次品
                         </#if>
                     </td>
-                    <td class="text-c" width="100">
+                    <td class="text-c" width="20">
                         <#if info.logOperationType == 1>
                             入库
                         </#if>
@@ -111,7 +130,7 @@
                             出库
                         </#if>
                     </td>
-                    <td class="text-c" width="100">
+                    <td class="text-c" width="20">
                         <#if info.logQualityType??>
                             <#if info.logQualityType == 1>
                                 良品
@@ -121,7 +140,8 @@
                             </#if>
                         </#if>
                     </td>
-                    <td class="text-c" width="100">${info.logDesc!}</td>
+                    <td class="" width="100">${info.logDesc!}</td>
+
                 </tr>
                 </#list>
             <#else >

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl

@@ -123,7 +123,7 @@
                             <i class="Hui-iconfont">出库</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="出入库记录"
-                           onclick="getInventoryLog('${path}/admin/inventory/select_inventoryLog_list?logProductBar=${info.inventoryProductBar!''}');">
+                           onclick="getInventoryLog('${path}/admin/inventory/select_inventoryLog_list?logProductBar=${info.inventoryProductBar!''}&logWarehouseId=${info.warehouseId!''}');">
                             <i class="Hui-iconfont">出入库记录</i>
                         </a>
                     </td>

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

@@ -50,13 +50,13 @@
                 <#--<label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>-->
             <#--</div>-->
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人姓名：</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人姓名：</label>
                 <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                     <input type="text" style="" value="${complaintSignclosedInfo.signclosedSendName!''}" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人电话：</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人电话：</label>
                 <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                     <input type="text" style="" value="${complaintSignclosedInfo.signclosedSendTel!''}" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
@@ -132,7 +132,7 @@
 
     function  update() {
         var signclosedSendName = $("#signclosedSendName").val();
-        if( signclosedSendName == null || signclosedSendName == "" ){
+        /*if( signclosedSendName == null || signclosedSendName == "" ){
             layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
             return;
         }
@@ -153,7 +153,7 @@
         if(!myreg.test(signclosedSendTel)){
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
-        }
+        }*/
         var signclosedLogisticsNumber = $("#signclosedLogisticsNumber").val();
         if( signclosedLogisticsNumber == null || signclosedLogisticsNumber == "" ){
             layer.msg('物流单号不能为空',{icon: 5,time:1000});

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

@@ -98,6 +98,7 @@
                             <tbody id="detect_product">
                             </tbody>
                         </table>
+                        <input type="hidden" value="" id="isdetectId">
                     </div>
                 </div>
             </div>

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

@@ -371,7 +371,7 @@
                 dataType: 'json',
                 type: 'post',
                 success: function(dt) {
-                    if(dt.resultCode == 200){
+                    if(dt.resultCode == 200 && dt.returnCode == 200){
                         layer.msg(dt.resultMsg, {icon: 1, time: 3000});
                     }else{
                         layer.msg(dt.resultMsg, {icon: 5, time: 3000});

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

@@ -87,6 +87,13 @@ $(function(){
                 vailErrorMsg($(".add-order-button"),"必须要有一个产品");
                 return false;
             }
+            if($("#isdetectId").val() != ""){
+                if (!$("[name='detectId']").get(0).checked) {
+                    vailErrorMsg($(".add-order-button"),"维修类型的售后订单，如果有需要寄给用户的机器，请勾选维修记录");
+                    return false;
+                }
+            }
+
 
             $("#orderItemString").val(JSON.stringify(orderItemArray));
 
@@ -170,6 +177,7 @@ function setSelectCustomer(customerId){
                 //回显售后数据
                 var listDetet = data.returnMsg.listDetet;
                 if(listDetet.length > 0){
+                    $("#isdetectId").val(listDetet.length);
                     var html = "";
                     $("#all_detect_product").show();
                     for(var i=0;i<listDetet.length;i++){