出库

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -93,6 +93,16 @@ public interface SalesOrderService {
     PagedResult<SalesOrder> listSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum);
 
     /**
+     * 仓库-代发货页面
+     * @param pageNO
+     * @param pageSize
+     * @param salesOrder
+     * @param isTotalNum
+     * @return
+     */
+    PagedResult<SalesOrder> listAwaitSendSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum);
+
+    /**
      * 获取订单项集合
      * @param salesOrderItem
      * @return

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

@@ -132,6 +132,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
+    public PagedResult<SalesOrder> listAwaitSendSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum) {
+        PageHelper.startPage(pageNO, pageSize, isTotalNum);
+        //查询订单列表信息
+        List<SalesOrder> orderList = salesOrderMapper.listAwaitSendSalesOrderPage(salesOrder);
+        return PageUtil.getPage(orderList);
+    }
+
+    @Override
     @Transactional
     public boolean addOrderAndItem(SalesOrder salesOrder, List<SalesOrderItem> list) throws Exception {
         if (list == null || list.size() == 0) {

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

@@ -45,6 +45,13 @@ public interface SalesOrderMapper {
     List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
 
     /**
+     * 仓库-代发货页面
+     * @param salesOrder
+     * @return
+     */
+    List<SalesOrder> listAwaitSendSalesOrderPage (SalesOrder salesOrder);
+
+    /**
      * 获取订单数量
      * @param salesOrder
      * @return

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

@@ -237,6 +237,9 @@
     SELECT
     c.customer_id,
     c.customer_counsel_type,
+    c.question_id,
+    c.store_id,
+    c.company_id,
     c.customer_area,
     c.customer_in_TDS,
     c.customer_out_TDS,

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

@@ -85,6 +85,9 @@
       <if test="salesOrderStatus !=null">
         AND sales_order_status = #{salesOrderStatus}
       </if>
+      <if test="salesDeliver !=null">
+        AND sales_deliver = #{salesDeliver}
+      </if>
       <if test="salesStoreId !=null and salesStoreId !=''">
         AND sales_store_id = #{salesStoreId}
       </if>
@@ -116,7 +119,7 @@
          AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
       </if>
       <if test="itemProductName !=null and itemProductName !=''">
-            AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+          AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
       </if>
       <if test="startDate != null and startDate != ''">
         AND sales_create_time <![CDATA[>=]]> #{startDate}
@@ -137,9 +140,182 @@
         </foreach >
       </if>
     </where>
+    GROUP BY tb_rst_sales_order_info.sales_id
     ORDER BY sales_create_time DESC
   </select>
 
+
+    <!-- 仓库-代发货页面 -->
+    <select id="listAwaitSendSalesOrderPage" resultType="SalesOrder" parameterType="SalesOrder" >
+        select
+        tb_rst_sales_order_info.*,
+        trsc.company_name companyName,
+        trsi.store_name  storeName,
+        ci.customer_is_solve customerIsSolve,
+        od.batch_create_time  batchCreateTime
+        from tb_rst_sales_order_info
+        LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
+        LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
+        LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
+        LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
+        <where>
+            tb_rst_sales_order_info.sales_batch_id != 'KS00000000000001'
+            <if test="salesIsDownload !=null and salesIsDownload !=''">
+                AND sales_is_download = #{salesIsDownload}
+            </if>
+            <if test="salesShippingStatus !=null">
+                AND sales_shipping_status = #{salesShippingStatus}
+            </if>
+            <if test="salesStatus !=null">
+                AND sales_status = #{salesStatus}
+            </if>
+            <if test="salesOrderStatus !=null">
+                AND sales_order_status = #{salesOrderStatus}
+            </if>
+            <if test="salesDeliver !=null">
+                AND sales_deliver = #{salesDeliver}
+            </if>
+            <if test="salesStoreId !=null and salesStoreId !=''">
+                AND sales_store_id = #{salesStoreId}
+            </if>
+            <if test="salesPostFirm !=null and salesPostFirm !=''">
+                AND sales_post_firm = #{salesPostFirm}
+            </if>
+            <if test="salesCompanyId !=null and salesCompanyId !=''">
+                AND sales_company_id = #{salesCompanyId}
+            </if>
+            <if test="salesId !=null">
+                AND sales_id = #{salesId}
+            </if>
+            <if test="salesOrderId !=null and salesOrderId !=''">
+                AND sales_orderId = #{salesOrderId}
+            </if>
+            <if test="salesDealCode !=null and salesDealCode !=''">
+                AND sales_deal_code = #{salesDealCode}
+            </if>
+            <if test="salesAddressTel !=null and salesAddressTel !=''">
+                AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+            </if>
+            <if test="salesAddressName !=null and salesAddressName !=''">
+                AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
+            </if>
+            <if test="salesBatchId !=null and salesBatchId !=''">
+                AND sales_batch_id = #{salesBatchId}
+            </if>
+            <if test="salesAddressInfo !=null and salesAddressInfo !=''">
+                AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
+            </if>
+            <if test="itemProductName !=null and itemProductName !=''">
+                AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND sales_create_time <![CDATA[>=]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND sales_create_time <![CDATA[<=]]> #{endDate}
+            </if>
+            <if test="salesAdminId != null ">
+                AND sales_admin_id = #{salesAdminId}
+            </if>
+            <if test="salesAddType != null ">
+                AND sales_add_type = #{salesAddType}
+            </if>
+            <if test="salesIds != null and salesIds != ''">
+                AND sales_id IN
+                <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                    #{node}
+                </foreach >
+            </if>
+        </where>
+        GROUP BY tb_rst_sales_order_info.sales_id
+        ORDER BY sales_create_time DESC
+    </select>
+
+    <!-- 订单数量 -->
+    <select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
+    SELECT COUNT(0)
+    FROM (
+        select
+          tb_rst_sales_order_info.sales_id
+        from tb_rst_sales_order_info
+        LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
+        LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
+        LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
+        LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
+        <where>
+                <if test="salesIsDownload !=null and salesIsDownload !=''">AND sales_is_download = #{salesIsDownload}
+                </if>
+                <if test="
+            salesShippingStatus !=null">
+                    AND sales_shipping_status = #{salesShippingStatus}
+                </if>
+                <if test="salesDeliver !=null">
+                    AND sales_deliver = #{salesDeliver}
+                </if>
+                <if test="salesStatus !=null">
+                    AND sales_status = #{salesStatus}
+                </if>
+                <if test="salesOrderStatus !=null">
+                    AND sales_order_status = #{salesOrderStatus}
+                </if>
+                <if test="salesStoreId !=null and salesStoreId !=''">
+                    AND sales_store_id = #{salesStoreId}
+                </if>
+                <if test="salesPostFirm !=null and salesPostFirm !=''">
+                    AND sales_post_firm = #{salesPostFirm}
+                </if>
+                <if test="salesCompanyId !=null and salesCompanyId !=''">
+                    AND sales_company_id = #{salesCompanyId}
+                </if>
+                <if test="salesId !=null">
+                    AND sales_id = #{salesId}
+                </if>
+                <if test="salesOrderId !=null and salesOrderId !=''">
+                    AND sales_orderId = #{salesOrderId}
+                </if>
+                <if test="salesDealCode !=null and salesDealCode !=''">
+                    AND sales_deal_code = #{salesDealCode}
+                </if>
+                <if test="salesAddressTel !=null and salesAddressTel !=''">
+                    AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+                </if>
+                <if test="salesAddressName !=null and salesAddressName !=''">
+                    AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
+                </if>
+                <if test="salesBatchId !=null and salesBatchId !=''">
+                    AND sales_batch_id = #{salesBatchId}
+                </if>
+                <if test="salesAddressInfo !=null and salesAddressInfo !=''">
+                    AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
+                </if>
+                <if test="itemProductName !=null and itemProductName !=''">
+                    AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+                </if>
+                <if test="startDate != null and startDate != ''">
+                    AND sales_create_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND sales_create_time <![CDATA[<=]]> #{endDate}
+                </if>
+                <if test="salesAdminId != null ">
+                    AND sales_admin_id = #{salesAdminId}
+                </if>
+                <if test="salesAddType != null ">
+                    AND sales_add_type = #{salesAddType}
+                </if>
+                <if test="salesIds != null and salesIds != ''">
+                    AND sales_id IN
+                    <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                        #{node}
+                    </foreach >
+                </if>
+            </where>
+            GROUP BY tb_rst_sales_order_info.sales_id
+        )xx
+    </select>
+
   <!-- 订单项集合 -->
   <select id="listSalesOrderItem" resultType="SalesOrderItem" parameterType="SalesOrderItem" >
         SELECT
@@ -187,6 +363,9 @@
       <if test="salesShippingStatus !=null ">
         AND sales_shipping_status = #{salesShippingStatus}
       </if>
+        <if test="salesDeliver !=null">
+            AND sales_deliver = #{salesDeliver}
+        </if>
       <if test="salesStoreId !=null">
         AND sales_store_id = #{salesStoreId}
       </if>
@@ -242,6 +421,9 @@
         <if test="salesShippingStatus !=null">
           AND sales_shipping_status = #{salesShippingStatus}
         </if>
+          <if test="salesDeliver !=null">
+              AND sales_deliver = #{salesDeliver}
+          </if>
         <if test="salesStoreId !=null and salesStoreId !=''">
           AND sales_store_id = #{salesStoreId}
         </if>
@@ -760,6 +942,7 @@
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
         <where>
+              t.sales_batch_id != 'KS00000000000001'
             <if test="salesIsDownload !=null ">
                 AND t.sales_is_download = #{salesIsDownload}
             </if>
@@ -815,6 +998,7 @@
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
       <where>
+            t.sales_batch_id != 'KS00000000000001'
           <if test="salesIsDownload !=null ">
               AND t.sales_is_download = #{salesIsDownload}
           </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -54,6 +54,9 @@
             <if test="productName != null and productName != ''">
                 AND p.product_name  like  CONCAT ('%',#{productName},'%')
             </if >
+            <if test="colorName != null and colorName != ''">
+                AND c.color_name  like  CONCAT ('%',#{colorName},'%')
+            </if >
         </where>
     </select>
 

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

@@ -64,7 +64,7 @@ public class AwaitSendController {
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         // 分页获取订单信息
-        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
+        PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
         }

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

@@ -267,7 +267,8 @@
 </script>
 <#--时间控件-->
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
-<script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
+
+
 
 <script type="text/javascript">
 
@@ -281,8 +282,13 @@
     var address = $(".address_info").initAddress();
 
     /*初始化销售公司店铺*/
-    $(".sales_channel").initSalesChannel();
+    var sc = $(".sales_channel").initSalesChannel();
 
 </script>
+
+
+<script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
+
+
 </body>
 </html>

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

@@ -87,6 +87,7 @@
 <script type="text/javascript">
 
     $(function(){
+        $("#postNum").select();
         var loadIndex = 0;
         $("#form-order-add").Validform({
             tiptype: function (msg, o, cssctl) {
@@ -113,8 +114,10 @@
                     $("#msg").show();
                     $("#msg").html(data.resultMsg);
                     if(data.returnCode == 200){
-                        $("#postNum").val();
                     }
+
+                    $("#postNum").val("");
+                    $("#postNum").select();
                 }
                 layer.close(loadIndex);
                 return false;

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

@@ -115,14 +115,14 @@
                 <td>${(o.salesAddressTel)!}</td>
                 <td>${(o.salesAddressInfo)!}</td>
                 <td style="text-align: left;">
-                    <#if o.salesOrderItemList ??>
+
+                </td>
+                <td>
+                    <#if o.salesShippingStatus == 11> <#if o.salesOrderItemList ??>
                         <#list o.salesOrderItemList as d>
                             <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
                         </#list>
                     </#if>
-                </td>
-                <td>
-                    <#if o.salesShippingStatus == 11>
                         <span style="color: red;">通知配货</span>
                     <#elseif o.salesShippingStatus == 1>
                         <p>已发货</p>

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

@@ -64,8 +64,11 @@
                     <div class="formControls col-md-offset-4 col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
                         <input type="text" class="input-text" value="" placeholder="产品名称" id="productName" name="productName">
                     </div>
+                    <div class="formControls  col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
+                        <input type="text" class="input-text" value="" placeholder="颜色名称" id="colorName" name="colorName">
+                    </div>
                      <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
-                         <input type="text" class="input-text" value="" placeholder="产品编码" id="colorBar" name="colorBar">
+                         <input type="text" class="input-text" value="" placeholder="颜色编码" id="colorBar" name="colorBar">
                      </div>
                      <div class="formControls col-1 col-sm-1" >
                          <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="searchOrder" name="">搜索</button>
@@ -131,12 +134,14 @@
         });
 
         var productName = cufte($("#productName").val());
+        var colorName = cufte($("#colorName").val());
         var colorBar = cufte($("#colorBar").val());
 
         $.ajax({
             type: "POST",
             data: {
                 productName : productName,
+                colorName : colorName,
                 colorBar : colorBar
             },
             url: "${path}/admin/product/get_product",

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

@@ -277,4 +277,147 @@ function listDistrict(cityId,districtName){
         }
     });
     return district;
-}
+}
+
+
+
+
+
+/**
+ * 控制是都有请选择项
+ *
+ */
+//初期是没有的	  //初始化之后使用   用于二次封装
+//二次数据
+/*
+ this.ulcInfo = {
+                urlPrefix : "",
+                ulcLevel :  [
+                    {
+                        ulcNode: ele.find(".ulcNode"),	//节点
+                        ulcURL: "",	//url
+                        ulcId : ele.find(".ulcId"),	//节点id
+                        ulcName: ele.find(".ulcNode").attr("ulcName"),
+                        isFristSelect : false,	//是否有“请选择项”，
+                        repData: function(res){ //res 即为原始返回的数据
+                            return {
+                                "code": res.returnCode, //解析接口状态
+                                "msg": res.message, //解析提示文本
+                                "count": res.total, //解析数据长度
+                                "data": res.returnMsg //解析数据列表
+                            };
+                        },
+                        parseData:function(data){ //res 即为原始返回的数据
+                            return {
+                                "id": data.provinceId, //解析接口状态
+                                "val": data.province, //解析提示文本
+                                "other": data.other, //解析数据长度
+                            };
+                        }
+                    }, {
+                        ulcNode: ele.find(".ulcNode"),	//节点
+                        ulcURL: "",	//url
+                        ulcId : ele.find(".ulcId"),	//节点id
+                        ulcName: ele.find(".ulcNode").attr("ulcName"),
+                        isFristSelect : false,	//是否有“请选择项”,
+                        repData: function(res){ //res 即为原始返回的数据
+                            return {
+                                "code": res.returnCode, //解析接口状态
+                                "msg": res.message, //解析提示文本
+                                "count": res.total, //解析数据长度
+                                "data": res.returnMsg //解析数据列表
+                            };
+                        },
+                        parseData:function(data){ //data为对象
+                            return {
+                                "id": data.id, //select的id
+                                "val": data.val, //select的value
+                                "msg": data.msg, //select的其他数据，绑定在option上的msg属性上
+                            };
+                        }
+                    }
+                ],
+                parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.status, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.total, //解析数据长度
+                    "data": res.data.item //解析数据列表
+                },
+                // provinceNode : ele.find(".ulc_1"),
+                // cityNode : ele.find(".init_city"),
+                // countryNode : ele.find(".init_country"),
+                // provinceId :ele.find(".init_province").attr("provinceId"),
+                // cityId : ele.find(".init_city").attr("cityId"),
+                // countryId : ele.find(".init_country").attr("countryId"),
+                // provinceName : ele.find(".init_province").attr("provinceName"),
+                // cityName :   ele.find(".init_city").attr("cityName"),
+                // countryName :  ele.find(".init_country").attr("countryName"),
+                initLock : false
+            },
+
+
+ */
+
+
+/*
+;(function($,window,document,undefined){
+    //定义UnlimitedLevelContact的构造函数
+    var UnlimitedLevelContact = function(ele,opt) {
+        this.$element = ele,
+            this.ulcInfo = {
+                urlPrefix : "",
+                ulcLevel :  []
+            },
+            this.options = $.extend({}, this.ulcInfo, opt)  //opt并入ulcInfo集合组成新的集合，然后赋值给 options ，所以一切调用options
+    }
+    //定义Address的方法
+    UnlimitedLevelContact.prototype = {
+        init: function() {
+            if(this.options.ulcLevel.length > 0){
+                this.initUlc(0,null);
+            }
+            return this;
+        },
+        initUlc : function(level,id){
+            var ulc = this;
+            var ulcLevel = this.options.ulcLevel[level];
+
+            $.get(ulc.options.urlPrefix + ulcLevel.ulcURL, function(result){
+                var node = ulcLevel;
+                var res = node.repData(result);
+                if (res.code == 200) {
+                    node.ulcNode.empty();    //清空下拉框
+                    $(res.data).each(function (){
+                        var data =  node.parseData(this);
+                        $provinceNode.append("<option value='"+ data.id +"'>"+ this.val +"</option>");
+                    })
+                    if(isEmpty(address.options.provinceId)){
+                        address.options.provinceId = result.returnMsg.provinceList[0].provinceId;
+                    }else if(isEmpty(address.options.provinceName)){
+                        address.options.provinceId = address.getAttrIdByName($provinceNode,address.options.provinceName);
+                    }else{
+                        address.options.provinceId = result.returnMsg.provinceList[0].provinceId;
+                    }
+                    address.setProvince();
+                }else{
+                    console.log("省份查询失败");
+                }
+            });
+        },
+
+        cufte:function(val) {
+            if (undefined == val || null == val||typeof val == undefined || typeof val == 'undefined'|| 'undefined' == val) {
+                val = "";
+            }
+            return val;
+        }
+    }
+    // initAddress 调用
+    $.fn.initAddress = function(options) {
+        var address = new Address(this, options);
+        address.init();
+        return address;
+    }
+})(jQuery,window,document);
+*/

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

@@ -82,6 +82,7 @@
     $.fn.initSalesChannel = function(options) {
         var salesChannel = new SalesChannel(this, options);
         salesChannel.init();
+        return salesChannel;
     }
 })(jQuery,window,document);
 

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

@@ -115,6 +115,9 @@ function setSelectCustomer(customerId){
                 var customer = data.returnMsg.customer;
                 $("#salesCustomerIdHtml").html("已经选择客诉记录："+customer.customerId);
                 $("#salesCustomerId").val(customer.customerId);
+
+                sc.setCompanyId(customer.companyId);
+                sc.setStoreId(customer.storeId);
             }else{
             }
             $("#salesCustomer").show();