订单中心开发

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

@@ -443,7 +443,6 @@ public class AdminCustomerController {
         salesOrder.setSalesType(1);
 
         salesOrder.setSalesStatus(1);//确认状态:0(未确认)1(确认)2(挂起)3(作废)
-        salesOrder.setSalesShippingStatus(1);    //发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)*****+++
         salesOrder.setSalesPayStatus(2);   //已付款
         salesOrder.setSalesProcessStatus(0);  //单据状态:0(正常单)1(问题单)
         salesOrder.setSalesIsSend(0);        //0：否 1：是  是否通知配货

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

@@ -177,6 +177,7 @@
                 <input type="hidden" name="salesPayType" id="salesPayType" value="1">
                 <input type="hidden" name="salesSendType" id="salesSendType" value="2">
                 <input type="hidden" name="salesAddType" id="salesAddType" value="3">
+                <input type="hidden" name="salesShippingStatus" id="salesShippingStatus" value="1">
 
                 <div class="row cl" id="recipientInfo" style=" margin-top: 20px;">
                     <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>销售公司：</label>

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

@@ -530,7 +530,7 @@
                 url: '${path}/admin/salesOrder/sync_efast_order_num',
                 data:{
                     "salesIsDownload" : salesIsDownload,
-//                    "salesStatus" : salesStatus,
+                    "salesStatus" : salesStatus,
                     "salesShippingStatus" : salesShippingStatus,
                     "salesStoreId" : salesStoreId,
                     "startDate" : startDate,