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

# Conflicts接入京东电子面单打印

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

@@ -1483,8 +1483,6 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     inventoryInfo2.setInventoryRecentRecord("出库-订单号:"+ so.getSalesDealCode());
                     inventoryService.minusInventory(inventoryInfo2);
                 }
-            }else{
-                throw new RuntimeException("出库失败");
             }
         }
         return flag;

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

@@ -67,7 +67,7 @@
                 </div>
 
                 <div class="formControls col-1 col-sm-1" style="width: 100px;">
-                    <input type="submit" style="" class="btn btn-primary add-order-button"  value="出库" >
+                    <input type="submit" style="" id="submitId" class="btn btn-primary add-order-button"  value="出库" >
                 </div>
             </div>
 
@@ -215,6 +215,17 @@
 
 <script>
     $(function (){
+        //监听文本框内容
+        $('#postNum').on('input propertychange', function() {//监听文本框
+            console.log($('#postNum').val());
+            var str=$('#postNum').val();
+            var tag='JD';
+            console.log(str.indexOf(tag));
+            if(str.indexOf(tag)!=-1){
+                    $("#submitId").trigger("click");
+            }
+        });
+
 //        getdeliver(1);
 //        getdeliver(2);
         $.ajax({