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

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

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

@@ -338,6 +338,7 @@
                 </if>
             </if>
         </where>
+        ORDER BY t.sales_id DESC
     </select>
 
 </mapper>

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

@@ -1100,8 +1100,12 @@ public class AwaitSendController {
                     }
                 }
                 row.add(salesShoppingStatus);
-                row.add(salesOrder.getSalesDistributionTime() == null ? formatter.format(salesOrder.getSalesSendTime()):formatter.format(salesOrder.getSalesDistributionTime()));  //salesDistributionTime
-                row.add(salesOrder.getSalesSendTime() == null ? null:formatter.format(salesOrder.getSalesSendTime()));
+                if(salesOrder.getSalesDistributionTime() != null && salesOrder.getSalesSendTime() != null){
+                    row.add(salesOrder.getSalesDistributionTime() == null ? formatter.format(salesOrder.getSalesSendTime()):formatter.format(salesOrder.getSalesDistributionTime()));  //salesDistributionTime
+                }else{
+                    row.add("未通知配货");
+                }
+                row.add(salesOrder.getSalesSendTime() == null ? "未发货":formatter.format(salesOrder.getSalesSendTime()));
 
                 String salesDeliver = "";
                 if(salesOrder.getSalesDeliver() == null){

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

@@ -40,9 +40,17 @@
             ${salesPostFirm!''}
         </div>
 
+        <#assign code='' />
+        <#if orderSalesPostFirm??>
+            <#if salesId??>
+                <#if orderSalesPostFirm == "02"><#assign code='000000'+salesId /></#if>
+                <#if orderSalesPostFirm == "pick"><#assign code='000000'+salesId /></#if>
+            </#if>
+        </#if>
+
         <div class="input-box"  >
             <span class="input-dic spanhidth" style="margin-top: 5px;margin-left: 110px;">快递单号：</span>
-            <input type="text" class="input-text" style="height: 36px;width: 200px;margin-left: 10px;" value="<#if orderSalesPostFirm??><#if salesId??><#if orderSalesPostFirm == "02">000000${salesId!''}</#if></#if></#if>" placeholder="快递单号" id="salesPostNum" name="salesPostNum">
+            <input type="text" class="input-text" style="height: 36px;width: 200px;margin-left: 10px;" value="${code!''}" placeholder="快递单号" id="salesPostNum" name="salesPostNum">
         </div>
 
         <div style="text-align:center;" >

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

@@ -87,7 +87,7 @@ $(function(){
                 vailErrorMsg($(".add-order-button"),"必须要有一个产品");
                 return false;
             }
-            if($("#isdetectId").val() != ""){
+            if(isEmpty($("#isdetectId").val())){
                 if (!$("[name='detectId']").get(0).checked) {
                     vailErrorMsg($(".add-order-button"),"维修类型的售后订单，如果有需要寄给用户的机器，请勾选维修记录");
                     return false;