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

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

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

@@ -140,6 +140,7 @@
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
         LEFT JOIN tb_rst_dm_claim_order dco on soi.item_id=dco.item_id
         <where>
+            AND sales_batch_id != 'KS00000000000001'
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>
@@ -283,6 +284,7 @@
         LEFT JOIN tb_rst_sys_admin sa ON t.sales_admin_id = sa.admin_id
         LEFT JOIN tb_rst_dm_claim_order dco on soi.item_id=dco.item_id
         <where>
+            AND sales_batch_id != 'KS00000000000001'
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>

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

@@ -792,6 +792,7 @@ public class AdminOrderController {
         titles.add("商品名称");
         //titles.add("商品颜色");
         titles.add("商品数量");
+        titles.add("退货数量");
         titles.add("销售公司名称");
         titles.add("店铺名称");
         titles.add("出库日期");
@@ -844,7 +845,8 @@ public class AdminOrderController {
                 row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
                 //row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
-                row.add((salesOrder.getItemNum() - salesOrder.getItemReturnNum()));
+                row.add(salesOrder.getItemNum());
+                row.add(salesOrder.getItemReturnNum());
                 row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
                 row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));

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

@@ -298,7 +298,7 @@
 
             <div class="row cl">
                 <div class="col-2 col-sm-2 col-offset-3">
-                    <button class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
+                    <button class="btn btn-block btn-primary size-XL" type="submit" >确认录入</button>
                 </div>
             </div>
         </form>

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

@@ -44,6 +44,8 @@ $(function(){
     })
 });
 
+var isSalesStore = true;
+var isSalesAmountTest = true;
 $(function(){
     var loadIndex = 0;
     $("#form-order-add").Validform({
@@ -72,6 +74,8 @@ $(function(){
                 }
             }
 
+
+
             //检测颜色与店铺之间关系
             if(!storeProductColor()){
                 vailErrorMsg_3($("#product_color"),"店铺与商品信息不匹配!");
@@ -128,6 +132,37 @@ $(function(){
 
             $("#orderItemString").val(JSON.stringify(orderItemArray));
 
+            //判断客服人员没有更改默认的店铺，系统需要提示客服人员按需选择
+            var salesStoreId = $("#salesStoreId").val();
+            if(salesStoreId == 2){
+                if(isSalesStore){
+                    /*var index = layer.confirm('确定已经选择正确的店铺了吗？', {
+                        btn: ['是的','再选一次'] //按钮
+                    }, function(){
+                        isSalesStore = false;
+                        layer.closeAll();
+                    }, function(){
+                        layer.closeAll();
+
+                    });
+                    return false;*/
+                    vailErrorMsg_3($("#salesStoreId"),"请确定已经选择了正确的店铺!");
+                    isSalesStore = false;
+                    return false;
+                }
+
+            }
+            //如果订单的总金额填写为0时，需要提醒客服人员
+            var salesAmountTest = $("#salesAmountTest").val();
+            if(salesAmountTest == 0){
+                if(isSalesAmountTest){
+                    vailErrorMsg_3($("#salesAmountTest"),"请确认订单的销售价格，如果是自营店铺，请询问提供订单的同事了解销售价，非自营店铺不用更改金额信息!");
+                    isSalesAmountTest = false;
+                    return false;
+                }
+
+            }
+
             loadIndex = layer.load(1, {
                 shade: [0.5,'#fff'] //0.1透明度的白色背景
             });