出库

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

@@ -750,16 +750,105 @@
       WHERE t.sales_batch_id = #{salesBatchId}
   </select>
 
+
+    <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
+    <select id="listSalesOrderAndItemNum" parameterType="SalesOrder" resultType="Integer">
+        SELECT
+          COUNT(soi.item_id)
+        FROM
+        tb_rst_sales_order_info t
+        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>
+            <if test="salesIsDownload !=null ">
+                AND t.sales_is_download = #{salesIsDownload}
+            </if>
+            <if test="salesStatus !=null ">
+                AND t.sales_status = #{salesStatus}
+            </if>
+            <if test="salesShippingStatus !=null">
+                AND t.sales_shipping_status = #{salesShippingStatus}
+            </if>
+            <if test="salesDeliver !=null">
+                AND sales_deliver = #{salesDeliver}
+            </if>
+            <if test="salesStoreId !=null and salesStoreId !=''">
+                AND t.sales_store_id = #{salesStoreId}
+            </if>
+            <if test="salesId !=null">
+                AND t.sales_id = #{salesId}
+            </if>
+            <if test="salesOrderId !=null and salesOrderId !=''">
+                AND t.sales_orderId = #{salesOrderId}
+            </if>
+            <if test="salesDealCode !=null and salesDealCode !=''">
+                AND t.sales_deal_code = #{salesDealCode}
+            </if>
+            <if test="salesAddressTel !=null and salesAddressTel !=''">
+                AND t.sales_address_tel = #{salesAddressTel}
+            </if>
+            <if test="salesAddressName !=null and salesAddressName !=''">
+                AND t.sales_address_name = #{salesAddressName}
+            </if>
+            <if test="salesBatchId !=null and salesBatchId !=''">
+                AND t.sales_batch_id = #{salesBatchId}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND t.sales_create_time <![CDATA[>=]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND t.sales_create_time <![CDATA[<=]]> #{endDate}
+            </if>
+        </where>
+    </select>
+
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
   <select id="listSalesOrderAndItem" parameterType="SalesOrder" resultType="SalesOrder">
-    SELECT
-        t.*,
-        soi.*
-    FROM
-        tb_rst_sales_order_info t
-    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 = #{salesBatchId}
+        SELECT
+            t.*,
+            soi.*
+        FROM
+            tb_rst_sales_order_info t
+        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>
+          <if test="salesIsDownload !=null ">
+              AND t.sales_is_download = #{salesIsDownload}
+          </if>
+          <if test="salesStatus !=null ">
+              AND t.sales_status = #{salesStatus}
+          </if>
+          <if test="salesShippingStatus !=null">
+              AND t.sales_shipping_status = #{salesShippingStatus}
+          </if>
+          <if test="salesStoreId !=null and salesStoreId !=''">
+              AND t.sales_store_id = #{salesStoreId}
+          </if>
+          <if test="salesId !=null">
+              AND t.sales_id = #{salesId}
+          </if>
+          <if test="salesOrderId !=null and salesOrderId !=''">
+              AND t.sales_orderId = #{salesOrderId}
+          </if>
+          <if test="salesDealCode !=null and salesDealCode !=''">
+              AND t.sales_deal_code = #{salesDealCode}
+          </if>
+          <if test="salesAddressTel !=null and salesAddressTel !=''">
+              AND t.sales_address_tel = #{salesAddressTel}
+          </if>
+          <if test="salesAddressName !=null and salesAddressName !=''">
+              AND t.sales_address_name = #{salesAddressName}
+          </if>
+          <if test="salesBatchId !=null and salesBatchId !=''">
+              AND t.sales_batch_id = #{salesBatchId}
+          </if>
+          <if test="startDate != null and startDate != ''">
+              AND t.sales_create_time <![CDATA[>=]]> #{startDate}
+          </if>
+          <if test="endDate != null and endDate != ''">
+              AND t.sales_create_time <![CDATA[<=]]> #{endDate}
+          </if>
+      </where>
   </select>
 
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
@@ -837,4 +926,31 @@
             </if>
         </where>
     </update>
+
+
+    <select id="getSalesOrderByPostNum" resultType="SalesOrder" parameterType="String" >
+        select
+             sales_id,
+             sales_orderId,
+             sales_openId,
+             sales_send_type,
+             sales_shipping_status,
+             sales_status,
+             sales_post_num,
+             ifnull(sales_deliver,0) AS  sales_deliver
+        from tb_rst_sales_order_info t
+        where sales_post_num = #{postNum}
+    </select>
+
+    <!-- 出库 -->
+    <update id="updateDeliver" parameterType="SalesOrder" >
+        update tb_rst_sales_order_info
+        SET
+          sales_deliver = 2
+        WHERE
+          sales_post_num = #{salesPostNum}
+        AND sales_id = #{salesId}
+        AND sales_shipping_status = 1
+    </update>
+
 </mapper>

watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/order_batch_list.ftl

@@ -132,7 +132,7 @@
      * @param employee
      */
     function download_order(batchId) {
-        window.location.href= "${path}/admin/order/download_order_excel?orderBatchId="+batchId;
+        window.location.href= "${path}/admin/order/download_order_excel?salesBatchId="+batchId;
     }
 
     /**